From 380abb56316e2c8fd383c592899c9566f4d4cc0e Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Mon, 10 Dec 2012 09:00:34 +0100 Subject: [PATCH] php-5.2 backports added. --- dev-lang/php/Manifest | 4 +++- .../php/{php-5.2.17.ebuild => php-5.2.17-r1.ebuild} | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) rename dev-lang/php/{php-5.2.17.ebuild => php-5.2.17-r1.ebuild} (96%) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 3089435..55e5af9 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -22,6 +22,7 @@ AUX eblits/src_prepare-v2.eblit 2604 SHA256 fe7534260fb81a012b8021b5d555756ce873 AUX eblits/src_prepare-v3.eblit 2649 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486 SHA512 0c1c5caf47e5955116ddec5b87022920a37f079211aaefb25c9a14b0c269343e808593b4727ea7e3d07487ed0a74de0e683ded318200c304943149548a75c34b WHIRLPOOL 055c5bf47e2c02537e24421cc796316b8a390a0d5447149eda5398b9708e05bfd71167e5ea2fe959432a6abb508f84d7f7cbc84748048c87e7777468bb6ab78e AUX eblits/src_prepare-v4.eblit 2317 SHA256 7c18252a49a6d8e071471d14624f284d7b3ad8b95cad4a001e10e6e521f4c9b1 SHA512 e5c8200cd393266f9e608ebe680e74d539f897ab288303ba4b09963c09c3fdcdcd850443c7e76b0f9343f977fec148f448391e94ffb0e81fe46c69e7e9d7bca6 WHIRLPOOL 0246d02c8e1856acbae723ed53f8286921fed7b671ecf2fd7c712d7345ca6dcebfe79e09e83c77df06e4fa6dff0f3e25c92027f2bc9bed2c2b69018cbbcac987 AUX eblits/src_test-v1.eblit 1530 SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c SHA512 41c599ba577bc48bd4300592b5d515718cbf498165c601b87d7aaa098e045c56853c1c73932530262181b76c8cb854ceb252e947b35e8d619204e18680bed246 WHIRLPOOL d7439cfd95fff55ee7d91b3001e700dbd2dceae1dcbea7750e3df434c0f020860aa0555f383487dc0fc5fa7c16ac9769c58130be43fb9dd44286b6c7294b6698 +AUX pcre_info.patch 1582 SHA256 35c2547479108d1fada70ab10bb877a4405156430acc3675399174dd4932b783 SHA512 cfb5795468a5a1bfb67207f815c6ebead8cfb7d6c14ffe8715bc535baf45cedb50d9d05a2df6ac8bdeef182d4da4cbac98ab0c4857d33742024ec15e5c5c5c13 WHIRLPOOL 991d072dccea035fec1d221d8fd44e3782144c2b8468f7ee95e7d6680e85c976c02f94e0ef52dacb783c2422dc25f8987155829400e4c8fecee51960fbc0d87a AUX php-fpm-gentooified.patch 1846 SHA256 262c02ad320408314e7635d403bd89b711374fcee09ecb37375e3406a0cc944a SHA512 8137389f2a4ad33a4d5b67a260659fc0c64b7e4ac276626e40d939ebd2829736f0e75beb535b09bb15ccc91c1e7eacdfd954c688d07c43b56317f2bbd85f06b7 WHIRLPOOL 8d7169b8a1cdefa4c0e2db5675e4aa03a9de4372594c91f7fd7c27505d7377964a33c0ba44d3872e68f9b9ac2d50ad557a7a5203cf528435a5f6bf6b41ff9499 AUX php-fpm-r0.conf 12898 SHA256 8ebd676e058e5b64fbb8b5ed0be693e4da8f6fcedd5e427757afccc13504c48d SHA512 cfd93a8381f4a60a71bcf1bedae4889280eafcf92ba7a0f93ea164cdc87a29f598d80b9b98867d8cb966ef5e42f89a291959a84b592433b458cb7e364cec0e7d WHIRLPOOL 3fd4ce204895af20392e28381ab099344756c7a4ba5910b7e3f5c1d8c80bf96cf17eabdda3a801dc07ec8ebc8ead07833c0d7313419d7552e1f661dd2a8fc8bd AUX php-fpm-r1.conf 12966 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c SHA512 3d421c1e8b8f6ecffbf8284a7f79a1e5cc3f0893b1a47f5ccd980d554b058c363c1e236aa3157c2b66791b3291c6e98981cc527d501328ccc3ccb34eee2950ef WHIRLPOOL 1f591597698e28fc47197e02ba680728363c50781d146cf2598403f4678781eabc4f4d2abe2c0bfe9a25065491d3cb514cc5a9dcee4edd9d9438f51181f43b2a @@ -32,7 +33,8 @@ AUX php-fpm.init 385 SHA256 baba8dab2cadc8bdf107e6fe5cede2f5faaabff1281781a0a30b AUX php5-ldvs 22 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 SHA512 689a0a12b3527741d2e47870c125e93be73a127e5e798c4b685ccb11653be5a8615faf3178c71a6346fe264d3c4ec76601bc05878fef67b9dbd2e45be59a344d WHIRLPOOL b24f193a1067f699c8efb199ba4e3f1fdd22c13dff98655206b30072ce8c8035fb4ed9288f694856f9978bd9935d3a5589cd968316920e712779c45b44897634 DIST php-5.2.17.tar.bz2 9092312 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c SHA512 baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8 WHIRLPOOL 94657976927ff8d45dc17c2db59ac86a4320d6d7b2b6d5b43c4862060495a4011ad9b73d9b57ea4eb46a38418683ac2ff16e93fa10bd4ad5842c50accbac3536 DIST php-patchset-5.2.17-r0.tar.bz2 8369 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 SHA512 8e1f4de519f926ccabf04c7358f8568506943e8d3be474c8a656cccb19381553609db05ef3bfb97adc5f2976aafe589aa53f84f888bbcb41e231298d89566b39 WHIRLPOOL 77aada53720272656d82d1e9fdade8e25fa6d7e409de546e9c3ac0d274308734a1d254665de97c54a8c14da79e49acdfb2bfb960fbd97bc24bc9db0bd8a348ac +DIST php52-backports-security-20121114.patch 410829 SHA256 59dc139b9acf86bbb2e281696765de513c3bec7d43392a10b5f3b36a9881ab00 SHA512 1272ea579d8dfcf5c593ab5668d8017d0b6df16bcd0c85a771786e89292e25890ea6b14a586ce98234835d3fd5adfd0f4c1f41520a344e6085e2b59ab6fd1f57 WHIRLPOOL 5137e07fa49a75465c7cb79e138975b390597aaa2e81653d40c749123ed27fe86c7d635eb8ec9936716a8234f380a3c9292ac85509ea672b9e914a03ce69d741 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 SHA512 71f204c6c04cff4914c5f3d4d8d4e016e09a92a8e92d3a78ed2df482238ae6e8b71fb16ccadaca643d0fde07966ead02bcf3bee9c46725290e0a5ed603ec0ba0 WHIRLPOOL b3282acb99b48ad9edb89b45f12bf60b40bc9fd8d9bcf42a5402b8331e8d2e4a8fa52bd423c7a5fae2b7c1c93f0245d13019e6c85e1379d1749abb6d7f1a0a0c -EBUILD php-5.2.17.ebuild 9326 SHA256 c9c3f401c116037d6bb355e705cd6f90290466184d640cd9d058d7398b6f7162 SHA512 8c9945e0d5cf0ca3a775eeddeabf2277ae25b77113726790edefc262ae7375d471c8b338a1a6c18c0e4c7e643b303c22a9f813fa0bc96e82a13c4201d7a54f34 WHIRLPOOL e41e224cd54153fdee6cc2f838bc1a6e179d6445f7f7783c4fb3316f49b566ef2b21b2670a1dd3135a67b9a64e07aa4ee5870ccbf03df1f484480bdfeecd1c42 +EBUILD php-5.2.17-r1.ebuild 9581 SHA256 80a3dde431936b70b69852bfdbdb0f72af3b49b6bc4e12d62c5adde58db9ba72 SHA512 5ada3dcaedbde3b2a717e02705f604844af5847915456132466aa359362f03ea4db686304afa0864da3f7360bddf8983ea6be33d0d23a30aeecb23c53d1ff136 WHIRLPOOL 4216ef1ecdecd3c34d19d70122d942e079365d953f46b49162412a229b913a49e563967bccce5c8c860a4fb7107b8fb693213e74be870f30e8d4c8ee2f0da684 MISC ChangeLog 87319 SHA256 9309eea9e9492bc0b14bd3d1001af37e0b6196409da92dc286bc948542e8b74a SHA512 245764a57d3be704df95c6692ef480c2fa6216c2d0439ae38bdd3bf88f3fc687c2d23f8734c8f629a5f64e047f7d5a5e19eca15e13edc906d2d0bd9eaccc456b WHIRLPOOL 94fd58bf26d7d5989d193981311497cdc9be372d1da284a69101fa0a3cd7934bbc184ad41d170d25ceacfb5d4addb798623644604971e4e5beed4d863e13b00d MISC metadata.xml 2075 SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5 SHA512 53506db4d02e573f0ee5e60231545f079aac4e3c20d9f4f0f68502c64a7164244105af806e86827192263c988f7c9e5145b87e840ca036bfc36601ede22d6d45 WHIRLPOOL 529db115d1a572cc823c3bfd1d501959a139384102773981bf24688ed97f11f3b4c6722e98734d95bcccbe2e1942e6903d0914c2413b979062b4147a3124edcf diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17-r1.ebuild similarity index 96% rename from dev-lang/php/php-5.2.17.ebuild rename to dev-lang/php/php-5.2.17-r1.ebuild index f70c549..751dc5f 100644 --- a/dev-lang/php/php-5.2.17.ebuild +++ b/dev-lang/php/php-5.2.17-r1.ebuild @@ -46,6 +46,7 @@ PHP_P="${PN}-${PHP_PV}" PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" PHP_PATCHSET="0" +PHP_PATCHSECURITY="20121114" PHP_PATCHSET_URI=" $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" @@ -64,6 +65,7 @@ fi SRC_URI=" ${PHP_SRC_URI} + http://php52-backports.googlecode.com/files/php52-backports-security-${PHP_PATCHSECURITY}.patch ${PHP_PATCHSET_URI}" if [[ -n ${SUHOSIN_VERSION} ]]; then @@ -323,9 +325,15 @@ eblit-pkg() { eblit-pkg pkg_setup v2 -src_prepare() { eblit-run src_prepare v2 ; } +src_prepare() { + cd "${S}" + epatch "${DISTDIR}/php52-backports-security-${PHP_PATCHSECURITY}.patch" + epatch "${FILESDIR}/pcre_info.patch" + eblit-run src_prepare v2 ; +} src_configure() { eblit-run src_configure v521 ; } src_compile() { eblit-run src_compile v1 ; } src_install() { eblit-run src_install v2 ; } src_test() { eblit-run src_test v1 ; } pkg_postinst() { eblit-run pkg_postinst v2 ; } +