Revbump to fix some bugs.

Package-Manager: portage-2.0.53_rc6

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 84c2e70338b88342b3a4e3af72c074cb10cfd30d..21629b4c1d76c3696c1fa9e7354c6288d351c46e 100644 (file)
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.52 2005/11/04 11:19:08 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.53 2005/11/04 12:45:21 chtekk Exp $
+
+*php-5.0.5-r4 (04 Nov 2005)
+*php-5.0.4-r4 (04 Nov 2005)
+*php-4.4.1-r2 (04 Nov 2005)
+*php-4.4.0-r4 (04 Nov 2005)
+*php-4.3.11-r4 (04 Nov 2005)
+
+  04 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  files/4.3.11/php4.3.11-session_save_path-segf.patch,
+  files/5.0.4/php5.0.4-session_save_path-segf.patch,
+  files/4.4.0/php4.4.0-session_save_path-segf.patch,
+  files/5.0.5/php5.0.5-session_save_path-segf.patch, -php-4.3.11-r3.ebuild,
+  +php-4.3.11-r4.ebuild, -php-4.4.0-r3.ebuild, +php-4.4.0-r4.ebuild,
+  -php-4.4.1-r1.ebuild, +php-4.4.1-r2.ebuild, -php-5.0.4-r3.ebuild,
+  +php-5.0.4-r4.ebuild, -php-5.0.5-r3.ebuild, +php-5.0.5-r4.ebuild:
+  Revbump to fix a bug in the Apache2 SAPI and a bug with key() and current().
 
   04 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
   files/4.3.11/php4.3.11-globals_overwrite.patch,

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 9bb6ead1e4f608ee3ea43ad1c26af1b1bea121a4..bd4b1dd0809edec724e6f4e06ed5ad00980049a4 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
-MD5 4e347979e1038dbddfe1bba47fb8972a ChangeLog 8979
+MD5 3a1f5bb9c3c4787ec7c195a7db0ea394 ChangeLog 9694
 MD5 389638f1d46b6c41cd4d87b471572f4b files/4-any/apache-1.3/70_mod_php.conf 484
 MD5 ee36e31632adb08b7abf70f78b5b2125 files/4-any/apache-2.0/70_mod_php.conf 485
 MD5 f0acca9c6387b8ca139d2849665bd16f files/4-any/php4-fastbuild.patch 9012
@@ -14,7 +14,7 @@ MD5 89d12226b1726b681df274be79043411 files/4.3.11/php4.3.11-globals_overwrite.pa
 MD5 3f80d0c6c58fd4ea02b7efdf69265721 files/4.3.11/php4.3.11-pcre-security.patch 1667
 MD5 43b4113d1fb159955b0d5ed307cac143 files/4.3.11/php4.3.11-phpinfo_xss.patch 2518
 MD5 48d9c939434e9b01d0696410d59c503c files/4.3.11/php4.3.11-pspell-ext-segf.patch 8482
-MD5 17b906361a7ab8a3008446871623eeae files/4.3.11/php4.3.11-session_save_path-segf.patch 4938
+MD5 2646498369dc5c64c318ee6da2f9487a files/4.3.11/php4.3.11-session_save_path-segf.patch 4961
 MD5 0429f8334ba4bab659a2e41ce5debc80 files/4.4.0/php4.4.0-curl_safemode.patch 1937
 MD5 cb36a386184ed6a887f62d2205f57173 files/4.4.0/php4.4.0-fopen_wrappers.patch 1481
 MD5 a540c54ba22dc16b157edcf1ecb6258f files/4.4.0/php4.4.0-gd_safe_mode.patch 883
@@ -22,7 +22,7 @@ MD5 7c45198e6118d82c680e9ed56e7d1df0 files/4.4.0/php4.4.0-globals_overwrite.patc
 MD5 5f1f48c87cafe0949e73ef064c99e5ed files/4.4.0/php4.4.0-pcre-security.patch 1741
 MD5 57644300fb52ad610fa52ae8ba6b522b files/4.4.0/php4.4.0-phpinfo_xss.patch 1284
 MD5 48d9c939434e9b01d0696410d59c503c files/4.4.0/php4.4.0-pspell-ext-segf.patch 8482
-MD5 83fb9efb602c178741ea2e40e13b014f files/4.4.0/php4.4.0-session_save_path-segf.patch 4132
+MD5 3d3986815e0e06adce512b36959e6f26 files/4.4.0/php4.4.0-session_save_path-segf.patch 4155
 MD5 e2dde7269b4d3315f2030622f016478c files/4.4.1/php4.4.1-current_key_by_reference.patch 864
 MD5 7a68ebae340c5eb9fdb97fa8e2e3870f files/4.4.1/php4.4.1-mod_rewrite-crash.patch 940
 MD5 96ed6efe383833dbb880fef3b6c562bb files/5.0-any/apache-1.3/70_mod_php5.conf 524
@@ -40,7 +40,7 @@ MD5 c5e906110383e3e5157ead566c2f5797 files/5.0.4/php5.0.4-globals_overwrite.patc
 MD5 03a57319b93ee44a2fe159a0fb67592e files/5.0.4/php5.0.4-pcre-security.patch 1659
 MD5 2c557f6641927cbf40e25abf71e46a1b files/5.0.4/php5.0.4-phpinfo_xss.patch 2476
 MD5 ab931f65aefab4da99c6353b2c503d70 files/5.0.4/php5.0.4-pspell-ext-segf.patch 9422
-MD5 a0b87571b3bf155e835edc4497d1c4bf files/5.0.4/php5.0.4-session_save_path-segf.patch 5127
+MD5 ff34a187af5e68cd7dad49086ed8f61d files/5.0.4/php5.0.4-session_save_path-segf.patch 5150
 MD5 e157161249ad2b217dc532f5289ba74b files/5.0.4/php5.0.4-xmlrcp-ccode.diff 750
 MD5 3a3e34b20c95ab90b8a9ceeb787462bd files/5.0.5/php5.0.5-curl_safemode.patch 2061
 MD5 9e31c5edb0ded1d57ed90859d3ef168c files/5.0.5/php5.0.5-fopen_wrappers.patch 942
@@ -48,7 +48,7 @@ MD5 8f52c6df24afb096109118582c1bf3eb files/5.0.5/php5.0.5-gd_safe_mode.patch 875
 MD5 54462370e3ddc7b0a1f46509ad43120c files/5.0.5/php5.0.5-globals_overwrite.patch 6287
 MD5 b95f630e058c1b0f9cc47e186ef182cf files/5.0.5/php5.0.5-obj-serialize.patch 1364
 MD5 ab931f65aefab4da99c6353b2c503d70 files/5.0.5/php5.0.5-pspell-ext-segf.patch 9422
-MD5 8845848ffde7cfee1a3f57f6feaae8dd files/5.0.5/php5.0.5-session_save_path-segf.patch 4090
+MD5 ac8d4fef43dc890da990cf901009c70d files/5.0.5/php5.0.5-session_save_path-segf.patch 4113
 MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1-any/apache-1.3/70_mod_php5.conf 524
 MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.1-any/apache-2.0/70_mod_php5.conf 525
 MD5 8392d102bb64d0e136d7b74302f51752 files/5.1-any/php5-fastbuild.patch 9580
@@ -57,14 +57,14 @@ MD5 63c7937867dd8cc04b5089c3678ef359 files/5.1-any/php5-iodbc-config.diff 519
 MD5 058042718bc876bf27ab902673919ca9 files/5.1-any/php5-prefork.patch 850
 MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1-any/php5-soap_persistence_session.diff 1976
 MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1-any/php5-with-iodbc.diff 443
-MD5 5f8f18e68edb61b60cfa21a4ff65170b files/digest-php-4.3.11-r3 223
-MD5 c9e2d252f3ae26871c06d35ebfe6fb1e files/digest-php-4.4.0-r3 221
-MD5 c273cf40d79922fb1d77d7bd352d1bb9 files/digest-php-4.4.1-r1 143
-MD5 71facfede997494a03e635bc07a14a2f files/digest-php-5.0.4-r3 220
-MD5 96fdb35fc6f5b775c569db88d89200d7 files/digest-php-5.0.5-r3 143
+MD5 5f8f18e68edb61b60cfa21a4ff65170b files/digest-php-4.3.11-r4 223
+MD5 c9e2d252f3ae26871c06d35ebfe6fb1e files/digest-php-4.4.0-r4 221
+MD5 c273cf40d79922fb1d77d7bd352d1bb9 files/digest-php-4.4.1-r2 143
+MD5 71facfede997494a03e635bc07a14a2f files/digest-php-5.0.4-r4 220
+MD5 96fdb35fc6f5b775c569db88d89200d7 files/digest-php-5.0.5-r4 143
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 dd4e596a3be26f261e3a5a52330f9b2d php-4.3.11-r3.ebuild 9240
-MD5 466de8a0d0e1860f4487428a1c7106d5 php-4.4.0-r3.ebuild 9235
-MD5 1f67a51ce9e57a180ad4db2017ede648 php-4.4.1-r1.ebuild 7991
-MD5 6e8ab5a55a1bc9eda90d0f8fa7e93b32 php-5.0.4-r3.ebuild 6293
-MD5 6ad12146831f0ab9b9bae8a5f6bfe566 php-5.0.5-r3.ebuild 5654
+MD5 868b40d33440229d3711419609c47895 php-4.3.11-r4.ebuild 9240
+MD5 7ff8067aa4c62a68fb889fc4c6ab8d07 php-4.4.0-r4.ebuild 9235
+MD5 a1240cee1bef973beaa7c10fcee025c8 php-4.4.1-r2.ebuild 7991
+MD5 4a52313f1847376214c78603ffc14935 php-5.0.4-r4.ebuild 6293
+MD5 6a9d53c6cf0a95370dc554c20748346e php-5.0.5-r4.ebuild 5654

diff --git a/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch b/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch
index 3836776b14b4b102f81f77c7dacf4b8c5a748e75..65886a2488e6d97bb16b9018b0a1a618df1ac65d 100644 (file)
--- a/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch
+++ b/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch
@@ -138,7 +138,7 @@
 +              if (!parent_req) {
 +                      parent_req = ctx->r;
 +              }
-+              if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++              if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +                      if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +                              zend_bailout();
 +                      }

diff --git a/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch b/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch
index 8f936ae5ec3966e56f9775fbe1ee788cf29109c2..2c712b0da2d69ab356fb8dd1679e7eb6b9f9d92e 100644 (file)
--- a/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch
+++ b/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch
@@ -111,7 +111,7 @@
 +              if (!parent_req) {
 +                      parent_req = ctx->r;
 +              }
-+              if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++              if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +                      if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +                              zend_bailout();
 +                      }

diff --git a/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch b/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch
index f984d73b0d6479db45d757660d5eb531e81172df..15c4a870c8ecb2bda8482155fa4e4c6f1eb0ad89 100644 (file)
--- a/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch
+++ b/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch
@@ -148,7 +148,7 @@
 +              if (!parent_req) {
 +                      parent_req = ctx->r;
 +              }
-+              if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++              if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +                      if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +                              zend_bailout();
 +                      }

diff --git a/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch b/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch
index aee032ff5603782241b0c2c50f39a6ebf2e2f99a..8e0a45f562512ea96a03c89dca8c252cb6a6eac3 100644 (file)
--- a/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch
+++ b/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch
@@ -112,7 +112,7 @@
 +              if (!parent_req) {
 +                      parent_req = ctx->r;
 +              }
-+              if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++              if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +                      if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +                              zend_bailout();
 +                      }

diff --git a/dev-lang/php/files/digest-php-4.3.11-r3 b/dev-lang/php/files/digest-php-4.3.11-r4
similarity index 100%
rename from dev-lang/php/files/digest-php-4.3.11-r3
rename to dev-lang/php/files/digest-php-4.3.11-r4

diff --git a/dev-lang/php/files/digest-php-4.4.0-r3 b/dev-lang/php/files/digest-php-4.4.0-r4
similarity index 100%
rename from dev-lang/php/files/digest-php-4.4.0-r3
rename to dev-lang/php/files/digest-php-4.4.0-r4

diff --git a/dev-lang/php/files/digest-php-4.4.1-r1 b/dev-lang/php/files/digest-php-4.4.1-r2
similarity index 100%
rename from dev-lang/php/files/digest-php-4.4.1-r1
rename to dev-lang/php/files/digest-php-4.4.1-r2

diff --git a/dev-lang/php/files/digest-php-5.0.4-r3 b/dev-lang/php/files/digest-php-5.0.4-r4
similarity index 100%
rename from dev-lang/php/files/digest-php-5.0.4-r3
rename to dev-lang/php/files/digest-php-5.0.4-r4

diff --git a/dev-lang/php/files/digest-php-5.0.5-r3 b/dev-lang/php/files/digest-php-5.0.5-r4
similarity index 100%
rename from dev-lang/php/files/digest-php-5.0.5-r3
rename to dev-lang/php/files/digest-php-5.0.5-r4

diff --git a/dev-lang/php/php-4.3.11-r3.ebuild b/dev-lang/php/php-4.3.11-r4.ebuild
similarity index 98%
rename from dev-lang/php/php-4.3.11-r3.ebuild
rename to dev-lang/php/php-4.3.11-r4.ebuild
index 34dd2554145a9104f21e79607ccabf1e93c3d850..582a683da162339285ff6b6186c552b55a777873 100644 (file)
--- a/dev-lang/php/php-4.3.11-r3.ebuild
+++ b/dev-lang/php/php-4.3.11-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r3.ebuild,v 1.1 2005/11/03 14:09:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~arm ~s390 ~sparc ~x86"

diff --git a/dev-lang/php/php-4.4.0-r3.ebuild b/dev-lang/php/php-4.4.0-r4.ebuild
similarity index 98%
rename from dev-lang/php/php-4.4.0-r3.ebuild
rename to dev-lang/php/php-4.4.0-r4.ebuild
index 136f04d5dc056bdda31e075b1a0ea60e5f0fb823..e722c10b6086fd42b392b2ecf6bba5fa8f203659 100644 (file)
--- a/dev-lang/php/php-4.4.0-r3.ebuild
+++ b/dev-lang/php/php-4.4.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0-r3.ebuild,v 1.1 2005/11/03 14:09:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"

diff --git a/dev-lang/php/php-4.4.1-r1.ebuild b/dev-lang/php/php-4.4.1-r2.ebuild
similarity index 98%
rename from dev-lang/php/php-4.4.1-r1.ebuild
rename to dev-lang/php/php-4.4.1-r2.ebuild
index e8cceb708d83ddd60f68f7930bdda6b6650a720e..f78062f0d8d3bc74e6e2024fbedf224c3d439954 100644 (file)
--- a/dev-lang/php/php-4.4.1-r1.ebuild
+++ b/dev-lang/php/php-4.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r1.ebuild,v 1.2 2005/11/04 11:19:08 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r2.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~x86"

diff --git a/dev-lang/php/php-5.0.4-r3.ebuild b/dev-lang/php/php-5.0.4-r4.ebuild
similarity index 98%
rename from dev-lang/php/php-5.0.4-r3.ebuild
rename to dev-lang/php/php-5.0.4-r4.ebuild
index 92c012411c88061f0d9974fed35b51c23eb56dc8..561af6fd645465b8b4d2d5156d578e67f67fbabf 100644 (file)
--- a/dev-lang/php/php-5.0.4-r3.ebuild
+++ b/dev-lang/php/php-5.0.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4-r3.ebuild,v 1.1 2005/11/03 14:09:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"

diff --git a/dev-lang/php/php-5.0.5-r3.ebuild b/dev-lang/php/php-5.0.5-r4.ebuild
similarity index 98%
rename from dev-lang/php/php-5.0.5-r3.ebuild
rename to dev-lang/php/php-5.0.5-r4.ebuild
index fc499c47d969df194476a659bbb03d92f846caf9..9da79263c44d84799dfb780d01c1a4231b0c84b9 100644 (file)
--- a/dev-lang/php/php-5.0.5-r3.ebuild
+++ b/dev-lang/php/php-5.0.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r3.ebuild,v 1.1 2005/11/03 14:09:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"