From bc204257b930948b892bda81f6fca61f61f2d7c1 Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Mon, 26 Nov 2012 21:23:25 +0000
Subject: MFH r307747

- Update backports patch to 20121114
- Bump PORTREVISION

Changes:
- CVE-2006-7243
PHP before 5.3.4 accepts the \0 character in a pathname, which might allow
context-dependent attackers to bypass intended access restrictions by placing a
safe file extension after this character, as demonstrated by .php\0.jpg at the
end of the argument to the file_exists function

Secuity 3761df02-0f9c-11e0-becc-0022156e8794 fixed by check in fopen functions
for strlen(filename) != filename_len

- CVE-2012-4388
The sapi_header_op function in main/SAPI.c does not properly determine a pointer
during checks for %0D sequences (aka carriage return characters), which allows
remote attackers to bypass an HTTP response-splitting protection mechanism via a
crafted URL, this vulnerability exists because of an incorrect fix for
CVE-2011-1398.

- Timezone database updated to version 2012.9 (2012i)

Approved by:	portmgr (beat)
Feature safe:	yes
---
 lang/php52/Makefile     | 4 ++--
 lang/php52/distinfo     | 4 ++--
 security/vuxml/vuln.xml | 9 ++-------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lang/php52/Makefile b/lang/php52/Makefile
index 50f57ca5a5f9..2845d7300eaf 100644
--- a/lang/php52/Makefile
+++ b/lang/php52/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php52
 PORTVERSION=	5.2.17
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 MAKE_JOBS_SAFE=	yes
 
 # BACKPORTS patch for lang/php52 and all php52-extensions
-PATCHFILES=	php52-backports-security-20120911.patch
+PATCHFILES=	php52-backports-security-20121114.patch
 PATCH_SITES+=	http://php52-backports.googlecode.com/files/
 
 .if !defined(PKGNAMESUFFIX)
diff --git a/lang/php52/distinfo b/lang/php52/distinfo
index 6234d16a8ea1..a7d4eb16e0b0 100644
--- a/lang/php52/distinfo
+++ b/lang/php52/distinfo
@@ -1,7 +1,7 @@
 SHA256 (php-5.2.17.tar.bz2) = e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 SIZE (php-5.2.17.tar.bz2) = 9092312
-SHA256 (php52-backports-security-20120911.patch) = 4911e2a5abb72d0558b2baf07ff64ca054d71219bde183e41b591894fb7cb1f6
-SIZE (php52-backports-security-20120911.patch) = 356599
+SHA256 (php52-backports-security-20121114.patch) = 59dc139b9acf86bbb2e281696765de513c3bec7d43392a10b5f3b36a9881ab00
+SIZE (php52-backports-security-20121114.patch) = 410829
 SHA256 (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 354ce451417d14ef47761ae55147e9cee30fa0ff6f59447da021194c539f4d7f
 SIZE (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 43550
 SHA256 (suhosin-patch-5.2.16-0.9.7.patch.gz) = aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 7f8cf43c9f07..4ba9386fadc3 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -16660,7 +16660,7 @@ Note:  Please add new entries to the beginning of this file.
       </package>
       <package>
 	<name>php52</name>
-	<range><ge>0</ge></range>
+	<range><lt>5.2.17_12</lt></range>
       </package>
     </affects>
     <description>
@@ -16679,11 +16679,6 @@ Note:  Please add new entries to the beginning of this file.
 	  <p>Paths with NULL in them (foo\0bar.txt) are now considered
 	    as invalid (CVE-2006-7243).</p>
 	</blockquote>
-	<blockquote cite="http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/171583">
-	  <p>The php52 backports maintainer reports that this issue is unlikely
-	    to be fixed in 5.2 due to design roadblocks. Users are strongly
-	    encouraged to upgrade as soon as possible.</p>
-	</blockquote>
       </body>
     </description>
     <references>
@@ -16694,7 +16689,7 @@ Note:  Please add new entries to the beginning of this file.
     <dates>
       <discovery>2010-12-10</discovery>
       <entry>2011-01-13</entry>
-      <modified>2012-09-19</modified>
+      <modified>2012-11-25</modified>
     </dates>
   </vuln>
 
-- 
cgit v1.2.3