diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2005-11-04 10:58:43 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2005-11-04 10:58:43 +0000 |
| commit | baedf7171cdde2dbe2ab47395adde0b1798cefe9 (patch) | |
| tree | 75fb864ba206f9b7ad130d665ac84258444b464a /dev-php/php-cgi | |
| parent | Bump requirement of spidermonkey to a version that actually provide jsapi.h. ... (diff) | |
| download | gentoo-2-baedf7171cdde2dbe2ab47395adde0b1798cefe9.tar.gz gentoo-2-baedf7171cdde2dbe2ab47395adde0b1798cefe9.tar.bz2 gentoo-2-baedf7171cdde2dbe2ab47395adde0b1798cefe9.zip | |
Fix for http://bugs.php.net/bug.php?id=35067.
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'dev-php/php-cgi')
| -rw-r--r-- | dev-php/php-cgi/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-php/php-cgi/Manifest | 16 | ||||
| -rw-r--r-- | dev-php/php-cgi/files/php4.3.11-globals_overwrite.patch | 11 | ||||
| -rw-r--r-- | dev-php/php-cgi/files/php4.4.0-globals_overwrite.patch | 11 |
4 files changed, 9 insertions, 36 deletions
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog index 48ee5fdc70cf..1cb1c2db9d5e 100644 --- a/dev-php/php-cgi/ChangeLog +++ b/dev-php/php-cgi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-php/php-cgi # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.105 2005/11/04 07:45:49 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.106 2005/11/04 10:57:27 chtekk Exp $ + + 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> + files/php4.3.11-globals_overwrite.patch, + files/php4.4.0-globals_overwrite.patch: + Fix for http://bugs.php.net/bug.php?id=35067. 04 Nov 2005; Mark Loeser <halcy0n@gentoo.org> php-cgi-4.3.11-r4.ebuild, php-cgi-4.4.0-r4.ebuild: diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest index 0e8da5ca5ce2..ee4a12bb70a7 100644 --- a/dev-php/php-cgi/Manifest +++ b/dev-php/php-cgi/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 bb300d45d66bfd049b1265862dd098c6 ChangeLog 15609 +MD5 bed80fc2487501adccf13f14e8386c85 ChangeLog 15794 MD5 cc21a816357d93a1d31cd44f861183c7 files/digest-php-cgi-4.3.11-r1 287 MD5 05df4c881b1833626d9a75a08a0098fd files/digest-php-cgi-4.3.11-r2 364 MD5 05df4c881b1833626d9a75a08a0098fd files/digest-php-cgi-4.3.11-r4 364 @@ -14,7 +11,7 @@ MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925 MD5 09637e8f6f861b1f3698ec0390ec6b57 files/php4.3.11-curl_safemode.patch 5129 MD5 cb36a386184ed6a887f62d2205f57173 files/php4.3.11-fopen_wrappers.patch 1481 MD5 4db8e0b66cde22dd4e4d9f51e59f6098 files/php4.3.11-gd_safe_mode.patch 1573 -MD5 480060d9a5de72030e2fce541e2830f8 files/php4.3.11-globals_overwrite.patch 18395 +MD5 89d12226b1726b681df274be79043411 files/php4.3.11-globals_overwrite.patch 18011 MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238 MD5 a9b932952f12aa01a9f98a7fcbf32ed9 files/php4.3.11-pcre-security.patch 6031 MD5 43b4113d1fb159955b0d5ed307cac143 files/php4.3.11-phpinfo_xss.patch 2518 @@ -23,7 +20,7 @@ MD5 17b906361a7ab8a3008446871623eeae files/php4.3.11-session_save_path-segf.patc MD5 0429f8334ba4bab659a2e41ce5debc80 files/php4.4.0-curl_safemode.patch 1937 MD5 cb36a386184ed6a887f62d2205f57173 files/php4.4.0-fopen_wrappers.patch 1481 MD5 a540c54ba22dc16b157edcf1ecb6258f files/php4.4.0-gd_safe_mode.patch 883 -MD5 ac3e0691fbecf920d030a35bc8e02109 files/php4.4.0-globals_overwrite.patch 10115 +MD5 7c45198e6118d82c680e9ed56e7d1df0 files/php4.4.0-globals_overwrite.patch 9731 MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238 MD5 54a4ad0766f89185d7de2c6d07b07296 files/php4.4.0-pcre-security.patch 6177 MD5 57644300fb52ad610fa52ae8ba6b522b files/php4.4.0-phpinfo_xss.patch 1284 @@ -37,10 +34,3 @@ MD5 56118eb0c5d90c47c6f73c9db6eccb69 php-cgi-4.4.0-r1.ebuild 972 MD5 d9deaac08b78b996c648e1cbc9640ffa php-cgi-4.4.0-r2.ebuild 1711 MD5 806d1e1d7328261507b266b11849344a php-cgi-4.4.0-r4.ebuild 2631 MD5 daa51bac42996b36311b5c6049f95b4e php-cgi-4.4.0.ebuild 972 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDaxG2CRZPokWLroQRAtvUAKCf19UUz0ux7hbCBYbcP+OUtwoIqgCeKu1R -+/MmvKEeuGjqUJ1ULflG8aM= -=OdnD ------END PGP SIGNATURE----- diff --git a/dev-php/php-cgi/files/php4.3.11-globals_overwrite.patch b/dev-php/php-cgi/files/php4.3.11-globals_overwrite.patch index d3eb55c5ee3e..fea8c7a1ec50 100644 --- a/dev-php/php-cgi/files/php4.3.11-globals_overwrite.patch +++ b/dev-php/php-cgi/files/php4.3.11-globals_overwrite.patch @@ -249,17 +249,6 @@ #if HAVE_ARPA_INET_H # include <arpa/inet.h> -@@ -813,8 +802,8 @@ - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) -- PHP_FE(current, first_arg_force_ref) -- PHP_FE(key, first_arg_force_ref) -+ PHP_FE(current, NULL) -+ PHP_FE(key, NULL) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) @@ -944,6 +933,13 @@ static void php_putenv_destructor(putenv_entry *pe) { diff --git a/dev-php/php-cgi/files/php4.4.0-globals_overwrite.patch b/dev-php/php-cgi/files/php4.4.0-globals_overwrite.patch index 3aefaee16295..3b13cd71966c 100644 --- a/dev-php/php-cgi/files/php4.4.0-globals_overwrite.patch +++ b/dev-php/php-cgi/files/php4.4.0-globals_overwrite.patch @@ -192,17 +192,6 @@ #if HAVE_ARPA_INET_H # include <arpa/inet.h> -@@ -813,8 +802,8 @@ - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) -- PHP_FE(current, first_arg_force_ref) -- PHP_FE(key, first_arg_force_ref) -+ PHP_FE(current, NULL) -+ PHP_FE(key, NULL) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) @@ -3038,11 +3027,25 @@ prefix = va_arg(args, char *); prefix_len = va_arg(args, uint); |