Fix for bug #54712

13 files changed, 36 insertions, 37 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 3dcd920cfaad..627391db0cd9 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.151 2004/06/18 07:20:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.152 2004/06/23 05:29:35 stuart Exp $
+
+  23 Jun 2004; Stuart Herbert <stuart@gentoo.org> :
+  Added support for hardenedphp into mod_php 4.3.7
 
   18 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> files/70_mod_php.conf:
   fix bug #49020 and bug #54086.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 29262d4365f2..d15f2610c772 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,22 +1,22 @@
-MD5 0be65c5efc388ca0673785e4746aebb3 mod_php-4.3.7.ebuild 5763
-MD5 7a0b3f8a473e79fa402482eb06356bfa mod_php-4.3.6-r2.ebuild 5760
+MD5 652bb2d6ea0c593eec1c5f962c896347 mod_php-4.3.6_rc2.ebuild 5783
 MD5 994b983257af4eadbb8691a3c5a8be57 mod_php-4.3.6.ebuild 5736
 MD5 1c9e622c7f7b28e434fe307a585ec847 mod_php-4.3.6-r1.ebuild 5742
-MD5 f1cf6e4337dd237d68b5e74888652092 mod_php-4.3.5.ebuild 5736
+MD5 7a0b3f8a473e79fa402482eb06356bfa mod_php-4.3.6-r2.ebuild 5760
+MD5 0be65c5efc388ca0673785e4746aebb3 mod_php-4.3.7.ebuild 5763
 MD5 12910ada60efc5dde06ad0022624de2f ChangeLog 29031
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 652bb2d6ea0c593eec1c5f962c896347 mod_php-4.3.6_rc2.ebuild 5783
 MD5 35cdb18c880a60607dbe2a864c8ab420 mod_php-4.3.4-r4.ebuild 5380
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 f1cf6e4337dd237d68b5e74888652092 mod_php-4.3.5.ebuild 5736
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 3808a6e5185d9d2bb981e195dc59c101 files/70_mod_php.conf 1354
-MD5 abf76ecb45117098456e6ee3bf69944e files/digest-mod_php-4.3.5 282
+MD5 f00ccb8b9ef2c3da989d7ae4c2508e95 files/digest-mod_php-4.3.6_rc2 276
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-mod_php-4.3.6 350
-MD5 8f29e20cdf496ab8f73a0499f9f3947d files/digest-mod_php-4.3.7 282
-MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
-MD5 ccf6c900c87cc5afeb677f396286e8ab files/digest-mod_php-4.3.6_rc2 353
-MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 c2702f299c02afa047535bf819093868 files/digest-mod_php-4.3.4-r4 282
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-mod_php-4.3.6-r1 350
+MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-mod_php-4.3.6-r2 350
+MD5 01013db7bcb660532237428f5aa61b26 files/digest-mod_php-4.3.7 281
 MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717
+MD5 0f5e1f8a748d308e073f290fe89075a1 files/digest-mod_php-4.3.4-r4 205
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 c166c2da0029a4eb9b760e0aecd80ade files/digest-mod_php-4.3.5 205
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r4 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r4
index 76ff348f5e58..636668a87e84 100644
--- a/dev-php/mod_php/files/digest-mod_php-4.3.4-r4
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.4-r4
@@ -1,4 +1,3 @@
 MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.5 b/dev-php/mod_php/files/digest-mod_php-4.3.5
index fbe6856b0a8e..f948543203e1 100644
--- a/dev-php/mod_php/files/digest-mod_php-4.3.5
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.5
@@ -1,4 +1,3 @@
 MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 b/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2
index 75255b425993..a111ce61cffb 100644
--- a/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2
@@ -2,4 +2,3 @@ MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
 MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.7 b/dev-php/mod_php/files/digest-mod_php-4.3.7
index 81dc8536d260..5e33df889730 100644
--- a/dev-php/mod_php/files/digest-mod_php-4.3.7
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.7
@@ -1,4 +1,4 @@
 MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
+MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index e4dc6be656ca..7458985edf61 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.92 2004/06/21 09:45:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.93 2004/06/23 05:32:06 stuart Exp $
 
   21 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> :
   digest fix
 
+  22 Jun 2004; Stuart Herbert <stuart@gentoo.org> :
+  Added support to the eclass for hardenedphp on 4.3.7
+
   14 Jun 2004; Joshua Kinard <kumba@gentoo.org> php-4.3.7.ebuild,
   php-5.0_beta1-r1.ebuild:
   Marked stable on mips.
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index afe842465654..ce26fd2e7de9 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,22 +1,22 @@
 MD5 9c0f1c9007d1228bb89b64d937aaf966 php-5.0_beta1-r1.ebuild 1287
-MD5 dbc6a4888019558b88925680b7dad634 php-4.3.5.ebuild 1332
-MD5 4557278df0e67c7fa32ab901fce377b1 php-4.3.5-r1.ebuild 1083
-MD5 9b8d83a964cfe89c9f7247dffdd47ebe php-4.3.4-r4.ebuild 1409
-MD5 270e90af09804f6aa33fd6b1e0d3f942 php-4.3.7.ebuild 1085
-MD5 2c4f329f8ef101fc4b4c2853d870b04f php-5.0_beta1.ebuild 1164
-MD5 ee8a19b31e61a56379bd6bf2f22c75c4 php-4.3.6.ebuild 1081
-MD5 2f0c78fea0731b7bcec95488784e8829 ChangeLog 14077
+MD5 f5e80851ff2c5fc315c853c0878d1a0b php-4.3.5-r1.ebuild 1084
+MD5 1f8153e587ccf0269d23e4132fc947bf php-4.3.4-r4.ebuild 1410
+MD5 6b7831364a4d09a1f99902c45f65f670 ChangeLog 14185
+MD5 56999d1b2c6e7eb98b17df5f4e8a0ea7 php-4.3.6_rc2.ebuild 1130
+MD5 1fe73574e0aafa3123260fa3c562ee4c php-4.3.6.ebuild 1082
+MD5 c591193744980c483ec43d3532594cca php-4.3.5.ebuild 1333
+MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 00ebdf7279f125ed732d1ff3750f6145 php-4.3.6-r1.ebuild 1084
-MD5 56999d1b2c6e7eb98b17df5f4e8a0ea7 php-4.3.6_rc2.ebuild 1130
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 1686d6a8a45aa14d1e194be8cd7a8631 files/digest-php-4.3.6_rc2 279
-MD5 0b0cbd6c14fbbb37ba4850cb9eb64ec0 files/digest-php-4.3.4-r4 208
-MD5 c22d10993145488c26a332f1247e640e files/digest-php-4.3.5-r1 208
+MD5 270e90af09804f6aa33fd6b1e0d3f942 php-4.3.7.ebuild 1085
+MD5 1c8a4f1e84c9c40dd232bc40daafd0f4 files/digest-php-4.3.7 207
+MD5 f2214a80da2f53f5a17caeddfc34876f files/digest-php-4.3.5-r1 131
+MD5 06b23ac6e8c9a6658fa121c1fed7ee02 files/digest-php-4.3.6_rc2 202
+MD5 82e070bb15c97bb48b2533ab3f23d122 files/digest-php-4.3.6 276
 MD5 82e070bb15c97bb48b2533ab3f23d122 files/digest-php-4.3.6-r1 276
+MD5 bb70a1c76063845cc7a7aa8b1be746da files/digest-php-4.3.4-r4 131
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 c22d10993145488c26a332f1247e640e files/digest-php-4.3.5 208
-MD5 82e070bb15c97bb48b2533ab3f23d122 files/digest-php-4.3.6 276
-MD5 de0839bd52dd5606f98b737e316b9e79 files/digest-php-4.3.7 208
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 f2214a80da2f53f5a17caeddfc34876f files/digest-php-4.3.5 131
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
diff --git a/dev-php/php/files/digest-php-4.3.4-r4 b/dev-php/php/files/digest-php-4.3.4-r4
index 0036e73181f7..148cc4b71594 100644
--- a/dev-php/php/files/digest-php-4.3.4-r4
+++ b/dev-php/php/files/digest-php-4.3.4-r4
@@ -1,3 +1,2 @@
 MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php/files/digest-php-4.3.5 b/dev-php/php/files/digest-php-4.3.5
index da099ffaa2d1..9b6b4ca86e74 100644
--- a/dev-php/php/files/digest-php-4.3.5
+++ b/dev-php/php/files/digest-php-4.3.5
@@ -1,3 +1,2 @@
 MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php/files/digest-php-4.3.5-r1 b/dev-php/php/files/digest-php-4.3.5-r1
index da099ffaa2d1..9b6b4ca86e74 100644
--- a/dev-php/php/files/digest-php-4.3.5-r1
+++ b/dev-php/php/files/digest-php-4.3.5-r1
@@ -1,3 +1,2 @@
 MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php/files/digest-php-4.3.6_rc2 b/dev-php/php/files/digest-php-4.3.6_rc2
index e047822aaad2..83bfdd9c0b36 100644
--- a/dev-php/php/files/digest-php-4.3.6_rc2
+++ b/dev-php/php/files/digest-php-4.3.6_rc2
@@ -1,4 +1,3 @@
 MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
 MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php/files/digest-php-4.3.7 b/dev-php/php/files/digest-php-4.3.7
index e0875a4d0668..abd92d2f9274 100644
--- a/dev-php/php/files/digest-php-4.3.7
+++ b/dev-php/php/files/digest-php-4.3.7
@@ -1,3 +1,3 @@
 MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
 MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
+MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592