svn commit: r317143 - in head: security/vuxml www/squid

[Thomas-Martin Seck]

Author: tmseck
Date: Thu May  2 19:41:06 2013
New Revision: 317143
URL: http://svnweb.freebsd.org/changeset/ports/317143

Log:
  - Add the vendor patch for SQUID-2012:1 (CVE-2012-5643) and update VuXML
    information accordingly
  - Bump PORTREVISION
  
  PR:		ports/177773
  Submitted by:	Kan Sasaki
  Approved by:	flo (mentor)
  Security:	c37de843-488e-11e2-a5c9-0019996bc1f7

Modified:
  head/security/vuxml/vuln.xml
  head/www/squid/Makefile
  head/www/squid/distinfo

Modified: head/security/vuxml/vuln.xml
==============================================================================
--- head/security/vuxml/vuln.xml	Thu May  2 19:37:23 2013	(r317142)
+++ head/security/vuxml/vuln.xml	Thu May  2 19:41:06 2013	(r317143)
@@ -3849,7 +3849,8 @@ executed in your Internet Explorer while
     <affects>
       <package>
 	<name>squid</name>
-	<range><lt>3.1.23</lt></range>
+	<range><lt>2.7.9_4</lt></range>
+	<range><ge>3.1</ge><lt>3.1.23</lt></range>
 	<range><ge>3.2</ge><lt>3.2.6</lt></range>
 	<range><ge>3.3</ge><lt>3.3.0.3</lt></range>
       </package>
@@ -3877,7 +3878,7 @@ executed in your Internet Explorer while
     <dates>
       <discovery>2012-12-17</discovery>
       <entry>2012-12-28</entry>
-      <modified>2013-01-11</modified>
+      <modified>2013-05-02</modified>
     </dates>
   </vuln>
 

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Thu May  2 19:37:23 2013	(r317142)
+++ head/www/squid/Makefile	Thu May  2 19:41:06 2013	(r317143)
@@ -77,7 +77,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.7.${SQUID_STABLE_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -108,8 +108,8 @@ PATCH_SITES=	http://www.squid-cache.org/
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v2/2.7/changesets
-PATCH_DIST_STRIP=	-p1
-PATCHFILES=	# empty
+#PATCH_DIST_STRIP=	-p1
+PATCHFILES=	SQUID-2012_1.patch
 
 MAINTAINER=	tmseck at FreeBSD.org
 COMMENT=	HTTP Caching Proxy

Modified: head/www/squid/distinfo
==============================================================================
--- head/www/squid/distinfo	Thu May  2 19:37:23 2013	(r317142)
+++ head/www/squid/distinfo	Thu May  2 19:41:06 2013	(r317143)
@@ -1,2 +1,4 @@
 SHA256 (squid2.7/squid-2.7.STABLE9.tar.bz2) = c0bdfcb5bb68debc1c9441308178bf148c67979b824c892a4710dc80a5b05d5e
 SIZE (squid2.7/squid-2.7.STABLE9.tar.bz2) = 1351366
+SHA256 (squid2.7/SQUID-2012_1.patch) = a456ed7a45fbecd94a4c68c0e72905135c4424c41c01ab858dc8c5760ee03a6f
+SIZE (squid2.7/SQUID-2012_1.patch) = 4804