gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forgotten patch...

Browse Source
This commit is contained in:
Micha Glave 2012-12-10 14:34:37 +01:00
parent 380abb5631
commit 13329ff94b
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-lang/php/Manifest
View File

@ -35,6 +35,6 @@ DIST php-5.2.17.tar.bz2 9092312 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961
DIST php-patchset-5.2.17-r0.tar.bz2 8369 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 SHA512 8e1f4de519f926ccabf04c7358f8568506943e8d3be474c8a656cccb19381553609db05ef3bfb97adc5f2976aafe589aa53f84f888bbcb41e231298d89566b39 WHIRLPOOL 77aada53720272656d82d1e9fdade8e25fa6d7e409de546e9c3ac0d274308734a1d254665de97c54a8c14da79e49acdfb2bfb960fbd97bc24bc9db0bd8a348ac 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 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 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 SHA512 71f204c6c04cff4914c5f3d4d8d4e016e09a92a8e92d3a78ed2df482238ae6e8b71fb16ccadaca643d0fde07966ead02bcf3bee9c46725290e0a5ed603ec0ba0 WHIRLPOOL b3282acb99b48ad9edb89b45f12bf60b40bc9fd8d9bcf42a5402b8331e8d2e4a8fa52bd423c7a5fae2b7c1c93f0245d13019e6c85e1379d1749abb6d7f1a0a0c
EBUILD php-5.2.17-r1.ebuild 9581 SHA256 80a3dde431936b70b69852bfdbdb0f72af3b49b6bc4e12d62c5adde58db9ba72 SHA512 5ada3dcaedbde3b2a717e02705f604844af5847915456132466aa359362f03ea4db686304afa0864da3f7360bddf8983ea6be33d0d23a30aeecb23c53d1ff136 WHIRLPOOL 4216ef1ecdecd3c34d19d70122d942e079365d953f46b49162412a229b913a49e563967bccce5c8c860a4fb7107b8fb693213e74be870f30e8d4c8ee2f0da684 EBUILD php-5.2.17-r1.ebuild 9580 SHA256 cc918668cd505fb6763df28c0daf6a663d4cbb4a21b9da92548a37ea21cd41b2 SHA512 8cce0ad2c7d2950ee4730e025bd7fd39f6306a478c45040c003bef8980785e4e5fb30ffea62749b26dbcd9e03d08af846b84bb01d78afb11b20a0bca15666de8 WHIRLPOOL e6fe0232f0d4c9f83271b1af54ada3c026ef312eb0545d8125991001853efee5fd9aeef961d84a9a976faf1f0af49502515f7203ef52fee8f6cacce2a8074bf5
MISC ChangeLog 87319 SHA256 9309eea9e9492bc0b14bd3d1001af37e0b6196409da92dc286bc948542e8b74a SHA512 245764a57d3be704df95c6692ef480c2fa6216c2d0439ae38bdd3bf88f3fc687c2d23f8734c8f629a5f64e047f7d5a5e19eca15e13edc906d2d0bd9eaccc456b WHIRLPOOL 94fd58bf26d7d5989d193981311497cdc9be372d1da284a69101fa0a3cd7934bbc184ad41d170d25ceacfb5d4addb798623644604971e4e5beed4d863e13b00d MISC ChangeLog 87319 SHA256 9309eea9e9492bc0b14bd3d1001af37e0b6196409da92dc286bc948542e8b74a SHA512 245764a57d3be704df95c6692ef480c2fa6216c2d0439ae38bdd3bf88f3fc687c2d23f8734c8f629a5f64e047f7d5a5e19eca15e13edc906d2d0bd9eaccc456b WHIRLPOOL 94fd58bf26d7d5989d193981311497cdc9be372d1da284a69101fa0a3cd7934bbc184ad41d170d25ceacfb5d4addb798623644604971e4e5beed4d863e13b00d
MISC metadata.xml 2075 SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5 SHA512 53506db4d02e573f0ee5e60231545f079aac4e3c20d9f4f0f68502c64a7164244105af806e86827192263c988f7c9e5145b87e840ca036bfc36601ede22d6d45 WHIRLPOOL 529db115d1a572cc823c3bfd1d501959a139384102773981bf24688ed97f11f3b4c6722e98734d95bcccbe2e1942e6903d0914c2413b979062b4147a3124edcf MISC metadata.xml 2075 SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5 SHA512 53506db4d02e573f0ee5e60231545f079aac4e3c20d9f4f0f68502c64a7164244105af806e86827192263c988f7c9e5145b87e840ca036bfc36601ede22d6d45 WHIRLPOOL 529db115d1a572cc823c3bfd1d501959a139384102773981bf24688ed97f11f3b4c6722e98734d95bcccbe2e1942e6903d0914c2413b979062b4147a3124edcf

36
dev-lang/php/files/pcre_info.patch Normal file
View File

@ -0,0 +1,36 @@
--- php-5.2.17/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100
+++ php-5.2.17/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100
@@ -252,10 +252,11 @@
back the compiled pattern, otherwise go on and compile it. */
if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
/*
- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
+ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
* is, we flush it and compile the pattern from scratch.
*/
- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
+ int count = 0;
+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
zend_hash_clean(&PCRE_G(pcre_cache));
} else {
#if HAVE_SETLOCALE
--- php-5.2.17/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100
+++ php-5.2.17/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100
@@ -4,7 +4,6 @@
php_pcre_exec
php_pcre_get_substring
php_pcre_get_substring_list
-php_pcre_info
php_pcre_maketables
php_pcre_study
php_pcre_version
--- php-5.2.17/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100
+++ php-5.2.17/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100
@@ -34,7 +34,6 @@
#define pcre_exec php_pcre_exec
#define pcre_get_substring php_pcre_get_substring
#define pcre_get_substring_list php_pcre_get_substring_list
-#define pcre_info php_pcre_info
#define pcre_maketables php_pcre_maketables
#define pcre_study php_pcre_study
#define pcre_version php_pcre_version

2
dev-lang/php/php-5.2.17-r1.ebuild
View File

@ -329,7 +329,7 @@ src_prepare() {
cd "${S}" cd "${S}"
epatch "${DISTDIR}/php52-backports-security-${PHP_PATCHSECURITY}.patch" epatch "${DISTDIR}/php52-backports-security-${PHP_PATCHSECURITY}.patch"
epatch "${FILESDIR}/pcre_info.patch" epatch "${FILESDIR}/pcre_info.patch"
eblit-run src_prepare v2 ; eblit-run src_prepare v2 ;
} }
src_configure() { eblit-run src_configure v521 ; } src_configure() { eblit-run src_configure v521 ; }
src_compile() { eblit-run src_compile v1 ; } src_compile() { eblit-run src_compile v1 ; }