From a9ec5b7e9e6876aeccde310e547ea927e54f2bfd Mon Sep 17 00:00:00 2001
From: Micha Glave <gentoo@migmedia.de>
Date: Fri, 27 Nov 2009 11:07:06 +0100
Subject: [PATCH] r1-patch for php 5.2.11.

---
 dev-lang/php/Manifest                                    | 4 ++--
 dev-lang/php/{php-5.2.11.ebuild => php-5.2.11-r1.ebuild} | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename dev-lang/php/{php-5.2.11.ebuild => php-5.2.11-r1.ebuild} (99%)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a0910cd..b068c87 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,7 +11,7 @@ AUX php4-ldvs 22 RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 SHA1 8c66355dfb
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
 DIST php-5.2.11-fpm-0.5.13.diff.gz 202722 RMD160 c5b3bd9135b712ec62aaa49a6de1f926a02469c5 SHA1 6168ddc2806ea8403517c5ea8c8db90136d857e3 SHA256 d000bad0d09eea3a721fe001a32e3910725508dfa6ef5a33dd1b412c90e14e26
 DIST php-5.2.11.tar.bz2 9030787 RMD160 6aad53dee864ab89f794a9d3c2aa32d435ed5654 SHA1 819c853ce657ef260d4a73b5a21f961115b97eef SHA256 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23
-DIST php-patchset-5.2.11-r0.tar.bz2 10171 RMD160 f02780907f8d2fa44aba1974de4376b5e14497c0 SHA1 47586ffae72ff3966afa4cf20ae355190dbac29c SHA256 441bc612aa7e19e2a4c2fd37181fb652e84cdf002d1841ebcf2e631d0bd4cd99
+DIST php-patchset-5.2.11-r1.tar.bz2 10403 RMD160 53ce1a43697db2cf79eba89a548f52efa64c0d20 SHA1 905e1fc34be10b5ed0abe816cbce2524933559f4 SHA256 fd4f95de091cbe7d52ee3008b45a189f2158bbf861e2017b92a8a3b7a8abb32c
 DIST suhosin-patch-5.2.11-0.9.7.patch.gz 23050 RMD160 0f6d442aace34c221f9fbff42a63e7f3b4489f15 SHA1 248419332131efc53f3306c2a57a4b1a9dc92cc1 SHA256 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b
-EBUILD php-5.2.11.ebuild 18496 RMD160 05d5cd967b4f465055e6d67430b7e580aac73db4 SHA1 fef0a215a2b5c797564be05f18425d1fb69ea576 SHA256 53610797709b2c34d11b931de0506bdfaa961ce5252835265dd64b3fba0ef482
+EBUILD php-5.2.11-r1.ebuild 18658 RMD160 dc13ddee992f7062fbdc0fa9c0723300f99bf3fc SHA1 7a986623d89a5929eb3438bf6af42f48855bb144 SHA256 0ddeb348033c7c0cc9059714418de81bd3528225f1fbcadb4480e06b8bad5697
 MISC metadata.xml 1609 RMD160 d38bf6db4068985b22b93e8d0d7f813b6598456f SHA1 c58a51a1286a0b9960ddd1511a16ca79f00b556e SHA256 949a48d14d9f2b5898c46e733b165802b52dbff9f146fe2cd7d562bc3b0075db
diff --git a/dev-lang/php/php-5.2.11.ebuild b/dev-lang/php/php-5.2.11-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-5.2.11.ebuild
rename to dev-lang/php/php-5.2.11-r1.ebuild
index ea6f78b..eea71b0 100644
--- a/dev-lang/php/php-5.2.11.ebuild
+++ b/dev-lang/php/php-5.2.11-r1.ebuild
@@ -22,6 +22,7 @@ PHP_PACKAGE="1"
 RESTRICT="nomirror"
 
 # 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"
@@ -183,6 +184,9 @@ src_unpack() {
 		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