New PHP versions, fix lots of bugs, add Suhosin support.
authorLuca Longinotti <chtekk@gentoo.org>
Mon, 5 Mar 2007 02:14:44 +0000 (02:14 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Mon, 5 Mar 2007 02:14:44 +0000 (02:14 +0000)
Package-Manager: portage-2.1.2.1

16 files changed:
dev-lang/php/ChangeLog
dev-lang/php/Manifest
dev-lang/php/files/20php4-envd [new file with mode: 0644]
dev-lang/php/files/20php5-envd [new file with mode: 0644]
dev-lang/php/files/digest-php-4.3.11-r5
dev-lang/php/files/digest-php-4.4.4-r6
dev-lang/php/files/digest-php-4.4.4-r8 [deleted file]
dev-lang/php/files/digest-php-4.4.6 [new file with mode: 0644]
dev-lang/php/files/digest-php-5.0.5-r5
dev-lang/php/files/digest-php-5.1.6-r11 [new file with mode: 0644]
dev-lang/php/files/digest-php-5.1.6-r6
dev-lang/php/files/digest-php-5.1.6-r8 [deleted file]
dev-lang/php/files/digest-php-5.2.1-r3 [new file with mode: 0644]
dev-lang/php/php-4.4.6.ebuild [moved from dev-lang/php/php-4.4.4-r8.ebuild with 97% similarity]
dev-lang/php/php-5.1.6-r11.ebuild [moved from dev-lang/php/php-5.1.6-r8.ebuild with 97% similarity]
dev-lang/php/php-5.2.1-r3.ebuild [new file with mode: 0644]

index 09c52adab8c68c9714c409e70f892310079d9714..b7b095862b4afdb6c5eabfee9cc944a077472cc9 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/php
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.148 2006/11/26 23:35:54 chtekk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.149 2007/03/05 02:14:43 chtekk Exp $
+
+*php-5.2.1-r3 (05 Mar 2007)
+*php-5.1.6-r11 (05 Mar 2007)
+*php-4.4.6 (05 Mar 2007)
+
+  05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> +files/20php4-envd,
+  +files/20php5-envd, -php-4.4.4-r8.ebuild, +php-4.4.6.ebuild,
+  -php-5.1.6-r8.ebuild, +php-5.1.6-r11.ebuild, +php-5.2.1-r3.ebuild:
+  New PHP versions, fix lots of bugs, add Suhosin support.
 
   26 Nov 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.3-r1.ebuild,
   -php-4.4.4-r4.ebuild, -php-5.1.4-r6.ebuild, -php-5.1.6-r4.ebuild:
index 5a3498b78828a8498e5a444d2e3b6f0ab4869d00..aa5453aeb3f4be6dc631ce0548ab8c34d960ed18 100644 (file)
@@ -1,3 +1,11 @@
+AUX 20php4-envd 179 RMD160 6492d9930759b59476ece852e5c84ca3476afea8 SHA1 d0c5739c4a1bc9dbb5a0383b363d9a51e02785a8 SHA256 75e562ca48d425f5efddfc3cfd99e6c462d528d28b324b70126d327e6a425d42
+MD5 400818a184be4f73231403cbcbb059d5 files/20php4-envd 179
+RMD160 6492d9930759b59476ece852e5c84ca3476afea8 files/20php4-envd 179
+SHA256 75e562ca48d425f5efddfc3cfd99e6c462d528d28b324b70126d327e6a425d42 files/20php4-envd 179
+AUX 20php5-envd 179 RMD160 e9022db3454eb992b13acaf76635baa65ee2f061 SHA1 20556ed7628859263ee8686de87344a97570f40a SHA256 b1ffdf6663818df7f8fc488bb91f68ba7b860bcb1ba9da571f71259c8db5dc2c
+MD5 e771b1fa3f0f41858f53cd042f034946 files/20php5-envd 179
+RMD160 e9022db3454eb992b13acaf76635baa65ee2f061 files/20php5-envd 179
+SHA256 b1ffdf6663818df7f8fc488bb91f68ba7b860bcb1ba9da571f71259c8db5dc2c files/20php5-envd 179
 AUX 70_mod_php.conf-apache1 454 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 SHA1 27e7fc24e1793bacef9b9735102d335b1a5d21ff SHA256 9e6227e508f0c297f48c667e2135c7692f7943b3d0cd2ffdbdcca0bad5220343
 MD5 6171c7aa95f69b8a54b0f29bd1056d2b files/70_mod_php.conf-apache1 454
 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 files/70_mod_php.conf-apache1 454
@@ -30,21 +38,23 @@ AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c925
 MD5 9b26422d0bda7252a77a81d1b734e1bd files/php5-ldvs 22
 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 files/php5-ldvs 22
 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 files/php5-ldvs 22
-DIST hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180 RMD160 abc0ce0ee3020c9ec67ac595531c0fae13c8d351 SHA1 ef536a5379819f8bd9e11d7c02d1067ce093621b SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7
-DIST hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351 RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 SHA1 895d5b69eed881d11452230e35a76c30d32b6ce0 SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291
-DIST hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864 RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d SHA1 3f69694a541c9014c5b52669c4259ce11209da7b SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c
-DIST hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476 RMD160 5185bf7b2282b3bed2f6a06a8314cfab7b5b8cbc SHA1 78d0d71803c5a974a9c4d2677182cea78c03f759 SHA256 836416114d4408377d04ee5b704dde0bd74511c0f114fe02602dab12e9e4902c
 DIST php-4.3.11.tar.bz2 4012575 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 SHA1 617ce50bb125ee841f71e67638c492999cd3bd18 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5
 DIST php-4.4.4.tar.bz2 4478698 RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 SHA1 05d62910fb5734344db87f0a17b1e8e001b26b05 SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b
+DIST php-4.4.6.tar.bz2 4559282 RMD160 16a81ee94d1f8f56adf3e76dde32c62597130674 SHA1 e9c11ae084e2d505568d672afd06d4e6fc431621 SHA256 c468c70e9536b5cbaf8a2615ab9e13c065da19944314633eef675be4d4e40065
 DIST php-5.0.5.tar.bz2 4895556 RMD160 6a9a892affba229770154407860cd1c2a098eaf9 SHA1 ffcc050f879265eb96f2c8dc79fa895047da9d4a SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f
 DIST php-5.1.6.tar.bz2 6454408 RMD160 7ac52f4674532397c982f6ced594b70dd17522af SHA1 a20b946f1de0a8a35a8a6bf437adbba4e5448d27 SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
+DIST php-5.2.1.tar.bz2 7163383 RMD160 f75078e0e43cb9c64e6d0a8d51a2ebd23cc9131d SHA1 978ce7cde3d988d9aa672e32e46f815a8b25baa0 SHA256 4b60fa70969644d193d58dd7cb9f2765e304c6368e98b1551e92e8d4e14d35ed
 DIST php-patchset-4.3.11-r3.tar.bz2 27977 RMD160 a99c2eecca8e6e51cdb2f66e7da2d0a446fb8d50 SHA1 9c229a70b52db40e752be8f0557865d8ec602f40 SHA256 4b93cdebc3034e81d9c589e90fdf93e84ea67712a56afaad5b0b299edfe6d76b
 DIST php-patchset-4.4.4-r3.tar.bz2 21530 RMD160 79afbba7947b9e6e94f8dcbcda19997b3ff7d462 SHA1 2d7b8f122ed0454e0d69ada37c60fec98f92aef1 SHA256 c49244a01e67c60f8c984efc9fdcca0154c9a80124788a16ef63e645dca97cb2
-DIST php-patchset-4.4.4-r4.tar.bz2 21579 RMD160 6a46f412185b9775dc2b1a1bb0801248b3702ea1 SHA1 4f9c744331fed9ac46c59082cf9ccf75b1d094e4 SHA256 62c63d3d04d5cfd856ee8c74e6617089235b1abe4df4baf450c5888945acfa20
+DIST php-patchset-4.4.6-r1.tar.bz2 19282 RMD160 e2576d82f1ca6e1336834ed87767fac9471623c0 SHA1 b72b3f0156c7246351d6ef6beb5b0f762311cebb SHA256 2fb21dfe058fabc57e63e01cc9990c6d8d5d9d74ebd9cc42c13d58cc64f71016
 DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed218589949aea SHA1 54d9edc8e8becc1b0822f30b784f029eb5417db3 SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2
 DIST php-patchset-5.1.6-r3.tar.bz2 25666 RMD160 77bcca9e95e828bc73320c978d323eeda87a54f0 SHA1 71f2037f08db23dd682f4f7f7bdf0df9483f59c3 SHA256 afacb3ba0cac6b796c828106082da105cb7c34ef7c5f094cd139a1b3c31f1989
-DIST php-patchset-5.1.6-r4.tar.bz2 26474 RMD160 fa1ac197d9f9a97e053f20b64babdfeec371dbb3 SHA1 d0242a65e8ac7eef96f2237d6361fbaf1873bf04 SHA256 c90c724072b3f826e474c646eb907202c0166df472b64538863263b7bf9c028d
+DIST php-patchset-5.1.6-r8.tar.bz2 30004 RMD160 5f93cda0783ba541cdc392d8f82344d340a6cc47 SHA1 cdcfe0ff21b9dca81436dc449518f51129f00eb7 SHA256 f9e5f9b9ccf0fd4be00822a4d75832eb09f989db7229e275b666f00e6dad93d7
+DIST php-patchset-5.2.1-r4.tar.bz2 23599 RMD160 271aee07634277b37c450824d2f188203beef154 SHA1 bca08b890726caff2c1c3d6972d1418a73313bcc SHA256 fc4627d63cd387981b3c3f04e2d5c83a227e446929aefbbc44316981c3565138
 DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA1 040bf3344d68fff3eb1829a2a02586499de5c2ee SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19
+DIST suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530 RMD160 cdf02a0ed5d66203c0082063c87b66a6e4109088 SHA1 94002207bbf429565b523c06490125fc903d4376 SHA256 8a52e6c9b1f1c980734daf2fa0d5e68364cd64b20a7c82d68c7fdd135cb788f8
+DIST suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153 RMD160 8ae3b22638f927041f769e8052fba3841f891bbf SHA1 dcdb33fa9000196c0f516fdd70b762bcccf781d9 SHA256 07c89856820e2dbbefdb5141412fa1a52dd6f9f38fa987573fdccf5fa6a68361
+DIST suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686 RMD160 93d0ba56d9caa5264e60e812e18d100180d610bc SHA1 1996b61e8989b6f132840727911ff340f8163c19 SHA256 f6072cfd46f9d308b43653844c3f5062e6ce0bfe91c02da0a10c96905f0d0829
 EBUILD php-4.3.11-r5.ebuild 14932 RMD160 496b57fd984931f17edb7c00521988fd0b04c893 SHA1 1097ac9cdfd25179203032ed482574bf6021b773 SHA256 a48ab17f67dfbb3c4a598a02ef059a5320c15063fa2863c16f23e1ac936176c0
 MD5 73dadb37690226c70f1f1be9eec1e3b5 php-4.3.11-r5.ebuild 14932
 RMD160 496b57fd984931f17edb7c00521988fd0b04c893 php-4.3.11-r5.ebuild 14932
@@ -53,45 +63,52 @@ EBUILD php-4.4.4-r6.ebuild 15378 RMD160 e64af834e2616cd20e21a3c92f4e41314d091c69
 MD5 9204b756d4c7314074d2e4cbbb8a651d php-4.4.4-r6.ebuild 15378
 RMD160 e64af834e2616cd20e21a3c92f4e41314d091c69 php-4.4.4-r6.ebuild 15378
 SHA256 012ce5ef2536838b3d509bb9ed0cd1b389416d5d27b6a80920da3912f23c5805 php-4.4.4-r6.ebuild 15378
-EBUILD php-4.4.4-r8.ebuild 15389 RMD160 234b4cb83fec10c6a46b46a2ce502916f207e05a SHA1 97a21c8785a8517e0b2f1112c51b49860cfe220f SHA256 d231535be8afc8dd2f1a5dfaa6469ea9391e0ac3ca8435b2a13ddb844aa816a6
-MD5 8b0c51997b9701f360e4906e55003432 php-4.4.4-r8.ebuild 15389
-RMD160 234b4cb83fec10c6a46b46a2ce502916f207e05a php-4.4.4-r8.ebuild 15389
-SHA256 d231535be8afc8dd2f1a5dfaa6469ea9391e0ac3ca8435b2a13ddb844aa816a6 php-4.4.4-r8.ebuild 15389
+EBUILD php-4.4.6.ebuild 15510 RMD160 b417099934cd0c488f179bf9f2425aa10d6bb026 SHA1 ca8e9e5ff21a1870ff23317539f2ad8cc792de38 SHA256 d401dd25e97a43481f025e9a2be1ecaefc195092386d78cbff633b0d91995e5c
+MD5 1e4ff484849b3ee16eae81aa145592d2 php-4.4.6.ebuild 15510
+RMD160 b417099934cd0c488f179bf9f2425aa10d6bb026 php-4.4.6.ebuild 15510
+SHA256 d401dd25e97a43481f025e9a2be1ecaefc195092386d78cbff633b0d91995e5c php-4.4.6.ebuild 15510
 EBUILD php-5.0.5-r5.ebuild 10457 RMD160 d862476c6c06944317cc3f417005f93a652c8996 SHA1 1d0b97da8e1cdeefacffd9e68dec94a94eb040db SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb
 MD5 a78424ab5677e3d6ec0588295fd480b7 php-5.0.5-r5.ebuild 10457
 RMD160 d862476c6c06944317cc3f417005f93a652c8996 php-5.0.5-r5.ebuild 10457
 SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb php-5.0.5-r5.ebuild 10457
+EBUILD php-5.1.6-r11.ebuild 15522 RMD160 265f464b27f728b2a98a542c196a49639300d5e9 SHA1 e2efa8107b20ce54380db98b0e3e6809a8f3660b SHA256 74164391e7ce58a4531b64f1a5234591883f2c603fc0beb911c9c8706cd6fbd6
+MD5 42901436a55982c4d0ded2607cc3c6ad php-5.1.6-r11.ebuild 15522
+RMD160 265f464b27f728b2a98a542c196a49639300d5e9 php-5.1.6-r11.ebuild 15522
+SHA256 74164391e7ce58a4531b64f1a5234591883f2c603fc0beb911c9c8706cd6fbd6 php-5.1.6-r11.ebuild 15522
 EBUILD php-5.1.6-r6.ebuild 15389 RMD160 d70a6d06036db1d1986f64cd83e719f7c43311c0 SHA1 2fcc1b8103f64405723512952ab9532cd0758c38 SHA256 22d84de0d08c9f1715a21826921c6f2ac9620246b8b7015a7fa4bb099162a380
 MD5 1f5ef13f7e9e04e8960776b69d43a393 php-5.1.6-r6.ebuild 15389
 RMD160 d70a6d06036db1d1986f64cd83e719f7c43311c0 php-5.1.6-r6.ebuild 15389
 SHA256 22d84de0d08c9f1715a21826921c6f2ac9620246b8b7015a7fa4bb099162a380 php-5.1.6-r6.ebuild 15389
-EBUILD php-5.1.6-r8.ebuild 15400 RMD160 1799267170bc55e1f1fe582f64c920d42bcdf75f SHA1 4f3b31ee90ef7464a2da617b88518c1111fe21b9 SHA256 5248ae93e28d5ab07217b487c3724f5290646f1fcf1c39f89995b3baced77247
-MD5 6da2cc2fa9489819ddbe65955d92fe90 php-5.1.6-r8.ebuild 15400
-RMD160 1799267170bc55e1f1fe582f64c920d42bcdf75f php-5.1.6-r8.ebuild 15400
-SHA256 5248ae93e28d5ab07217b487c3724f5290646f1fcf1c39f89995b3baced77247 php-5.1.6-r8.ebuild 15400
-MISC ChangeLog 30001 RMD160 36917cd4533011c1b76bc857c74f793fdda18ff7 SHA1 841de474bdf366023c81b77148ae42d20b876152 SHA256 20475ccb03fc987189392272a93c2420655a3e9661f4f3f0c41b98f430bd7f22
-MD5 198daeacf5af7239185f1303a2f6135c ChangeLog 30001
-RMD160 36917cd4533011c1b76bc857c74f793fdda18ff7 ChangeLog 30001
-SHA256 20475ccb03fc987189392272a93c2420655a3e9661f4f3f0c41b98f430bd7f22 ChangeLog 30001
+EBUILD php-5.2.1-r3.ebuild 15523 RMD160 be83d4ec00997f57b370fd528db684a73c5c50e6 SHA1 92b6bbfce552497361bc21bf783621fa6f681021 SHA256 fecb29e0b9fb186b839e729b0d404299d3ccad1f4e52502a7b9f932c70361ff6
+MD5 4ae3380ea05f1bce7392fed857d1b297 php-5.2.1-r3.ebuild 15523
+RMD160 be83d4ec00997f57b370fd528db684a73c5c50e6 php-5.2.1-r3.ebuild 15523
+SHA256 fecb29e0b9fb186b839e729b0d404299d3ccad1f4e52502a7b9f932c70361ff6 php-5.2.1-r3.ebuild 15523
+MISC ChangeLog 30347 RMD160 e9986175e9f1bb34887865f723723a686139307f SHA1 a6e57fcfab41a404170131c6365327ac2d7003c0 SHA256 6c4aa70ea84e4ba5d44338481402012a01c12c17270a8263f9d93c8966dac250
+MD5 bf88efa8c5fd414c1d3eb08658649dce ChangeLog 30347
+RMD160 e9986175e9f1bb34887865f723723a686139307f ChangeLog 30347
+SHA256 6c4aa70ea84e4ba5d44338481402012a01c12c17270a8263f9d93c8966dac250 ChangeLog 30347
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-MD5 3abb0ee76aef69f19eb158a70fcd5be9 files/digest-php-4.3.11-r5 1093
-RMD160 e0ccf11112d9a0a198e102e5c2747e72c75a1658 files/digest-php-4.3.11-r5 1093
-SHA256 31fd63a83313d40e97257630acac6f0b2a1c910bab39076b1a851c9b6fe84802 files/digest-php-4.3.11-r5 1093
-MD5 32917bf2094e1f6e00b1432246fdb94e files/digest-php-4.4.4-r6 810
-RMD160 491170e5698444d7f88923a557739cac1056cfdc files/digest-php-4.4.4-r6 810
-SHA256 8e161a83f594dc6b009a7f7e1a6fabeee11527ad701007fea05eb1c557a7b668 files/digest-php-4.4.4-r6 810
-MD5 b1176642c360f5833c4694319a86bf4f files/digest-php-4.4.4-r8 810
-RMD160 745d8a0250671ba3a70bd3d1e891a80e5b5f80f8 files/digest-php-4.4.4-r8 810
-SHA256 825e28de1736d2eab0b63d78a80ce1577683507f4843451d0a50758a5e18ac27 files/digest-php-4.4.4-r8 810
-MD5 049755680b7454329c4332c92e1aa83e files/digest-php-5.0.5-r5 807
-RMD160 351460cebfa761c8570dfa2b8e3d096c6d0c6df9 files/digest-php-5.0.5-r5 807
-SHA256 f647a2e0bc16efd18e6f216a0abd64b2b47a4bb95159a2199255d104a2720a9b files/digest-php-5.0.5-r5 807
-MD5 b53913a66452ca7377a612efb35e1bbc files/digest-php-5.1.6-r6 819
-RMD160 51ba2b521f5fa11d37a98099825f165bcf0ac5d1 files/digest-php-5.1.6-r6 819
-SHA256 93217749d45ce9f46ddfd7b44de1bbea584cbb5fc87ef1d96c64867ec1fd0a0b files/digest-php-5.1.6-r6 819
-MD5 06742bb6848bfacefe65069fc7ae3212 files/digest-php-5.1.6-r8 819
-RMD160 9c2f6496be5119e65f6b28a2e6da8c43da717dc0 files/digest-php-5.1.6-r8 819
-SHA256 4c82cb6278c45636fc70f24a13c9364fd90d43b96c7e0a8fd707777bb1fa29c1 files/digest-php-5.1.6-r8 819
+MD5 7502f6131d439bf593c84fad31df9307 files/digest-php-4.3.11-r5 783
+RMD160 c34390157595beb289374e163d82a3660dc61f7f files/digest-php-4.3.11-r5 783
+SHA256 09a5f7dd2ea0a4bc1f790433ca9e4a4af9d96393b6146ccc8b06c1a84abf3b6a files/digest-php-4.3.11-r5 783
+MD5 9865e08ee510b5806f96151c82e053e9 files/digest-php-4.4.4-r6 500
+RMD160 0837a13b278ee0e567b05f8702a3fd1003b80f92 files/digest-php-4.4.4-r6 500
+SHA256 434f2c0d5e4dc2cbba19d54aecaf1cb7d3d24e7479e6896b3598511e29481b3d files/digest-php-4.4.4-r6 500
+MD5 f9dd8a3b5d68fed2f96eed04d924e971 files/digest-php-4.4.6 801
+RMD160 8e8a1b64a5b3dde63706690698a8f4d3b47d2d93 files/digest-php-4.4.6 801
+SHA256 8ea1887fa97d1e0dbf7bc359a635e13143cbb025b831d574fb4a065516ba50f6 files/digest-php-4.4.6 801
+MD5 3219349153c321bd31ef36c4a3e0ec74 files/digest-php-5.0.5-r5 500
+RMD160 7bdfce61831ab90324f97da3fd1299e457dd070e files/digest-php-5.0.5-r5 500
+SHA256 ee2a7288614f5b4e23efd6d5bbbd9808b3457dd8e50c3a854f98763bb229c030 files/digest-php-5.0.5-r5 500
+MD5 c95e741d233611dffb555fe31cf8e779 files/digest-php-5.1.6-r11 801
+RMD160 9ddb55c838f0f550748ce6f2a6e35d9daa575e1a files/digest-php-5.1.6-r11 801
+SHA256 939cb0deb2157c0168793b3cedd3a07d2756b2e6eba9f1d21fd4e9d3a7c030a2 files/digest-php-5.1.6-r11 801
+MD5 48c048d5f0a2df98ab2e8937fc9f5fea files/digest-php-5.1.6-r6 500
+RMD160 22210871d0be075e621acd076e35fa492eeb996f files/digest-php-5.1.6-r6 500
+SHA256 a0fc5e60469034bf17f5906c9c6eef09a20ea12ef1636f556ea5374d0f5be4bc files/digest-php-5.1.6-r6 500
+MD5 1c7c78301c4440c9959b7db8d4f1875b files/digest-php-5.2.1-r3 807
+RMD160 4e9d92a19da62bfa7543b3f26935c36afe52e29a files/digest-php-5.2.1-r3 807
+SHA256 9517273b3420c96b8845ecbaa1731f12d8575953df82268cb7be355d1554bc0c files/digest-php-5.2.1-r3 807
diff --git a/dev-lang/php/files/20php4-envd b/dev-lang/php/files/20php4-envd
new file mode 100644 (file)
index 0000000..b4eabf7
--- /dev/null
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php4/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php4/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/apache1-php4/ext-active/ /etc/php/apache2-php4/ext-active/"
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
new file mode 100644 (file)
index 0000000..c69dfb2
--- /dev/null
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php5/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache1-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
index 4bbbf0463d9b8b736c9cf936c2958fd3f43d8a83..cd9c2ea9c823c3a81b676ce236528023f8157b3b 100644 (file)
@@ -1,6 +1,3 @@
-MD5 9b0c4b722e6102aa95b475074caac5f7 hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180
-RMD160 abc0ce0ee3020c9ec67ac595531c0fae13c8d351 hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180
-SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7 hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180
 MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 php-4.3.11.tar.bz2 4012575
 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5 php-4.3.11.tar.bz2 4012575
index c2bc37f47baafae5e3469f77d76e45d1fdb25f95..d63c94fc092752098514841feedec21c1b4cfe47 100644 (file)
@@ -1,6 +1,3 @@
-MD5 55220bd02880e8981455fe83bafa0c8d hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
 MD5 bc6fa8908e2ac36e93bab9f7d42cda3a php-4.4.4.tar.bz2 4478698
 RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 php-4.4.4.tar.bz2 4478698
 SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b php-4.4.4.tar.bz2 4478698
diff --git a/dev-lang/php/files/digest-php-4.4.4-r8 b/dev-lang/php/files/digest-php-4.4.4-r8
deleted file mode 100644 (file)
index 68f8fb3..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 55220bd02880e8981455fe83bafa0c8d hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-MD5 bc6fa8908e2ac36e93bab9f7d42cda3a php-4.4.4.tar.bz2 4478698
-RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 php-4.4.4.tar.bz2 4478698
-SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b php-4.4.4.tar.bz2 4478698
-MD5 81ed636101b3b3dabd513633db8654f5 php-patchset-4.4.4-r4.tar.bz2 21579
-RMD160 6a46f412185b9775dc2b1a1bb0801248b3702ea1 php-patchset-4.4.4-r4.tar.bz2 21579
-SHA256 62c63d3d04d5cfd856ee8c74e6617089235b1abe4df4baf450c5888945acfa20 php-patchset-4.4.4-r4.tar.bz2 21579
diff --git a/dev-lang/php/files/digest-php-4.4.6 b/dev-lang/php/files/digest-php-4.4.6
new file mode 100644 (file)
index 0000000..492d2c4
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 5db283824310c87efb18c76b4735c4bd php-4.4.6.tar.bz2 4559282
+RMD160 16a81ee94d1f8f56adf3e76dde32c62597130674 php-4.4.6.tar.bz2 4559282
+SHA256 c468c70e9536b5cbaf8a2615ab9e13c065da19944314633eef675be4d4e40065 php-4.4.6.tar.bz2 4559282
+MD5 7ba532e3132773050c3be7d71e8c9379 php-patchset-4.4.6-r1.tar.bz2 19282
+RMD160 e2576d82f1ca6e1336834ed87767fac9471623c0 php-patchset-4.4.6-r1.tar.bz2 19282
+SHA256 2fb21dfe058fabc57e63e01cc9990c6d8d5d9d74ebd9cc42c13d58cc64f71016 php-patchset-4.4.6-r1.tar.bz2 19282
+MD5 4b3800d1c182f5cf48d60ccb2f7c8acd suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530
+RMD160 cdf02a0ed5d66203c0082063c87b66a6e4109088 suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530
+SHA256 8a52e6c9b1f1c980734daf2fa0d5e68364cd64b20a7c82d68c7fdd135cb788f8 suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530
index a61252bffa1ee2052c08475384ba8a08dbcd5724..3d7cc3b43678360588a929f9c86517993eeb0b85 100644 (file)
@@ -1,6 +1,3 @@
-MD5 dd3aaa1c68bfd1626901721686474700 hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864
-RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864
-SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864
 MD5 b5d4ca75bbb11ee5b830fa67213d9f7f php-5.0.5.tar.bz2 4895556
 RMD160 6a9a892affba229770154407860cd1c2a098eaf9 php-5.0.5.tar.bz2 4895556
 SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f php-5.0.5.tar.bz2 4895556
diff --git a/dev-lang/php/files/digest-php-5.1.6-r11 b/dev-lang/php/files/digest-php-5.1.6-r11
new file mode 100644 (file)
index 0000000..54c00c6
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
+RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
+SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
+MD5 e2f377cf0e043348f655fd35a170138a php-patchset-5.1.6-r8.tar.bz2 30004
+RMD160 5f93cda0783ba541cdc392d8f82344d340a6cc47 php-patchset-5.1.6-r8.tar.bz2 30004
+SHA256 f9e5f9b9ccf0fd4be00822a4d75832eb09f989db7229e275b666f00e6dad93d7 php-patchset-5.1.6-r8.tar.bz2 30004
+MD5 2e36ccba7e34191685308fb78def2c60 suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153
+RMD160 8ae3b22638f927041f769e8052fba3841f891bbf suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153
+SHA256 07c89856820e2dbbefdb5141412fa1a52dd6f9f38fa987573fdccf5fa6a68361 suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153
index 9cf6dd48b3cf7d994c60f8ee2e444f29723162c4..a23b340f8d50aea06c725d72040cffd4f6df76b6 100644 (file)
@@ -1,6 +1,3 @@
-MD5 ba5d540574209a683dd8cf8d564e3b61 hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-RMD160 5185bf7b2282b3bed2f6a06a8314cfab7b5b8cbc hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-SHA256 836416114d4408377d04ee5b704dde0bd74511c0f114fe02602dab12e9e4902c hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
 MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
 RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
 SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
diff --git a/dev-lang/php/files/digest-php-5.1.6-r8 b/dev-lang/php/files/digest-php-5.1.6-r8
deleted file mode 100644 (file)
index 675b8ce..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ba5d540574209a683dd8cf8d564e3b61 hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-RMD160 5185bf7b2282b3bed2f6a06a8314cfab7b5b8cbc hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-SHA256 836416114d4408377d04ee5b704dde0bd74511c0f114fe02602dab12e9e4902c hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
-RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
-SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
-MD5 af5dc2be4f0d265a73e4fdc1be1b5b0f php-patchset-5.1.6-r4.tar.bz2 26474
-RMD160 fa1ac197d9f9a97e053f20b64babdfeec371dbb3 php-patchset-5.1.6-r4.tar.bz2 26474
-SHA256 c90c724072b3f826e474c646eb907202c0166df472b64538863263b7bf9c028d php-patchset-5.1.6-r4.tar.bz2 26474
diff --git a/dev-lang/php/files/digest-php-5.2.1-r3 b/dev-lang/php/files/digest-php-5.2.1-r3
new file mode 100644 (file)
index 0000000..54bf655
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 261218e3569a777dbd87c16a15f05c8d php-5.2.1.tar.bz2 7163383
+RMD160 f75078e0e43cb9c64e6d0a8d51a2ebd23cc9131d php-5.2.1.tar.bz2 7163383
+SHA256 4b60fa70969644d193d58dd7cb9f2765e304c6368e98b1551e92e8d4e14d35ed php-5.2.1.tar.bz2 7163383
+MD5 7ea0587e479d92196831b95e260d2039 php-patchset-5.2.1-r4.tar.bz2 23599
+RMD160 271aee07634277b37c450824d2f188203beef154 php-patchset-5.2.1-r4.tar.bz2 23599
+SHA256 fc4627d63cd387981b3c3f04e2d5c83a227e446929aefbbc44316981c3565138 php-patchset-5.2.1-r4.tar.bz2 23599
+MD5 93c12d351c3ddb811b12f2d897c4f1d5 suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686
+RMD160 93d0ba56d9caa5264e60e812e18d100180d610bc suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686
+SHA256 f6072cfd46f9d308b43653844c3f5062e6ce0bfe91c02da0a10c96905f0d0829 suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686
similarity index 97%
rename from dev-lang/php/php-4.4.4-r8.ebuild
rename to dev-lang/php/php-4.4.6.ebuild
index 71bfeb68c1cb0570731475d0f102a5215a8190eb..b85410b27b0496481c18dbd48870d8292bf9ef93 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.4-r8.ebuild,v 1.1 2006/10/27 12:17:35 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.6.ebuild,v 1.1 2007/03/05 02:14:43 chtekk Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -20,8 +20,8 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="4"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.15-gentoo.patch.gz"
+PHP_PATCHSET_REV="1"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6-gentoo.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
@@ -405,6 +405,10 @@ src_install() {
                                ;;
                esac
        done
+
+       # Install env.d files
+       newenvd "${FILESDIR}/20php4-envd" "20php4"
+       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php4"
 }
 
 pkg_postinst() {
similarity index 97%
rename from dev-lang/php/php-5.1.6-r8.ebuild
rename to dev-lang/php/php-5.1.6-r11.ebuild
index ae97fe21edb745b2148865afe8a45145fa0e8926..db178db931f641b14ca790b0938c57704cc709f6 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.6-r8.ebuild,v 1.1 2006/10/27 12:17:35 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.6-r11.ebuild,v 1.1 2007/03/05 02:14:43 chtekk Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -20,8 +20,8 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="4"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.15-gentoo-r1.patch.gz"
+PHP_PATCHSET_REV="8"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6-gentoo.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
@@ -405,6 +405,10 @@ src_install() {
                                ;;
                esac
        done
+
+       # Install env.d files
+       newenvd "${FILESDIR}/20php5-envd" "20php5"
+       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
 }
 
 pkg_postinst() {
diff --git a/dev-lang/php/php-5.2.1-r3.ebuild b/dev-lang/php/php-5.2.1-r3.ebuild
new file mode 100644 (file)
index 0000000..9432c71
--- /dev/null
@@ -0,0 +1,516 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.1-r3.ebuild,v 1.1 2007/03/05 02:14:43 chtekk Exp $
+
+CGI_SAPI_USE="discard-path force-cgi-redirect"
+APACHE2_SAPI_USE="concurrentmodphp threads"
+IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
+#              that have been enabled, so we have to PROVIDE everything for now
+#              and hope for the best
+PROVIDE="virtual/php virtual/httpd-php"
+
+# php package settings
+SLOT="5"
+MY_PHP_PV="${PV}"
+MY_PHP_P="php-${MY_PHP_PV}"
+PHP_PACKAGE="1"
+
+# php patch settings, general
+PHP_PATCHSET_REV="4"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2-gentoo.patch.gz"
+MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
+# php patch settings, ebuild specific
+FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
+CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modules.patch"
+
+inherit php5_2-sapi apache-module
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+
+DEPEND="app-admin/php-toolkit"
+RDEPEND="${DEPEND}"
+
+want_apache
+
+pkg_setup() {
+       PHPCONFUTILS_AUTO_USE=""
+
+       # Make sure the user has specified at least one SAPI
+       einfo "Determining SAPI(s) to build"
+       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+
+       # Threaded Apache2 support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if ! useq threads ; then
+                               APACHE2_SAFE_MPMS="itk peruser prefork"
+                       else
+                               APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
+                       fi
+
+                       ewarn
+                       ewarn "If this package fails with a fatal error about Apache2 not having"
+                       ewarn "been compiled with a compatible MPM, this is normally because you"
+                       ewarn "need to toggle the 'threads' USE flag."
+                       ewarn
+                       ewarn "If 'threads' is off, try switching it on."
+                       ewarn "If 'threads' is on, try switching it off."
+                       ewarn
+
+                       apache-module_pkg_setup
+               fi
+       fi
+
+       # Concurrent PHP Apache2 modules support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if useq concurrentmodphp ; then
+                               ewarn
+                               ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
+                               ewarn "versioned mod_php's into the same Apache instance. This is done with"
+                               ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
+                               ewarn "work correctly, so use it at your own risk. Especially, do not use"
+                               ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
+                               ewarn "you may find in the Portage tree or the PHP Overlay!"
+                               ewarn "This is an experimental feature, so please rebuild PHP"
+                               ewarn "without the 'concurrentmodphp' USE flag if you experience"
+                               ewarn "any problems, and then reproduce any bugs before filing"
+                               ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+                               ewarn "If you have conclusive evidence that a bug directly"
+                               ewarn "derives from 'concurrentmodphp', please file a bug in"
+                               ewarn "Gentoo's Bugzilla only."
+                               ewarn
+                               ebeep 5
+                       fi
+               fi
+       fi
+
+       # fastbuild support
+       if useq fastbuild ; then
+               ewarn
+               ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
+               ewarn "This is an experimental feature, so please rebuild PHP"
+               ewarn "without the 'fastbuild' USE flag if you experience"
+               ewarn "any problems, and then reproduce any bugs before filing"
+               ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+               ewarn "If you have conclusive evidence that a bug directly"
+               ewarn "derives from 'fastbuild', please file a bug in"
+               ewarn "Gentoo's Bugzilla only."
+               ewarn
+       fi
+
+       php5_2-sapi_pkg_setup
+}
+
+php_determine_sapis() {
+       # holds the list of sapis that we want to build
+       PHPSAPIS=
+
+       if useq cli || phpconfutils_usecheck cli ; then
+               PHPSAPIS="${PHPSAPIS} cli"
+       fi
+
+       if useq cgi ; then
+               PHPSAPIS="${PHPSAPIS} cgi"
+       fi
+
+       # note - we can only build one apache sapi for now
+       # note - apache SAPI comes after the simpler cli/cgi sapis
+       if useq apache || useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
+               fi
+       fi
+}
+
+src_unpack() {
+       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
+               unpack ${A}
+       fi
+
+       cd "${S}"
+
+       # Concurrent PHP Apache2 modules support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if useq concurrentmodphp ; then
+                               if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
+                                       epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
+                               else
+                                       ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
+                               fi
+                       fi
+               fi
+       fi
+
+       # fastbuild support
+       if useq fastbuild ; then
+               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
+                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
+               else
+                       ewarn "There is no fastbuild patch available for this PHP release yet!"
+               fi
+       fi
+
+       # Now let the eclass do the rest and regenerate the configure
+       php5_2-sapi_src_unpack
+
+       # Fix Makefile.global:test to consider the CGI SAPI if present
+       if useq cgi ; then
+               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+       fi
+}
+
+src_compile() {
+       if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+               src_compile_fastbuild
+       else
+               src_compile_normal
+       fi
+}
+
+src_compile_fastbuild() {
+       php_determine_sapis
+
+       build_cli=0
+       build_cgi=0
+       build_apache1=0
+       build_apache2=0
+       my_conf=""
+
+       for x in ${PHPSAPIS} ; do
+               case ${x} in
+                       cli)
+                               build_cli=1
+                               ;;
+                       cgi)
+                               build_cgi=1
+                               ;;
+                       apache1)
+                               build_apache1=1
+                               ;;
+                       apache2)
+                               build_apache2=1
+                               ;;
+               esac
+       done
+
+       if [[ ${build_cli} = 1 ]] ; then
+               my_conf="${my_conf} --enable-cli"
+       else
+               my_conf="${my_conf} --disable-cli"
+       fi
+
+       if [[ ${build_cgi} = 1 ]] ; then
+               my_conf="${my_conf} --enable-cgi --enable-fastcgi"
+               phpconfutils_extension_enable "discard-path" "discard-path" 0
+               phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+       else
+               my_conf="${my_conf} --disable-cgi"
+       fi
+
+       if [[ ${build_apache1} = 1 ]] ; then
+               my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
+       fi
+
+       if [[ ${build_apache2} = 1 ]] ; then
+               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+
+               # Threaded Apache2 support
+               if useq threads ; then
+                       my_conf="${my_conf} --enable-maintainer-zts"
+                       ewarn "Enabling ZTS for Apache2 MPM"
+               fi
+
+               # Concurrent PHP Apache2 modules support
+               if useq concurrentmodphp ; then
+                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+               fi
+       fi
+
+       # Now we know what we are building, build it
+       php5_2-sapi_src_compile
+
+       # To keep the separate php.ini files for each SAPI, we change the
+       # build-defs.h and recompile
+
+       if [[ ${build_cli} = 1 ]] ; then
+               einfo
+               einfo "Building CLI SAPI"
+               einfo
+
+               sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h
+               sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make sapi/cli/php || die "Unable to make CLI SAPI"
+               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+       fi
+
+       if [[ ${build_cgi} = 1 ]] ; then
+               einfo
+               einfo "Building CGI SAPI"
+               einfo
+
+               sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h
+               sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make sapi/cgi/php || die "Unable to make CGI SAPI"
+               cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+       fi
+
+       if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+               einfo
+               einfo "Building apache${APACHE_VERSION} SAPI"
+               einfo
+
+               sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h
+               sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make || die "Unable to make apache${APACHE_VERSION} SAPI"
+       fi
+}
+
+src_compile_normal() {
+       php_determine_sapis
+
+       CLEAN_REQUIRED=0
+       my_conf=""
+
+       # Support the Apache2 extras, they must be set globally for all
+       # SAPIs to work correctly, especially for external PHP extensions
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       # Concurrent PHP Apache2 modules support
+                       if useq concurrentmodphp ; then
+                               append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+                       fi
+               fi
+       fi
+
+       for x in ${PHPSAPIS} ; do
+               # Support the Apache2 extras, they must be set globally for all
+               # SAPIs to work correctly, especially for external PHP extensions
+               if useq apache2 ; then
+                       if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                               # Threaded Apache2 support
+                               if useq threads ; then
+                                       my_conf="${my_conf} --enable-maintainer-zts"
+                                       ewarn "Enabling ZTS for Apache2 MPM"
+                               fi
+                       fi
+               fi
+
+               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
+                       make clean
+               fi
+
+               PHPSAPI="${x}"
+
+               case ${x} in
+                       cli)
+                               my_conf="${my_conf} --enable-cli --disable-cgi"
+                               php5_2-sapi_src_compile
+                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+                               ;;
+                       cgi)
+                               my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi"
+                               phpconfutils_extension_enable "discard-path" "discard-path" 0
+                               phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+                               php5_2-sapi_src_compile
+                               cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+                               ;;
+                       apache1)
+                               my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
+                               php5_2-sapi_src_compile
+                               ;;
+                       apache2)
+                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
+                               php5_2-sapi_src_compile
+                               ;;
+               esac
+
+               CLEAN_REQUIRED=1
+               my_conf=""
+       done
+}
+
+src_install() {
+       php_determine_sapis
+
+       destdir=/usr/$(get_libdir)/php5
+
+       # Let the eclass do the common work
+       php5_2-sapi_src_install
+
+       einfo
+       einfo "Installing SAPI(s) ${PHPSAPIS}"
+       einfo
+
+       for x in ${PHPSAPIS} ; do
+
+               PHPSAPI="${x}"
+
+               case ${x} in
+                       cli)
+                               einfo "Installing CLI SAPI"
+                               into ${destdir}
+                               newbin php-cli php || die "Unable to install ${x} sapi"
+                               php5_2-sapi_install_ini
+                               ;;
+                       cgi)
+                               einfo "Installing CGI SAPI"
+                               into ${destdir}
+                               dobin php-cgi || die "Unable to install ${x} sapi"
+                               php5_2-sapi_install_ini
+                               ;;
+                       apache1)
+                               einfo "Installing Apache${APACHE_VERSION} SAPI"
+                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+                               einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
+                               insinto ${APACHE_MODULES_CONFDIR}
+                               newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
+                               php5_2-sapi_install_ini
+                               ;;
+                       apache2)
+                               einfo "Installing Apache${APACHE_VERSION} SAPI"
+                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+                               if useq concurrentmodphp ; then
+                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
+                                       insinto ${APACHE_MODULES_CONFDIR}
+                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf"
+
+                                       # Put the ld version script in the right place so it's always accessible
+                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
+                                       doins "${FILESDIR}/php5-ldvs"
+
+                                       # Redefine the extension dir to have the modphp suffix
+                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
+                               else
+                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
+                                       insinto ${APACHE_MODULES_CONFDIR}
+                                       newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf"
+                               fi
+                               php5_2-sapi_install_ini
+                               ;;
+               esac
+       done
+
+       # Install env.d files
+       newenvd "${FILESDIR}/20php5-envd" "20php5"
+       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
+}
+
+pkg_postinst() {
+       # Output some general info to the user
+       if useq apache || useq apache2 ; then
+               APACHE1_MOD_DEFINE="PHP5"
+               APACHE1_MOD_CONF="70_mod_php5"
+               APACHE2_MOD_DEFINE="PHP5"
+               if useq concurrentmodphp ; then
+                       APACHE2_MOD_CONF="70_mod_php5_concurr"
+               else
+                       APACHE2_MOD_CONF="70_mod_php5"
+               fi
+               apache-module_pkg_postinst
+       fi
+
+       # Update Apache1 to use mod_php
+       if useq apache ; then
+               "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 2 ]] ; then
+                       php-select apache1 php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "Apache1 is configured to load a different version of PHP."
+                       ewarn "To make Apache1 use PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select apache1 php5"
+                       ewarn
+               fi
+       fi
+
+       # Update Apache2 to use mod_php
+       if useq apache2 ; then
+               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 2 ]] ; then
+                       php-select apache2 php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "Apache2 is configured to load a different version of PHP."
+                       ewarn "To make Apache2 use PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select apache2 php5"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-cli
+       if useq cli || phpconfutils_usecheck cli ; then
+               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 5 ]] ; then
+                       php-select php php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "/usr/bin/php links to a different version of PHP."
+                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select php php5"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-cgi
+       if useq cgi ; then
+               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 5 ]] ; then
+                       php-select php-cgi php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
+                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select php-cgi php5"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-devel
+       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
+       exitStatus=$?
+       if [[ $exitStatus == 5 ]] ; then
+               php-select php-devel php5
+       elif [[ $exitStatus == 4 ]] ; then
+               ewarn
+               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
+               ewarn "different version of PHP. To make them point to PHP v5, use"
+               ewarn "php-select:"
+               ewarn
+               ewarn "    php-select php-devel php5"
+               ewarn
+       fi
+
+       php5_2-sapi_pkg_postinst
+}
+
+src_test() {
+       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+       if ! emake -j1 test ; then
+               hasq test ${FEATURES} && die "Make test failed. See above for details."
+               hasq test ${FEATURES} || eerror "Make test failed. See above for details."
+       fi
+}