[patch] Fix for gd maxcolors bug

php.patch (text/plain), 1.52 KB, created by Dawid Węgliński (RETIRED) on 2009-11-13 13:07:17 UTC

--- php-5.2.11.ebuild.old	2009-11-13 13:48:10.000000000 +0100
+++ php-5.2.11.ebuild	2009-11-13 13:48:18.000000000 +0100
@@ -18,8 +18,8 @@
 MY_PHP_PV="${PV}"
 MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
-
 # php patch settings, general
+PHP_PATCHSET_URI="http://dev.gentoo.org/~cla/distfiles/php-patchset-${PVR}.tar.bz2"
 PHP_PATCHSET_REV="${PR/r/}"
 PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
 SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
@@ -161,6 +161,9 @@
 		use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
 	fi
 
+	# Security bug #292132
+	epatch "${WORKDIR}"/${MY_PHP_PV}/gd-maxcolors.patch
+
 	# pretend to not have flex, bug 221357
 	sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
 
Index: ../../eclass/php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.25
diff -u -r1.25 php5_2-sapi.eclass
--- ../../eclass/php5_2-sapi.eclass	20 Jul 2009 10:32:34 -0000	1.25
+++ ../../eclass/php5_2-sapi.eclass	13 Nov 2009 13:01:05 -0000
@@ -147,7 +147,11 @@
 # @ECLASS-VARIABLE: PHP_PATCHSET_REV
 # @DESCRIPTION:
 # Provides PHP patchsets support.
-SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
+if [[ ! -n ${PHP_PATCHSET_URI} ]]; then
+	SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
+else
+	SRC_URI="${SRC_URI} ${PHP_PATCHSET_URI}"
+fi
 
 # @ECLASS-VARIABLE: SUHOSIN_PATCH
 # @DESCRIPTION: