From 44365675d0e32e9ffe1637e29ae36f2e9280dcad Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sun, 12 Mar 2006 13:25:34 +0000 Subject: [PATCH] Sync with PHP Overlay: various updates. Package-Manager: portage-2.1_pre5-r3 --- dev-lang/php/ChangeLog | 33 +- dev-lang/php/Manifest | 144 +++------ dev-lang/php/files/4-any/php4-fastbuild.patch | 250 --------------- .../php/files/4-any/php4-imap-symlink.diff | 15 - .../php/files/4-any/php4-iodbc-config.diff | 14 - .../php/files/4-any/php4-libtool-1.5.patch | 19 -- .../4-any/php4-uClibc-have_dn_skipname.patch | 33 -- dev-lang/php/files/4-any/php4-with-iodbc.diff | 13 - .../files/5.0-any/apache-1.3/70_mod_php5.conf | 20 -- .../files/5.0-any/apache-2.0/70_mod_php5.conf | 20 -- .../php/files/5.0-any/php5-imap-symlink.diff | 15 - .../php/files/5.0-any/php5-iodbc-config.diff | 14 - .../php/files/5.0-any/php5-libtool-1.5.patch | 19 -- dev-lang/php/files/5.0-any/php5-prefork.patch | 26 -- .../php5-soap_persistence_session.diff | 35 --- .../php/files/5.0-any/php5-with-iodbc.diff | 13 - .../php/files/5.1-any/php5-fastbuild.patch | 234 -------------- .../php/files/5.1-any/php5-imap-symlink.diff | 15 - .../php/files/5.1-any/php5-iodbc-config.diff | 14 - dev-lang/php/files/5.1-any/php5-prefork.patch | 26 -- .../php5-soap_persistence_session.diff | 35 --- .../php/files/5.1-any/php5-with-iodbc.diff | 13 - ...0_mod_php.conf => 70_mod_php.conf-apache1} | 1 - ...0_mod_php.conf => 70_mod_php.conf-apache2} | 1 - ...mod_php5.conf => 70_mod_php5.conf-apache1} | 1 - ...mod_php5.conf => 70_mod_php5.conf-apache2} | 1 - dev-lang/php/files/digest-php-4.3.11-r5 | 10 +- dev-lang/php/files/digest-php-4.4.1-r3 | 8 +- dev-lang/php/files/digest-php-4.4.2 | 9 + dev-lang/php/files/digest-php-5.0.5-r5 | 8 +- dev-lang/php/files/digest-php-5.1.1 | 3 - dev-lang/php/files/digest-php-5.1.2 | 9 + dev-lang/php/php-4.3.11-r5.ebuild | 105 +++---- dev-lang/php/php-4.4.1-r3.ebuild | 93 ++---- dev-lang/php/php-4.4.2.ebuild | 286 ++++++++++++++++++ dev-lang/php/php-5.0.5-r5.ebuild | 99 ++---- .../{php-5.1.1.ebuild => php-5.1.2.ebuild} | 80 ++--- 37 files changed, 522 insertions(+), 1212 deletions(-) delete mode 100644 dev-lang/php/files/4-any/php4-fastbuild.patch delete mode 100644 dev-lang/php/files/4-any/php4-imap-symlink.diff delete mode 100644 dev-lang/php/files/4-any/php4-iodbc-config.diff delete mode 100644 dev-lang/php/files/4-any/php4-libtool-1.5.patch delete mode 100644 dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch delete mode 100644 dev-lang/php/files/4-any/php4-with-iodbc.diff delete mode 100644 dev-lang/php/files/5.0-any/apache-1.3/70_mod_php5.conf delete mode 100644 dev-lang/php/files/5.0-any/apache-2.0/70_mod_php5.conf delete mode 100644 dev-lang/php/files/5.0-any/php5-imap-symlink.diff delete mode 100644 dev-lang/php/files/5.0-any/php5-iodbc-config.diff delete mode 100644 dev-lang/php/files/5.0-any/php5-libtool-1.5.patch delete mode 100644 dev-lang/php/files/5.0-any/php5-prefork.patch delete mode 100644 dev-lang/php/files/5.0-any/php5-soap_persistence_session.diff delete mode 100644 dev-lang/php/files/5.0-any/php5-with-iodbc.diff delete mode 100644 dev-lang/php/files/5.1-any/php5-fastbuild.patch delete mode 100644 dev-lang/php/files/5.1-any/php5-imap-symlink.diff delete mode 100644 dev-lang/php/files/5.1-any/php5-iodbc-config.diff delete mode 100644 dev-lang/php/files/5.1-any/php5-prefork.patch delete mode 100644 dev-lang/php/files/5.1-any/php5-soap_persistence_session.diff delete mode 100644 dev-lang/php/files/5.1-any/php5-with-iodbc.diff rename dev-lang/php/files/{4-any/apache-1.3/70_mod_php.conf => 70_mod_php.conf-apache1} (94%) rename dev-lang/php/files/{4-any/apache-2.0/70_mod_php.conf => 70_mod_php.conf-apache2} (94%) rename dev-lang/php/files/{5.1-any/apache-1.3/70_mod_php5.conf => 70_mod_php5.conf-apache1} (94%) rename dev-lang/php/files/{5.1-any/apache-2.0/70_mod_php5.conf => 70_mod_php5.conf-apache2} (94%) create mode 100644 dev-lang/php/files/digest-php-4.4.2 delete mode 100644 dev-lang/php/files/digest-php-5.1.1 create mode 100644 dev-lang/php/files/digest-php-5.1.2 create mode 100644 dev-lang/php/php-4.4.2.ebuild rename dev-lang/php/{php-5.1.1.ebuild => php-5.1.2.ebuild} (78%) diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index a8e0f7d423ee..076fe2a05eb3 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,37 @@ # 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.71 2006/02/24 23:46:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.72 2006/03/12 13:25:33 chtekk Exp $ + +*php-5.1.2 (12 Mar 2006) +*php-4.4.2 (12 Mar 2006) + + 12 Mar 2006; Luca Longinotti + -files/4-any/php4-fastbuild.patch, -files/4-any/php4-imap-symlink.diff, + -files/4-any/php4-iodbc-config.diff, +files/70_mod_php.conf-apache1, + +files/70_mod_php.conf-apache2, -files/4-any/php4-libtool-1.5.patch, + -files/4-any/php4-uClibc-have_dn_skipname.patch, + -files/4-any/php4-with-iodbc.diff, +files/70_mod_php5.conf-apache1, + +files/70_mod_php5.conf-apache2, -files/4-any/apache-1.3/70_mod_php.conf, + -files/4-any/apache-2.0/70_mod_php.conf, + -files/5.0-any/php5-imap-symlink.diff, + -files/5.0-any/php5-iodbc-config.diff, + -files/5.0-any/php5-libtool-1.5.patch, -files/5.0-any/php5-prefork.patch, + -files/5.0-any/php5-soap_persistence_session.diff, + -files/5.0-any/php5-with-iodbc.diff, + -files/5.0-any/apache-1.3/70_mod_php5.conf, + -files/5.0-any/apache-2.0/70_mod_php5.conf, + -files/5.1-any/php5-fastbuild.patch, + -files/5.1-any/php5-imap-symlink.diff, + -files/5.1-any/php5-iodbc-config.diff, -files/5.1-any/php5-prefork.patch, + -files/5.1-any/php5-soap_persistence_session.diff, + -files/5.1-any/php5-with-iodbc.diff, + -files/5.1-any/apache-1.3/70_mod_php5.conf, + -files/5.1-any/apache-2.0/70_mod_php5.conf, php-4.3.11-r5.ebuild, + php-4.4.1-r3.ebuild, +php-4.4.2.ebuild, php-5.0.5-r5.ebuild, + -php-5.1.1.ebuild, +php-5.1.2.ebuild: + Sync with PHP Overlay: reworked ebuilds, eclasses and patchsets to be easier + to maintain. Add PHP 4.4.2 and PHP 5.1.2 to the tree, fixing bugs #125878 + and #118846. Fix too bugs #120908, #123376, #122724 and #121190. 24 Feb 2006; Jeroen Roovers php-5.0.5-r5.ebuild: Stable on hppa (preparation for bug #119461). diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index c0014146e0a7..b60e38d93fc2 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,102 +1,48 @@ -MD5 f96b10a4c51845fbb62b1dd7571fdbdb ChangeLog 15836 -RMD160 e4bd7e249be732899773273b401f7a838e998813 ChangeLog 15836 -SHA256 67884dcc00a1045b01237c0bd20828120cd9e76acbc79f76cb3746d59b55939f ChangeLog 15836 -MD5 389638f1d46b6c41cd4d87b471572f4b files/4-any/apache-1.3/70_mod_php.conf 484 -RMD160 a39e519414c7ac3c81198c0447d8466986432c29 files/4-any/apache-1.3/70_mod_php.conf 484 -SHA256 40f8161df164177b3cb9d285014ed97b000ad85a621a3858539e8ccf959755b1 files/4-any/apache-1.3/70_mod_php.conf 484 -MD5 ee36e31632adb08b7abf70f78b5b2125 files/4-any/apache-2.0/70_mod_php.conf 485 -RMD160 6257eff7856e149d18528381a501ab50efed46e1 files/4-any/apache-2.0/70_mod_php.conf 485 -SHA256 a1fbc68cca42e75620a975fce075038605c1064b44d7205c4b75ff32742ad899 files/4-any/apache-2.0/70_mod_php.conf 485 -MD5 f0acca9c6387b8ca139d2849665bd16f files/4-any/php4-fastbuild.patch 9012 -RMD160 c7bd59dfed7fea8bdbbebcda790913d3602c4e35 files/4-any/php4-fastbuild.patch 9012 -SHA256 0cf4058ef9e7cc1ba70e409c61f714fb59369d372d0664968f0b35b81ab67778 files/4-any/php4-fastbuild.patch 9012 -MD5 8a7b4820d4e3770e493927b046cbfa33 files/4-any/php4-imap-symlink.diff 620 -RMD160 ddb16b727ab68af27dd1c2fe3524d129080ddec9 files/4-any/php4-imap-symlink.diff 620 -SHA256 c58d1237d5b06e0a2862ea7b4e978acc6efd03f1fdb6f8ab7f84480575274cd3 files/4-any/php4-imap-symlink.diff 620 -MD5 6352b07a050227f0145d6e1cd759f036 files/4-any/php4-iodbc-config.diff 582 -RMD160 c9152e5c425925294afc62a09fab25338535715c files/4-any/php4-iodbc-config.diff 582 -SHA256 fce8fab833d4920d8632f3e8007ed23c67b7827a2a02a5e3ab0d173a51127d6f files/4-any/php4-iodbc-config.diff 582 -MD5 a7036ee38aa3b37256c0a6fe2afdbbe2 files/4-any/php4-libtool-1.5.patch 613 -RMD160 934e0f32d2ac45f301d8fa8b532bce6de91a3e66 files/4-any/php4-libtool-1.5.patch 613 -SHA256 ff47ef9c1ce1ba7bcd61971c5691072bf6a9594c0e9780b348062c4a7ca823a1 files/4-any/php4-libtool-1.5.patch 613 -MD5 d3a9c21b313d418005ad021cc194d0aa files/4-any/php4-uClibc-have_dn_skipname.patch 968 -RMD160 1936a0c796ce757831732033398a6bf4d70134c2 files/4-any/php4-uClibc-have_dn_skipname.patch 968 -SHA256 f41185f0b26cb5364350c8c9bbd044fcf3b365a7d49332df681a88acc1b5e0c1 files/4-any/php4-uClibc-have_dn_skipname.patch 968 -MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/4-any/php4-with-iodbc.diff 443 -RMD160 a673b44e7bacb4411ca3ef227f736aceba01d0fc files/4-any/php4-with-iodbc.diff 443 -SHA256 d07c4d169ac6aaed0be31e6023db6fb369c124af6707a39d43ae41ea13dd87d2 files/4-any/php4-with-iodbc.diff 443 -MD5 96ed6efe383833dbb880fef3b6c562bb files/5.0-any/apache-1.3/70_mod_php5.conf 524 -RMD160 9e47ca575d90b5904064a7d16d371ab7c09bad81 files/5.0-any/apache-1.3/70_mod_php5.conf 524 -SHA256 0b9d33dec2558afd861173aeac4e984f5deeb39948544ed3a3188901e845987f files/5.0-any/apache-1.3/70_mod_php5.conf 524 -MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.0-any/apache-2.0/70_mod_php5.conf 525 -RMD160 f02f849abcc01c560d8e094815367235c671c62d files/5.0-any/apache-2.0/70_mod_php5.conf 525 -SHA256 f711da9d5f726aa8ac174889c0af6367e37083f0c98e136997e9341f219c3092 files/5.0-any/apache-2.0/70_mod_php5.conf 525 -MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0-any/php5-imap-symlink.diff 620 -RMD160 05c02beb77a3b9d091f4bb5aa3cdd2d2e2d85248 files/5.0-any/php5-imap-symlink.diff 620 -SHA256 e2d6e9660e71582710d1ca3fd904557c8effe3ca69a3015e4e171bef32fd2203 files/5.0-any/php5-imap-symlink.diff 620 -MD5 47b015f00cb866c1f49f880b8a6b098b files/5.0-any/php5-iodbc-config.diff 582 -RMD160 410585c4c880f814f7aaeb8455752405217c2e99 files/5.0-any/php5-iodbc-config.diff 582 -SHA256 69b3f9f3be40c06ab6858b72647a03c140aa86fce310bc73144cb355b2b4719c files/5.0-any/php5-iodbc-config.diff 582 -MD5 7530065b6851a15b1c9d8b0ee5fb0a98 files/5.0-any/php5-libtool-1.5.patch 613 -RMD160 bee2bff690f964b9ef42b35eb36643b8e1870f0c files/5.0-any/php5-libtool-1.5.patch 613 -SHA256 5b6bee45d2ec428d0c2f9c359c718b87867f66f8091f4a6f45057da30b7d8414 files/5.0-any/php5-libtool-1.5.patch 613 -MD5 058042718bc876bf27ab902673919ca9 files/5.0-any/php5-prefork.patch 850 -RMD160 5855e08aeb2d8b9f9ee5b6499da404fc9ac73d40 files/5.0-any/php5-prefork.patch 850 -SHA256 c65dc75d914400479c5d38d732992c45322296cca77ecadd259bae7e57a8e718 files/5.0-any/php5-prefork.patch 850 -MD5 273799e60d5a41a1e6f5ac53781a152f files/5.0-any/php5-soap_persistence_session.diff 1976 -RMD160 ba0575f535773d3b0e7b164b684e5feaeeb1e19f files/5.0-any/php5-soap_persistence_session.diff 1976 -SHA256 af72cb89ea33c236f32f7a8d029ac447bd324a6e054821ad9ea0b13d33654771 files/5.0-any/php5-soap_persistence_session.diff 1976 -MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.0-any/php5-with-iodbc.diff 443 -RMD160 a673b44e7bacb4411ca3ef227f736aceba01d0fc files/5.0-any/php5-with-iodbc.diff 443 -SHA256 d07c4d169ac6aaed0be31e6023db6fb369c124af6707a39d43ae41ea13dd87d2 files/5.0-any/php5-with-iodbc.diff 443 -MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1-any/apache-1.3/70_mod_php5.conf 524 -RMD160 9e47ca575d90b5904064a7d16d371ab7c09bad81 files/5.1-any/apache-1.3/70_mod_php5.conf 524 -SHA256 0b9d33dec2558afd861173aeac4e984f5deeb39948544ed3a3188901e845987f 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 -RMD160 f02f849abcc01c560d8e094815367235c671c62d files/5.1-any/apache-2.0/70_mod_php5.conf 525 -SHA256 f711da9d5f726aa8ac174889c0af6367e37083f0c98e136997e9341f219c3092 files/5.1-any/apache-2.0/70_mod_php5.conf 525 -MD5 8392d102bb64d0e136d7b74302f51752 files/5.1-any/php5-fastbuild.patch 9580 -RMD160 f2f36f980cccb0e9dcffaa69ba6f968e5b5aeed0 files/5.1-any/php5-fastbuild.patch 9580 -SHA256 83ca44e0a3425c5a0452c6e5d8375571f98422643d95241ffab11f464ac0ba28 files/5.1-any/php5-fastbuild.patch 9580 -MD5 2aca8867fada1d3345859f201ce7e428 files/5.1-any/php5-imap-symlink.diff 652 -RMD160 b6f49f1cd6bb8538280fcd123dfefb99da024fe9 files/5.1-any/php5-imap-symlink.diff 652 -SHA256 431d07c3fab23f7f8b8a5b872635b9ab848497a3a48f9eed74bb28938d897fc8 files/5.1-any/php5-imap-symlink.diff 652 -MD5 2a1f695fb5ff9959ed634e5a361fc46f files/5.1-any/php5-iodbc-config.diff 527 -RMD160 b184a85efef8435962158db2ed50360875d003e8 files/5.1-any/php5-iodbc-config.diff 527 -SHA256 9540a96e01ebb9df2a5652cbba7d69be8617a3d2cd616a6d08d7973847e39649 files/5.1-any/php5-iodbc-config.diff 527 -MD5 058042718bc876bf27ab902673919ca9 files/5.1-any/php5-prefork.patch 850 -RMD160 5855e08aeb2d8b9f9ee5b6499da404fc9ac73d40 files/5.1-any/php5-prefork.patch 850 -SHA256 c65dc75d914400479c5d38d732992c45322296cca77ecadd259bae7e57a8e718 files/5.1-any/php5-prefork.patch 850 -MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1-any/php5-soap_persistence_session.diff 1976 -RMD160 ba0575f535773d3b0e7b164b684e5feaeeb1e19f files/5.1-any/php5-soap_persistence_session.diff 1976 -SHA256 af72cb89ea33c236f32f7a8d029ac447bd324a6e054821ad9ea0b13d33654771 files/5.1-any/php5-soap_persistence_session.diff 1976 -MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1-any/php5-with-iodbc.diff 443 -RMD160 a673b44e7bacb4411ca3ef227f736aceba01d0fc files/5.1-any/php5-with-iodbc.diff 443 -SHA256 d07c4d169ac6aaed0be31e6023db6fb369c124af6707a39d43ae41ea13dd87d2 files/5.1-any/php5-with-iodbc.diff 443 -MD5 ad1f5d7c6347b494cf8537ae7ccb8cb9 files/digest-php-4.3.11-r5 303 -RMD160 2341c0d729d1cc90526b9487fdf2ccf3df9388b1 files/digest-php-4.3.11-r5 303 -SHA256 e823578da606f6349f5abddb599683008e95c393e30b318ec93f5fb26141abe4 files/digest-php-4.3.11-r5 303 -MD5 5833ed70909d0ac1973fd925b58df6c5 files/digest-php-4.4.1-r3 223 -RMD160 5f450a23c3bd4ab4d3193e44d91c875d8505231f files/digest-php-4.4.1-r3 223 -SHA256 f9cf074c80ac857aeb98ddfce1b06da08596b086085319ab23bc8318e95c2708 files/digest-php-4.4.1-r3 223 -MD5 f63da77a9810ee794c4c3e15cf7aa682 files/digest-php-5.0.5-r5 223 -RMD160 19b05cedf2aba99bb49b9b5cb98217c23759aa9a files/digest-php-5.0.5-r5 223 -SHA256 c7fcf81ab6903ab5ba158587618b912112430838887adee94ef219cea076f0a7 files/digest-php-5.0.5-r5 223 -MD5 238222ae5f42f0c399eafc6042af3cb2 files/digest-php-5.1.1 222 -RMD160 0b1eb517559966ee0702b0d380d224b5d44322eb files/digest-php-5.1.1 222 -SHA256 668fb3be0c586d9c54d6250c635d2bc559d4f1209f4f87d5c88f20cd26f5dadf files/digest-php-5.1.1 222 +MD5 c4d171defd1dbad508b194da63d995c4 ChangeLog 17427 +RMD160 69dcef1b5d92181fc678499eddac176e2737a359 ChangeLog 17427 +SHA256 a6c1136e2a2f4be7f3364963f4ddcb0306c52b16e111db803d3e21bebadf9de0 ChangeLog 17427 +MD5 028492a70fa9f5eef1d4e5fb1993214e files/70_mod_php.conf-apache1 457 +RMD160 cba11929fc8fce91753b89fd468362fc24a4c42a files/70_mod_php.conf-apache1 457 +SHA256 b8f860a576b78ab9636ff551c56509ca52a9204d127452625e23c88b32ef4806 files/70_mod_php.conf-apache1 457 +MD5 4a84c92760a7758b6446a62cabb8beed files/70_mod_php.conf-apache2 458 +RMD160 d2de515f92639d817a67c3a44db3e3dff4864974 files/70_mod_php.conf-apache2 458 +SHA256 06e3046fa7352eb2349967382bff711c01f6600688b8f49569ceacf2a31b130a files/70_mod_php.conf-apache2 458 +MD5 89eebb502d9fe877f974543630df8d44 files/70_mod_php5.conf-apache1 497 +RMD160 8906581f5f6698aed33b7710042936f7904df197 files/70_mod_php5.conf-apache1 497 +SHA256 2ae3f97a49e86b079d7b6d48e5fde0d3d18841c78a9373fa24500f31f52110e6 files/70_mod_php5.conf-apache1 497 +MD5 6d7e37faeb0e0ce557bae6a76888b261 files/70_mod_php5.conf-apache2 498 +RMD160 60b32c16c251db9685bba23d82bf8e749a1d0223 files/70_mod_php5.conf-apache2 498 +SHA256 08db825992b8f62e03a6e9f54db1b7947b615655cda915dc00b901a479585a02 files/70_mod_php5.conf-apache2 498 +MD5 7ac3f86eb868abf5bcb23a3a758d82dc files/digest-php-4.3.11-r5 1093 +RMD160 4de7599dea4b17a9eaee8987512ca0d2ed596c69 files/digest-php-4.3.11-r5 1093 +SHA256 9476ccfbeb934abc7dc1973013e0dc5f185246168dbd6d668c88eb6bb5365494 files/digest-php-4.3.11-r5 1093 +MD5 0dfd3cbffff685c6a22926dce7bcbe2a files/digest-php-4.4.1-r3 807 +RMD160 c8d3f8c721620a4b1dddcb5fdd58b2348644276d files/digest-php-4.4.1-r3 807 +SHA256 0cea1ba92bd0f4426e9f2cf6450c9e9ff380ea38cde09d2d6e2ba180b47e0713 files/digest-php-4.4.1-r3 807 +MD5 a7ac0298702473c115fd1bd2410f0152 files/digest-php-4.4.2 807 +RMD160 e0111c53e805340c3b9e4243edd537652a2b2b9d files/digest-php-4.4.2 807 +SHA256 c6eaf4c85fa86b3254f0f61c8127956d0b8ab0c8d6292ae9cab3ebbc03f832b3 files/digest-php-4.4.2 807 +MD5 deaf81609cd783b916a274c8d9e2c8d9 files/digest-php-5.0.5-r5 807 +RMD160 903c019620d92706e67f94a9fa313bfcdbd0c89f files/digest-php-5.0.5-r5 807 +SHA256 0581c6a261821444df13abb32b05a42a3de01bb45d8d51a4c8f12cc0f4fd0551 files/digest-php-5.0.5-r5 807 +MD5 ff8e7b70d7eb49eb7b0e6cc65d9dc6f4 files/digest-php-5.1.2 804 +RMD160 eb0553851c98b72a5b76c854255b42f6268cba96 files/digest-php-5.1.2 804 +SHA256 c5796a8c5be891a50b66433f00df75607a22c5155bfae2527f657cc870f433e4 files/digest-php-5.1.2 804 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157 -MD5 aabeba5ddbd68b8be89ed139668cb8e9 php-4.3.11-r5.ebuild 9683 -RMD160 c7499ef10841729a87f84e3a5337cfccce800350 php-4.3.11-r5.ebuild 9683 -SHA256 08d5fd3d8fb533434c1b1e9b856c0bdd3aa5df624069514e227ab754ce100455 php-4.3.11-r5.ebuild 9683 -MD5 e175f9385696e0c369ffe525fc9ce2a1 php-4.4.1-r3.ebuild 8676 -RMD160 da6911358ab3ef63a1d738af3bbb1bce7f7d995e php-4.4.1-r3.ebuild 8676 -SHA256 ca91111cbdd3fda5d341086cf40311249cbf3d93cdcd7700481850440e621446 php-4.4.1-r3.ebuild 8676 -MD5 8848042f0d7a90486adf9456d4915fe0 php-5.0.5-r5.ebuild 6120 -RMD160 758088e9e195b31489de525e1beeeaac19838b65 php-5.0.5-r5.ebuild 6120 -SHA256 d933df3354e92e8ec694961268189305ef7299e16630cee19b20cabbd63e78a6 php-5.0.5-r5.ebuild 6120 -MD5 c01fa8cd1f2cda0b1b3e9de076331611 php-5.1.1.ebuild 8227 -RMD160 996d4482b5091de1cef126948eeabfff499f23a4 php-5.1.1.ebuild 8227 -SHA256 72bd6479f18275b9387a2bcbdf1aeb47bea8adfe5f2394f5b30815a68d805fea php-5.1.1.ebuild 8227 +MD5 08faf252d954004ef58b7d8ab251e26a php-4.3.11-r5.ebuild 8568 +RMD160 2e8f485904f50fa07d73a31b5628aebb0246425f php-4.3.11-r5.ebuild 8568 +SHA256 28cfee0e2c2d276c031e08bca43ab260ac8cbbe9df7b90a7fdaaeb5e702c187c php-4.3.11-r5.ebuild 8568 +MD5 3d71ed11d45be6af5fbbe24f916d5a53 php-4.4.1-r3.ebuild 7853 +RMD160 514bd3d0a833d45c3727bd64f8ad5c73333601c0 php-4.4.1-r3.ebuild 7853 +SHA256 4a8f663ddada066e3348f173e86cc8584fe4c78c8c09af210a0080ff78e42814 php-4.4.1-r3.ebuild 7853 +MD5 2e692aedff0d3a18997baa381726d56d php-4.4.2.ebuild 7860 +RMD160 81fdd65003f80ccc1bc692289cbc0fd01ef7aca6 php-4.4.2.ebuild 7860 +SHA256 a82c88d1c1e64dca7035bea2da67a2bacf5ca7d53ad2f5fc60d0b8676b8fe382 php-4.4.2.ebuild 7860 +MD5 d1b5299df3e797cc883b95970a47b22c php-5.0.5-r5.ebuild 4678 +RMD160 5997eca0ee7809c92d13f464f50326f30888eec5 php-5.0.5-r5.ebuild 4678 +SHA256 9dc9b9f4f2334a0a662f934f3ab6e1592d8f0fafda2f7abdeb6a60d8b1086019 php-5.0.5-r5.ebuild 4678 +MD5 5f3d4bc1fcf565e37c4c1e4f2add6b3b php-5.1.2.ebuild 7868 +RMD160 7635a17811a1a5d111ca9e8f4f7eed91394a1a99 php-5.1.2.ebuild 7868 +SHA256 5ced0abd93b15351fcd16792fa76d8fa717b71026d1875f136d4eb9d2dcceab2 php-5.1.2.ebuild 7868 diff --git a/dev-lang/php/files/4-any/php4-fastbuild.patch b/dev-lang/php/files/4-any/php4-fastbuild.patch deleted file mode 100644 index 47f0dc77a38d..000000000000 --- a/dev-lang/php/files/4-any/php4-fastbuild.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff -u --recursive php-4.4.0/acinclude.m4 php-4.4.0-cgi/acinclude.m4 ---- php-4.4.0/acinclude.m4 2005-09-14 22:39:22.000000000 +0200 -+++ php-4.4.0-cgi/acinclude.m4 2005-09-14 22:39:54.000000000 +0200 -@@ -84,7 +84,7 @@ - dnl - dnl which array to append to? - AC_DEFUN([PHP_ADD_SOURCES],[ -- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) -+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) - ]) - dnl - dnl _PHP_ASSIGN_BUILD_VARS(type) -diff -u --recursive php-4.4.0/configure.in php-4.4.0-cgi/configure.in ---- php-4.4.0/configure.in 2005-07-11 08:45:09.000000000 +0100 -+++ php-4.4.0-cgi/configure.in 2005-09-01 08:00:54.000000000 +0100 -@@ -1216,20 +1216,20 @@ - INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" - CXXFLAGS="$CXXFLAGS $standard_libtool_flag" - --all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' -+all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET) $(PHP_CGI_TARGET)' - install_targets="$install_modules $install_pear install-build install-headers install-programs" - --case $PHP_SAPI in -- cgi) -- install_targets="install-sapi $install_targets" -- ;; -- cli) -- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" -- ;; -- *) -- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" -- ;; --esac -+if test "$PHP_SAPI_CGI" != "no" ; then -+ install_targets="install-sapi $install_targets" -+fi -+ -+if test "$PHP_SAPI_CLI" != "no" ; then -+ install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" -+fi -+ -+if test "$PHP_SAPI" != "default" ; then -+ install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" -+fi - - PHP_SUBST(all_targets) - PHP_SUBST(install_targets) -diff -u --recursive php-4.4.0/sapi/cgi/Makefile.frag php-4.4.0-cgi/sapi/cgi/Makefile.frag ---- php-4.4.0/sapi/cgi/Makefile.frag 2003-07-02 02:06:29.000000000 +0100 -+++ php-4.4.0-cgi/sapi/cgi/Makefile.frag 2005-09-01 08:03:20.000000000 +0100 -@@ -1,2 +1,6 @@ --$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) - $(BUILD_CGI) -+ -+install-cgi: $(SAPI_CGI_PATH) -+ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" -+ @$(INSTALL_CGI) -diff -u --recursive php-4.4.0/sapi/cgi/config9.m4 php-4.4.0-cgi/sapi/cgi/config9.m4 ---- php-4.4.0/sapi/cgi/config9.m4 2004-12-30 07:02:18.000000000 +0000 -+++ php-4.4.0-cgi/sapi/cgi/config9.m4 2005-09-01 08:05:08.000000000 +0100 -@@ -81,93 +81,107 @@ - ]) - - --if test "$PHP_SAPI" = "default"; then -- AC_MSG_CHECKING(for CGI build) -- if test "$PHP_SAPI_CGI" != "no"; then -- AC_MSG_RESULT(yes) -- -- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) -- case $host_alias in -- *cygwin* ) -- SAPI_CGI_PATH=sapi/cgi/php.exe -- ;; -- * ) -- SAPI_CGI_PATH=sapi/cgi/php -- ;; -- esac -- PHP_SUBST(SAPI_CGI_PATH) -- -- PHP_TEST_WRITE_STDOUT -- -- AC_MSG_CHECKING(whether to force Apache CGI redirect) -- if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then -- REDIRECT=1 -- else -- REDIRECT=0 -- fi -- AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) -- AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) -+AC_MSG_CHECKING(for CGI build) -+if test "$PHP_SAPI_CGI" != "no"; then -+ AC_MSG_RESULT(yes) -+ -+ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) -+ case $host_alias in -+ *cygwin* ) -+ SAPI_CGI_PATH=sapi/cgi/php.exe -+ ;; -+ * ) -+ SAPI_CGI_PATH=sapi/cgi/php -+ ;; -+ esac -+ PHP_SUBST(SAPI_CGI_PATH) - -+ PHP_TEST_WRITE_STDOUT - -- AC_MSG_CHECKING(whether to discard path_info + path_translated) -- if test "$PHP_DISCARD_PATH" = "yes"; then -- DISCARD_PATH=1 -- else -- DISCARD_PATH=0 -- fi -- AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) -- AC_MSG_RESULT($PHP_DISCARD_PATH) -+ AC_MSG_CHECKING(whether to force Apache CGI redirect) -+ if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then -+ REDIRECT=1 -+ else -+ REDIRECT=0 -+ fi -+ AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) -+ AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) - -- AC_MSG_CHECKING(whether to enable path info checking) -- if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then -- ENABLE_PATHINFO_CHECK=1 -- else -- ENABLE_PATHINFO_CHECK=0 -- fi -- AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) -- AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) - -- AC_MSG_CHECKING(whether to enable fastcgi support) -- PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi" -- if test -z $PHP_LIBFCGI_DIR; then -- echo "$PHP_LIBFCGI_DIR does not exist" -- exit 1 -- fi -- if test "$PHP_ENABLE_FASTCGI" = "yes"; then -- PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) -- PHP_FASTCGI=1 -- PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c" -- PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include" -- PHP_FCGI_STATIC=1 -- else -- PHP_FASTCGI=0 -- PHP_FCGI_FILES="" -- PHP_FCGI_INCLUDE="" -- PHP_FCGI_STATIC=0 -- fi -- AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) -- AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) -- AC_MSG_RESULT($PHP_ENABLE_FASTCGI) -- -- INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" -- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') -- -- case $host_alias in -- *darwin*) -- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ AC_MSG_CHECKING(whether to discard path_info + path_translated) -+ if test "$PHP_DISCARD_PATH" = "yes"; then -+ DISCARD_PATH=1 -+ else -+ DISCARD_PATH=0 -+ fi -+ AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) -+ AC_MSG_RESULT($PHP_DISCARD_PATH) -+ -+ AC_MSG_CHECKING(whether to enable path info checking) -+ if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then -+ ENABLE_PATHINFO_CHECK=1 -+ else -+ ENABLE_PATHINFO_CHECK=0 -+ fi -+ AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) -+ AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) -+ -+ AC_MSG_CHECKING(whether to enable fastcgi support) -+ PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi" -+ if test -z $PHP_LIBFCGI_DIR; then -+ echo "$PHP_LIBFCGI_DIR does not exist" -+ exit 1 -+ fi -+ if test "$PHP_ENABLE_FASTCGI" = "yes"; then -+ PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) -+ PHP_FASTCGI=1 -+ PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c" -+ PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include" -+ PHP_FCGI_STATIC=1 -+ else -+ PHP_FASTCGI=0 -+ PHP_FCGI_FILES="" -+ PHP_FCGI_INCLUDE="" -+ PHP_FCGI_STATIC=0 -+ fi -+ AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) -+ AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) -+ AC_MSG_RESULT($PHP_ENABLE_FASTCGI) -+ -+ INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" -+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, cgi) -+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) -+ -+ case $host_alias in -+ *darwin*) -+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; -- *) -- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ *) -+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; -- esac -+ esac - -- PHP_SUBST(BUILD_CGI) -+ PHP_CGI_TARGET="$SAPI_CGI_PATH" -+ PHP_INSTALL_CGI_TARGET="install-cgi" - -- elif test "$PHP_SAPI_CLI" != "no"; then -- AC_MSG_RESULT(no) -- OVERALL_TARGET= -- PHP_SAPI=cli -- else -- AC_MSG_ERROR([No SAPIs selected.]) -+ PHP_SUBST(BUILD_CGI) -+ PHP_SUBST(INSTALL_CGI) -+ PHP_SUBST(PHP_CGI_OBJS) -+ PHP_SUBST(PHP_CGI_TARGET) -+ PHP_SUBST(PHP_INSTALL_CGI_TARGET) -+ -+ if test "$PHP_SAPI" = "default" ; then -+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH) -+ fi -+ -+else -+ AC_MSG_RESULT(no) -+ if test "$PHP_SAPI" = "default" ; then -+ if test "$PHP_SAPI_CLI" != "no"; then -+ OVERALL_TARGET= -+ PHP_SAPI=cli -+ else -+ AC_MSG_ERROR([No SAPIs selected.]) -+ fi - fi - fi diff --git a/dev-lang/php/files/4-any/php4-imap-symlink.diff b/dev-lang/php/files/4-any/php4-imap-symlink.diff deleted file mode 100644 index 26121804bcc3..000000000000 --- a/dev-lang/php/files/4-any/php4-imap-symlink.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/imap/config.m4 2005-11-30 23:05:52.000000000 +0100 -+++ ext/imap/config.m4 2005-11-30 23:06:17.000000000 +0100 -@@ -158,12 +158,6 @@ - AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK(lib) diff --git a/dev-lang/php/files/4-any/php4-iodbc-config.diff b/dev-lang/php/files/4-any/php4-iodbc-config.diff deleted file mode 100644 index 189e9fbc4aca..000000000000 --- a/dev-lang/php/files/4-any/php4-iodbc-config.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ext/odbc/config.m4 2005-11-30 23:06:56.000000000 +0100 -+++ ext/odbc/config.m4 2005-11-30 23:07:16.000000000 +0100 -@@ -419,9 +419,9 @@ - test -f "$IODBC_LIBDIR/libiodbc.a" -o -f "$IODBC_LIBDIR/libiodbc.$SHLIB_SUFFIX_NAME" && break - done - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $IODBC_LIBDIR) -- PHP_ADD_INCLUDE($withval/include, 1) -+ PHP_ADD_INCLUDE($withval/include/iodbc, 1) - ODBC_TYPE=iodbc -- ODBC_INCLUDE=-I$withval/include -+ ODBC_INCLUDE=-I$withval/include/iodbc - ODBC_LFLAGS=-L$IODBC_LIBDIR - ODBC_LIBS=-liodbc - AC_DEFINE(HAVE_IODBC,1,[ ]) diff --git a/dev-lang/php/files/4-any/php4-libtool-1.5.patch b/dev-lang/php/files/4-any/php4-libtool-1.5.patch deleted file mode 100644 index 076120384b4a..000000000000 --- a/dev-lang/php/files/4-any/php4-libtool-1.5.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- acinclude.m4 2005-09-08 13:16:38.000000000 +0200 -+++ acinclude.m4 2005-09-08 13:21:09.000000000 +0200 -@@ -783,12 +783,12 @@ - dnl - AC_DEFUN([PHP_BUILD_PROGRAM],[ - OVERALL_TARGET=[]ifelse($1,,php,$1) -- php_c_pre='$(CC)' -+ php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post=' && echo > $[@]' -- php_cxx_pre='$(CXX)' -+ php_c_post= -+ php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post=' && echo > $[@]' -+ php_cxx_post= - php_lo=o - - case $with_pic in diff --git a/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch b/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch deleted file mode 100644 index e19a720661a6..000000000000 --- a/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch +++ /dev/null @@ -1,33 +0,0 @@ -Backport from php-5 which will only use the dn_skipname function if the host -system supports it (uClibc for example does not). - ---- ext/standard/dns.c -+++ ext/standard/dns.c -@@ -275,6 +275,7 @@ PHP_FUNCTION(checkdnsrr) - #define MAXHOSTNAMELEN 256 - #endif /* MAXHOSTNAMELEN */ - -+#if HAVE_DN_SKIPNAME - /* {{{ proto int getmxrr(string hostname, array mxhosts [, array weight]) - Get MX records corresponding to a given Internet host name */ - PHP_FUNCTION(getmxrr) -@@ -355,6 +356,7 @@ PHP_FUNCTION(getmxrr) - RETURN_TRUE; - } - /* }}} */ -+#endif /* HAVE_DN_SKIPNAME */ - - #endif - /* ---- ext/standard/basic_functions.c -+++ ext/standard/basic_functions.c -@@ -449,7 +449,9 @@ function_entry basic_functions[] = { - - #if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE)) - PHP_FE(checkdnsrr, NULL) -+# if HAVE_DN_SKIPNAME - PHP_FE(getmxrr,second_and_third_args_force_ref) -+# endif - #endif - - PHP_FE(getmyuid, NULL) diff --git a/dev-lang/php/files/4-any/php4-with-iodbc.diff b/dev-lang/php/files/4-any/php4-with-iodbc.diff deleted file mode 100644 index 81afcc0f2de1..000000000000 --- a/dev-lang/php/files/4-any/php4-with-iodbc.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/odbc/php_odbc_includes.h 2005-02-22 17:55:18.000000000 +0000 -+++ ext/odbc/php_odbc_includes.h 2005-02-22 17:55:26.000000000 +0000 -@@ -91,8 +91,8 @@ - #elif defined(HAVE_IODBC) /* iODBC library */ - - #define ODBC_TYPE "iODBC" --#include --#include -+#include -+#include - #define HAVE_SQL_EXTENDED_FETCH 1 - #define SQL_FD_FETCH_ABSOLUTE 0x00000010L - #define SQL_CURSOR_DYNAMIC 2UL diff --git a/dev-lang/php/files/5.0-any/apache-1.3/70_mod_php5.conf b/dev-lang/php/files/5.0-any/apache-1.3/70_mod_php5.conf deleted file mode 100644 index c6f14262e3f0..000000000000 --- a/dev-lang/php/files/5.0-any/apache-1.3/70_mod_php5.conf +++ /dev/null @@ -1,20 +0,0 @@ -# vim: ft=apache sw=4 ts=4 - - - # Load the module first - - LoadModule php5_module modules/libphp5.so - - - # Set it to handle the files - - AddType application/x-httpd-php .php - AddType application/x-httpd-php .phtml - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php .php5 - AddType application/x-httpd-php-source .phps - - - AddDirectoryIndex index.php index.phtml - diff --git a/dev-lang/php/files/5.0-any/apache-2.0/70_mod_php5.conf b/dev-lang/php/files/5.0-any/apache-2.0/70_mod_php5.conf deleted file mode 100644 index 40dfa869e4ff..000000000000 --- a/dev-lang/php/files/5.0-any/apache-2.0/70_mod_php5.conf +++ /dev/null @@ -1,20 +0,0 @@ -# vim: ft=apache sw=4 ts=4 - - - # Load the module first - - LoadModule php5_module modules/libphp5.so - - - # Set it to handle the files - - AddType application/x-httpd-php .php - AddType application/x-httpd-php .phtml - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php .php5 - AddType application/x-httpd-php-source .phps - - - AddDirectoryIndex index.php index.phtml - diff --git a/dev-lang/php/files/5.0-any/php5-imap-symlink.diff b/dev-lang/php/files/5.0-any/php5-imap-symlink.diff deleted file mode 100644 index 99cfc9b68976..000000000000 --- a/dev-lang/php/files/5.0-any/php5-imap-symlink.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/imap/config.m4 2005-09-04 02:49:45.000000000 +0200 -+++ ext/imap/config.m4 2005-09-04 02:50:00.000000000 +0200 -@@ -146,12 +146,6 @@ - AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK(lib) diff --git a/dev-lang/php/files/5.0-any/php5-iodbc-config.diff b/dev-lang/php/files/5.0-any/php5-iodbc-config.diff deleted file mode 100644 index 2ac31b300cf5..000000000000 --- a/dev-lang/php/files/5.0-any/php5-iodbc-config.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ext/odbc/config.m4 2005-12-08 22:21:32.000000000 +0100 -+++ ext/odbc/config.m4 2005-12-08 22:22:15.000000000 +0100 -@@ -426,9 +426,9 @@ - test -f "$IODBC_LIBDIR/libiodbc.a" -o -f "$IODBC_LIBDIR/libiodbc.$SHLIB_SUFFIX_NAME" && break - done - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $IODBC_LIBDIR) -- PHP_ADD_INCLUDE($withval/include, 1) -+ PHP_ADD_INCLUDE($withval/include/iodbc, 1) - ODBC_TYPE=iodbc -- ODBC_INCLUDE=-I$withval/include -+ ODBC_INCLUDE=-I$withval/include/iodbc - ODBC_LFLAGS=-L$IODBC_LIBDIR - ODBC_LIBS=-liodbc - AC_DEFINE(HAVE_IODBC,1,[ ]) diff --git a/dev-lang/php/files/5.0-any/php5-libtool-1.5.patch b/dev-lang/php/files/5.0-any/php5-libtool-1.5.patch deleted file mode 100644 index 7404992272e1..000000000000 --- a/dev-lang/php/files/5.0-any/php5-libtool-1.5.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- acinclude.m4 2005-09-08 13:27:42.000000000 +0200 -+++ acinclude.m4 2005-09-08 13:28:28.000000000 +0200 -@@ -779,12 +779,12 @@ - dnl - AC_DEFUN([PHP_BUILD_PROGRAM],[ - OVERALL_TARGET=[]ifelse($1,,php,$1) -- php_c_pre='$(CC)' -+ php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post=' && echo > $[@]' -- php_cxx_pre='$(CXX)' -+ php_c_post= -+ php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post=' && echo > $[@]' -+ php_cxx_post= - php_lo=o - - case $with_pic in diff --git a/dev-lang/php/files/5.0-any/php5-prefork.patch b/dev-lang/php/files/5.0-any/php5-prefork.patch deleted file mode 100644 index 135579c33d82..000000000000 --- a/dev-lang/php/files/5.0-any/php5-prefork.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u --recursive php-5.0.4-orig/sapi/apache2filter/config.m4 php-5.0.4/sapi/apache2filter/config.m4 ---- php-5.0.4-orig/sapi/apache2filter/config.m4 2005-03-13 20:30:44.767051120 +0000 -+++ php-5.0.4/sapi/apache2filter/config.m4 2005-03-13 20:32:01.999310032 +0000 -@@ -115,9 +115,6 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -- PHP_BUILD_THREAD_SAFE -- fi - AC_MSG_RESULT(yes) - - PHP_SUBST(APXS) -diff -u --recursive php-5.0.4-orig/sapi/apache2handler/config.m4 php-5.0.4/sapi/apache2handler/config.m4 ---- php-5.0.4-orig/sapi/apache2handler/config.m4 2005-03-13 20:30:44.771050512 +0000 -+++ php-5.0.4/sapi/apache2handler/config.m4 2005-03-13 20:31:50.106118072 +0000 -@@ -114,9 +114,6 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -- PHP_BUILD_THREAD_SAFE -- fi - AC_MSG_RESULT(yes) - - PHP_SUBST(APXS) diff --git a/dev-lang/php/files/5.0-any/php5-soap_persistence_session.diff b/dev-lang/php/files/5.0-any/php5-soap_persistence_session.diff deleted file mode 100644 index 626ac67f9081..000000000000 --- a/dev-lang/php/files/5.0-any/php5-soap_persistence_session.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c ---- php-5.0.0RC3.orig/ext/soap/soap.c 2004-06-22 19:35:59.801348936 +0300 -+++ php-5.0.0RC3/ext/soap/soap.c 2004-06-29 13:39:00.506820928 +0300 -@@ -1341,16 +1341,21 @@ - soap_obj = NULL; - #if HAVE_PHP_SESSION - /* If persistent then set soap_obj from from the previous created session (if available) */ -+ char soapname[32+sizeof("_bogus_session_name")]; //Now we use max 32 chars from class name, must be overwriten with dynamic allocation with exact length!! - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap; - -+ bzero(soapname,32+sizeof("_bogus_session_name")); -+ strncpy(soapname,service->soap_class.ce->name,32); -+ strcat(soapname,"_bogus_session_name"); -+ - if (PS(session_status) != php_session_active && - PS(session_status) != php_session_disabled) { - php_session_start(TSRMLS_C); - } - - /* Find the soap object and assign */ -- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS && -+ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS && - Z_TYPE_PP(tmp_soap) == IS_OBJECT && - Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) { - soap_obj = *tmp_soap; -@@ -1432,7 +1437,7 @@ - /* If session then update session hash with new object */ - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap_pp; -- if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) { -+ if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) { - soap_obj = *tmp_soap_pp; - } - } else { diff --git a/dev-lang/php/files/5.0-any/php5-with-iodbc.diff b/dev-lang/php/files/5.0-any/php5-with-iodbc.diff deleted file mode 100644 index 81afcc0f2de1..000000000000 --- a/dev-lang/php/files/5.0-any/php5-with-iodbc.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/odbc/php_odbc_includes.h 2005-02-22 17:55:18.000000000 +0000 -+++ ext/odbc/php_odbc_includes.h 2005-02-22 17:55:26.000000000 +0000 -@@ -91,8 +91,8 @@ - #elif defined(HAVE_IODBC) /* iODBC library */ - - #define ODBC_TYPE "iODBC" --#include --#include -+#include -+#include - #define HAVE_SQL_EXTENDED_FETCH 1 - #define SQL_FD_FETCH_ABSOLUTE 0x00000010L - #define SQL_CURSOR_DYNAMIC 2UL diff --git a/dev-lang/php/files/5.1-any/php5-fastbuild.patch b/dev-lang/php/files/5.1-any/php5-fastbuild.patch deleted file mode 100644 index 5c3ea8504569..000000000000 --- a/dev-lang/php/files/5.1-any/php5-fastbuild.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff -u --recursive php-5.1.0RC1/acinclude.m4 php-5.1.0RC1-cgi/acinclude.m4 ---- php-5.1.0RC1/acinclude.m4 2005-09-14 22:40:54.000000000 +0200 -+++ php-5.1.0RC1/acinclude.m4 2005-09-14 22:41:14.000000000 +0200 -@@ -194,7 +194,7 @@ - dnl - dnl which array to append to? - AC_DEFUN([PHP_ADD_SOURCES],[ -- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) -+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) - ]) - - dnl -@@ -962,12 +962,8 @@ - - if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then - dnl ---------------------------------------------- CLI static module -- if test "$PHP_SAPI" = "cgi"; then -- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) -- EXT_STATIC="$EXT_STATIC $1" -- else -- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -- fi -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) - EXT_CLI_STATIC="$EXT_CLI_STATIC $1" - fi - PHP_ADD_BUILD_DIR($ext_builddir) -diff -u --recursive php-5.1.0RC1/sapi/cgi/Makefile.frag php-5.1.0RC1-cgi/sapi/cgi/Makefile.frag ---- php-5.1.0RC1/sapi/cgi/Makefile.frag 2003-07-02 02:08:26.000000000 +0100 -+++ php-5.1.0RC1-cgi/sapi/cgi/Makefile.frag 2005-08-31 08:38:32.000000000 +0100 -@@ -1,2 +1,6 @@ --$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) - $(BUILD_CGI) -+ -+install-cgi: $(SAPI_CGI_PATH) -+ @echo "Installing CGI binary $(INSTALL_ROOT)$(bindir)/" -+ @$(INSTALL_CGI) -diff -u --recursive php-5.1.0RC1/sapi/cgi/config9.m4 php-5.1.0RC1-cgi/sapi/cgi/config9.m4 ---- php-5.1.0RC1/sapi/cgi/config9.m4 2005-07-07 06:54:43.000000000 +0100 -+++ php-5.1.0RC1-cgi/sapi/cgi/config9.m4 2005-08-31 08:54:01.000000000 +0100 -@@ -80,96 +80,109 @@ - ]) - - --if test "$PHP_SAPI" = "default"; then -- AC_MSG_CHECKING(for CGI build) -- if test "$PHP_SAPI_CGI" != "no"; then -- AC_MSG_RESULT(yes) -- -- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) -- case $host_alias in -- *cygwin* ) -- SAPI_CGI_PATH=sapi/cgi/php.exe -- ;; -- * ) -- SAPI_CGI_PATH=sapi/cgi/php -- ;; -- esac -- PHP_SUBST(SAPI_CGI_PATH) -- -- PHP_TEST_WRITE_STDOUT -- -- AC_MSG_CHECKING(whether to force Apache CGI redirect) -- if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then -- REDIRECT=1 -- else -- REDIRECT=0 -- fi -- AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) -- AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) -+AC_MSG_CHECKING(for CGI build) -+if test "$PHP_SAPI_CGI" != "no"; then -+ AC_MSG_RESULT(yes) -+ -+ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) -+ case $host_alias in -+ *cygwin* ) -+ SAPI_CGI_PATH=sapi/cgi/php.exe -+ ;; -+ * ) -+ SAPI_CGI_PATH=sapi/cgi/php -+ ;; -+ esac -+ PHP_SUBST(SAPI_CGI_PATH) - -+ PHP_TEST_WRITE_STDOUT - -- AC_MSG_CHECKING(whether to discard path_info + path_translated) -- if test "$PHP_DISCARD_PATH" = "yes"; then -- DISCARD_PATH=1 -- else -- DISCARD_PATH=0 -- fi -- AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) -- AC_MSG_RESULT($PHP_DISCARD_PATH) -+ AC_MSG_CHECKING(whether to force Apache CGI redirect) -+ if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then -+ REDIRECT=1 -+ else -+ REDIRECT=0 -+ fi -+ AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) -+ AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) - -- AC_MSG_CHECKING(whether to enable path info checking) -- if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then -- ENABLE_PATHINFO_CHECK=1 -- else -- ENABLE_PATHINFO_CHECK=0 -- fi -- AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) -- AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) - -- AC_MSG_CHECKING(whether to enable fastcgi support) -- PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi" -- if test -z $PHP_LIBFCGI_DIR; then -- echo "$PHP_LIBFCGI_DIR does not exist" -- exit 1 -- fi -- if test "$PHP_ENABLE_FASTCGI" = "yes"; then -- PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) -- PHP_FASTCGI=1 -- PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c" -- PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include" -- PHP_FCGI_STATIC=1 -- else -- PHP_FASTCGI=0 -- PHP_FCGI_FILES="" -- PHP_FCGI_INCLUDE="" -- PHP_FCGI_STATIC=0 -- fi -- AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) -- AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) -- AC_MSG_RESULT($PHP_ENABLE_FASTCGI) -- -- INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" -- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') -- -- case $host_alias in -- *aix*) -- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -- ;; -- *darwin*) -- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ AC_MSG_CHECKING(whether to discard path_info + path_translated) -+ if test "$PHP_DISCARD_PATH" = "yes"; then -+ DISCARD_PATH=1 -+ else -+ DISCARD_PATH=0 -+ fi -+ AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) -+ AC_MSG_RESULT($PHP_DISCARD_PATH) -+ -+ AC_MSG_CHECKING(whether to enable path info checking) -+ if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then -+ ENABLE_PATHINFO_CHECK=1 -+ else -+ ENABLE_PATHINFO_CHECK=0 -+ fi -+ AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) -+ AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) -+ -+ AC_MSG_CHECKING(whether to enable fastcgi support) -+ PHP_LIBFCGI_DIR="$abs_srcdir/sapi/cgi/libfcgi" -+ if test -z $PHP_LIBFCGI_DIR; then -+ echo "$PHP_LIBFCGI_DIR does not exist" -+ exit 1 -+ fi -+ if test "$PHP_ENABLE_FASTCGI" = "yes"; then -+ PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) -+ PHP_FASTCGI=1 -+ PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c" -+ PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include" -+ PHP_FCGI_STATIC=1 -+ else -+ PHP_FASTCGI=0 -+ PHP_FCGI_FILES="" -+ PHP_FCGI_INCLUDE="" -+ PHP_FCGI_STATIC=0 -+ fi -+ AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) -+ AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) -+ AC_MSG_RESULT($PHP_ENABLE_FASTCGI) -+ -+ INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" -+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, cgi) -+ PHP_ADD_SOURCES(/main, internal_functions_cli.c,,cgi) -+ -+ case $host_alias in -+ *aix*) -+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ ;; -+ *darwin*) -+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; -- *) -- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ *) -+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; -- esac -+ esac - -- PHP_SUBST(BUILD_CGI) -+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)" -+ PHP_INSTALL_CGI_TARGET="install-cgi" - -- elif test "$PHP_SAPI_CLI" != "no"; then -- AC_MSG_RESULT(no) -- OVERALL_TARGET= -- PHP_SAPI=cli -- else -- AC_MSG_ERROR([No SAPIs selected.]) -+ PHP_SUBST(BUILD_CGI) -+ PHP_SUBST(INSTALL_CGI) -+ PHP_SUBST(PHP_CGI_OBJS) -+ PHP_SUBST(PHP_CGI_TARGET) -+ PHP_SUBST(PHP_INSTALL_CGI_TARGET) -+ -+ if test "$PHP_SAPI" = "default" ; then -+ PHP_BUILD_PROGRAM($SAP_CGI_PATH) -+ fi -+else -+ AC_MSG_RESULT(no) -+ if test "$PHP_SAPI" = "default" ; then -+ if test "$PHP_SAPI_CLI" != "no" ; then -+ OVERALL_TARGET= -+ PHP_SAPI=cli -+ else -+ AC_MSG_ERROR([No SAPIs selected.]) -+ fi - fi - fi diff --git a/dev-lang/php/files/5.1-any/php5-imap-symlink.diff b/dev-lang/php/files/5.1-any/php5-imap-symlink.diff deleted file mode 100644 index 13c2bddcbb40..000000000000 --- a/dev-lang/php/files/5.1-any/php5-imap-symlink.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/imap/config.m4 2005-09-04 00:56:31.000000000 +0200 -+++ ext/imap/config.m4 2005-09-04 00:57:03.000000000 +0200 -@@ -146,12 +146,6 @@ - AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) - fi - -- if test -r "$IMAP_DIR/c-client/c-client.a"; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then -- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 -- fi -- - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK($PHP_LIBDIR) diff --git a/dev-lang/php/files/5.1-any/php5-iodbc-config.diff b/dev-lang/php/files/5.1-any/php5-iodbc-config.diff deleted file mode 100644 index 9102d48c37d8..000000000000 --- a/dev-lang/php/files/5.1-any/php5-iodbc-config.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ext/odbc/config.m4 2005-12-08 22:30:02.000000000 +0100 -+++ ext/odbc/config.m4 2005-12-08 22:30:21.000000000 +0100 -@@ -440,9 +440,9 @@ - fi - if test "$withval" != "no"; then - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$PHP_LIBDIR) -- PHP_ADD_INCLUDE($withval/include, 1) -+ PHP_ADD_INCLUDE($withval/include/iodbc, 1) - ODBC_TYPE=iodbc -- ODBC_INCLUDE=-I$withval/include -+ ODBC_INCLUDE=-I$withval/include/iodbc - ODBC_LFLAGS=-L$withval/$PHP_LIBDIR - ODBC_LIBS=-liodbc - AC_DEFINE(HAVE_IODBC,1,[ ]) diff --git a/dev-lang/php/files/5.1-any/php5-prefork.patch b/dev-lang/php/files/5.1-any/php5-prefork.patch deleted file mode 100644 index 135579c33d82..000000000000 --- a/dev-lang/php/files/5.1-any/php5-prefork.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u --recursive php-5.0.4-orig/sapi/apache2filter/config.m4 php-5.0.4/sapi/apache2filter/config.m4 ---- php-5.0.4-orig/sapi/apache2filter/config.m4 2005-03-13 20:30:44.767051120 +0000 -+++ php-5.0.4/sapi/apache2filter/config.m4 2005-03-13 20:32:01.999310032 +0000 -@@ -115,9 +115,6 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -- PHP_BUILD_THREAD_SAFE -- fi - AC_MSG_RESULT(yes) - - PHP_SUBST(APXS) -diff -u --recursive php-5.0.4-orig/sapi/apache2handler/config.m4 php-5.0.4/sapi/apache2handler/config.m4 ---- php-5.0.4-orig/sapi/apache2handler/config.m4 2005-03-13 20:30:44.771050512 +0000 -+++ php-5.0.4/sapi/apache2handler/config.m4 2005-03-13 20:31:50.106118072 +0000 -@@ -114,9 +114,6 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -- PHP_BUILD_THREAD_SAFE -- fi - AC_MSG_RESULT(yes) - - PHP_SUBST(APXS) diff --git a/dev-lang/php/files/5.1-any/php5-soap_persistence_session.diff b/dev-lang/php/files/5.1-any/php5-soap_persistence_session.diff deleted file mode 100644 index 626ac67f9081..000000000000 --- a/dev-lang/php/files/5.1-any/php5-soap_persistence_session.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c ---- php-5.0.0RC3.orig/ext/soap/soap.c 2004-06-22 19:35:59.801348936 +0300 -+++ php-5.0.0RC3/ext/soap/soap.c 2004-06-29 13:39:00.506820928 +0300 -@@ -1341,16 +1341,21 @@ - soap_obj = NULL; - #if HAVE_PHP_SESSION - /* If persistent then set soap_obj from from the previous created session (if available) */ -+ char soapname[32+sizeof("_bogus_session_name")]; //Now we use max 32 chars from class name, must be overwriten with dynamic allocation with exact length!! - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap; - -+ bzero(soapname,32+sizeof("_bogus_session_name")); -+ strncpy(soapname,service->soap_class.ce->name,32); -+ strcat(soapname,"_bogus_session_name"); -+ - if (PS(session_status) != php_session_active && - PS(session_status) != php_session_disabled) { - php_session_start(TSRMLS_C); - } - - /* Find the soap object and assign */ -- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS && -+ if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS && - Z_TYPE_PP(tmp_soap) == IS_OBJECT && - Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) { - soap_obj = *tmp_soap; -@@ -1432,7 +1437,7 @@ - /* If session then update session hash with new object */ - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap_pp; -- if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) { -+ if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) { - soap_obj = *tmp_soap_pp; - } - } else { diff --git a/dev-lang/php/files/5.1-any/php5-with-iodbc.diff b/dev-lang/php/files/5.1-any/php5-with-iodbc.diff deleted file mode 100644 index 81afcc0f2de1..000000000000 --- a/dev-lang/php/files/5.1-any/php5-with-iodbc.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/odbc/php_odbc_includes.h 2005-02-22 17:55:18.000000000 +0000 -+++ ext/odbc/php_odbc_includes.h 2005-02-22 17:55:26.000000000 +0000 -@@ -91,8 +91,8 @@ - #elif defined(HAVE_IODBC) /* iODBC library */ - - #define ODBC_TYPE "iODBC" --#include --#include -+#include -+#include - #define HAVE_SQL_EXTENDED_FETCH 1 - #define SQL_FD_FETCH_ABSOLUTE 0x00000010L - #define SQL_CURSOR_DYNAMIC 2UL diff --git a/dev-lang/php/files/4-any/apache-1.3/70_mod_php.conf b/dev-lang/php/files/70_mod_php.conf-apache1 similarity index 94% rename from dev-lang/php/files/4-any/apache-1.3/70_mod_php.conf rename to dev-lang/php/files/70_mod_php.conf-apache1 index 34a41d81193c..60a1fe63a1c1 100644 --- a/dev-lang/php/files/4-any/apache-1.3/70_mod_php.conf +++ b/dev-lang/php/files/70_mod_php.conf-apache1 @@ -1,4 +1,3 @@ -# vim: ft=apache sw=4 ts=4 # Load the module first diff --git a/dev-lang/php/files/4-any/apache-2.0/70_mod_php.conf b/dev-lang/php/files/70_mod_php.conf-apache2 similarity index 94% rename from dev-lang/php/files/4-any/apache-2.0/70_mod_php.conf rename to dev-lang/php/files/70_mod_php.conf-apache2 index ce680323f6e0..d3ca2eaa00a0 100644 --- a/dev-lang/php/files/4-any/apache-2.0/70_mod_php.conf +++ b/dev-lang/php/files/70_mod_php.conf-apache2 @@ -1,4 +1,3 @@ -# vim: ft=apache sw=4 ts=4 # Load the module first diff --git a/dev-lang/php/files/5.1-any/apache-1.3/70_mod_php5.conf b/dev-lang/php/files/70_mod_php5.conf-apache1 similarity index 94% rename from dev-lang/php/files/5.1-any/apache-1.3/70_mod_php5.conf rename to dev-lang/php/files/70_mod_php5.conf-apache1 index c6f14262e3f0..1aee813559e6 100644 --- a/dev-lang/php/files/5.1-any/apache-1.3/70_mod_php5.conf +++ b/dev-lang/php/files/70_mod_php5.conf-apache1 @@ -1,4 +1,3 @@ -# vim: ft=apache sw=4 ts=4 # Load the module first diff --git a/dev-lang/php/files/5.1-any/apache-2.0/70_mod_php5.conf b/dev-lang/php/files/70_mod_php5.conf-apache2 similarity index 94% rename from dev-lang/php/files/5.1-any/apache-2.0/70_mod_php5.conf rename to dev-lang/php/files/70_mod_php5.conf-apache2 index 40dfa869e4ff..ecf115236f73 100644 --- a/dev-lang/php/files/5.1-any/apache-2.0/70_mod_php5.conf +++ b/dev-lang/php/files/70_mod_php5.conf-apache2 @@ -1,4 +1,3 @@ -# vim: ft=apache sw=4 ts=4 # Load the module first diff --git a/dev-lang/php/files/digest-php-4.3.11-r5 b/dev-lang/php/files/digest-php-4.3.11-r5 index 0bb4f5e2e5df..62d6b2d1a466 100644 --- a/dev-lang/php/files/digest-php-4.3.11-r5 +++ b/dev-lang/php/files/digest-php-4.3.11-r5 @@ -1,4 +1,12 @@ 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 -MD5 2c64ed2986e72404055e12444b23b9d4 php-patchset-4.3.11-r1.tar.bz2 21875 +RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 php-4.3.11.tar.bz2 4012575 +SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5 php-4.3.11.tar.bz2 4012575 +MD5 31c7af83657e23387116b2407aaf796c php-patchset-4.3.11-r2.tar.bz2 27051 +RMD160 0c0fa32570cd79eb0ce59b308fdb38c68c58280a php-patchset-4.3.11-r2.tar.bz2 27051 +SHA256 4235ac9ac8104fdcd39d11774de6c24493e6e94df7f840f69925430fec3b0d39 php-patchset-4.3.11-r2.tar.bz2 27051 MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619 +RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 php-pcrelib-new-secpatch.tar.bz2 357619 +SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19 php-pcrelib-new-secpatch.tar.bz2 357619 diff --git a/dev-lang/php/files/digest-php-4.4.1-r3 b/dev-lang/php/files/digest-php-4.4.1-r3 index c52289d9db94..44ca504a0081 100644 --- a/dev-lang/php/files/digest-php-4.4.1-r3 +++ b/dev-lang/php/files/digest-php-4.4.1-r3 @@ -1,3 +1,9 @@ MD5 615d27d7c39017e1e45f15bc8eed3c94 hardening-patch-4.4.1-0.4.8-gentoo.patch.gz 59878 +RMD160 bba3eeab2a33b34a73322d23bf60bf37dc8ff72b hardening-patch-4.4.1-0.4.8-gentoo.patch.gz 59878 +SHA256 83797ef76b564c5e74f1cdf6328e71ee4955e1e9fb748da5bc73d92267f27fe1 hardening-patch-4.4.1-0.4.8-gentoo.patch.gz 59878 MD5 6b5726471189f8a1f26dd7cc5e19b442 php-4.4.1.tar.bz2 4157749 -MD5 6df61423378f90decbd063fcbefa750c php-patchset-4.4.1-r1.tar.bz2 12559 +RMD160 fb7f5b90d05a2efa8f0122740e2c27a29f28574e php-4.4.1.tar.bz2 4157749 +SHA256 c3010a85089bd464d5bbdda63dd253e0cf779db9670accf1ea5355de7ba448f8 php-4.4.1.tar.bz2 4157749 +MD5 0f43b1e41ce3093e8f4813a0b8219c44 php-patchset-4.4.1-r2.tar.bz2 17535 +RMD160 f152c779ee7aeeebc3c68bcd70de386aa20b4551 php-patchset-4.4.1-r2.tar.bz2 17535 +SHA256 a33cc8ede8ef8c7b9541e71cd65f19b87bc55054dd4cbc1a69acdd14b048761c php-patchset-4.4.1-r2.tar.bz2 17535 diff --git a/dev-lang/php/files/digest-php-4.4.2 b/dev-lang/php/files/digest-php-4.4.2 new file mode 100644 index 000000000000..1fcfa10418c2 --- /dev/null +++ b/dev-lang/php/files/digest-php-4.4.2 @@ -0,0 +1,9 @@ +MD5 fa67e075f724b5cb4701ffdd0a05e03d hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792 +RMD160 87c5234a6e70b3f24b20227e891e4f878b9e55a8 hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792 +SHA256 31a8aec0f46cd34079179a32e1b8033891d9cb0e5cbd53ef9d56848b48c1f1f9 hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792 +MD5 28051cd9ef43490dd9727a4d442011b5 php-4.4.2.tar.bz2 4371185 +RMD160 cbef0fa4e233529422bc0944dcfb79d866013f5e php-4.4.2.tar.bz2 4371185 +SHA256 a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb php-4.4.2.tar.bz2 4371185 +MD5 048bcc2e39d96cb5f8194c75291f3cf2 php-patchset-4.4.2-r1.tar.bz2 13774 +RMD160 95db8755a8d5d8972bc8bf5ecaf8740663f910d5 php-patchset-4.4.2-r1.tar.bz2 13774 +SHA256 8106995c3243c604434cb4b4fdafc04db0e3604eccb7ba487724f44b892252e4 php-patchset-4.4.2-r1.tar.bz2 13774 diff --git a/dev-lang/php/files/digest-php-5.0.5-r5 b/dev-lang/php/files/digest-php-5.0.5-r5 index 162a5c61ce6f..17b526372619 100644 --- a/dev-lang/php/files/digest-php-5.0.5-r5 +++ b/dev-lang/php/files/digest-php-5.0.5-r5 @@ -1,3 +1,9 @@ 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 -MD5 fc8196ec8809faf8f8482df9152c1b83 php-patchset-5.0.5-r1.tar.bz2 16809 +RMD160 6a9a892affba229770154407860cd1c2a098eaf9 php-5.0.5.tar.bz2 4895556 +SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f php-5.0.5.tar.bz2 4895556 +MD5 6f9db1d66a81f95933ad6d9eb71c6f84 php-patchset-5.0.5-r2.tar.bz2 20314 +RMD160 2a929a6eb9f5e8a9e01c26b6304f7c60e4c1bf7d php-patchset-5.0.5-r2.tar.bz2 20314 +SHA256 46bfe8d324b28dbfc8c9399bf6c1f2ef3e44cca7b97e08a9083f986002482309 php-patchset-5.0.5-r2.tar.bz2 20314 diff --git a/dev-lang/php/files/digest-php-5.1.1 b/dev-lang/php/files/digest-php-5.1.1 deleted file mode 100644 index 279a51844fba..000000000000 --- a/dev-lang/php/files/digest-php-5.1.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 79725da7da569045a6ad2e790b08fbb8 hardening-patch-5.1.1-0.4.8-gentoo.patch.gz 57546 -MD5 70a7c90de182d1a1901c390b844153c7 php-5.1.1.tar.bz2 6149470 -MD5 3ef236ff9de57e7329f5dc2a89eba7c4 php-patchset-5.1.1-r1.tar.bz2 3195 diff --git a/dev-lang/php/files/digest-php-5.1.2 b/dev-lang/php/files/digest-php-5.1.2 new file mode 100644 index 000000000000..5925d4a49c3d --- /dev/null +++ b/dev-lang/php/files/digest-php-5.1.2 @@ -0,0 +1,9 @@ +MD5 61d534c04399b5fa1f167ec2d86351a3 hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663 +RMD160 2b79a7a367b834fefd1c82268424bee35dd27474 hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663 +SHA256 7e6453a9b45daf9af9d861b3907349d1d385eed7341f1c5427ab7b2a5f4794f7 hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663 +MD5 79cee17e9db85be878000a2a4198378e php-5.1.2.tar.bz2 6319905 +RMD160 1e21b5ba280b7efc8197802c673bb5d4e9dc9f8e php-5.1.2.tar.bz2 6319905 +SHA256 a18399360e1c5dcbdfed4f7215ae8fd2a5e057c24b86392392e832216aa63202 php-5.1.2.tar.bz2 6319905 +MD5 2a99a8cd646da25e92d10b3ce91cceb4 php-patchset-5.1.2-r1.tar.bz2 6782 +RMD160 a0dcf11a29b8a0654ca158532f6865819cb2ef6f php-patchset-5.1.2-r1.tar.bz2 6782 +SHA256 e171ed1b1dac3571b1c72c3fb48e7d79029a99562c83e1e1242c2589aeff685e php-patchset-5.1.2-r1.tar.bz2 6782 diff --git a/dev-lang/php/php-4.3.11-r5.ebuild b/dev-lang/php/php-4.3.11-r5.ebuild index fcab08bb0ff7..e47f71909896 100644 --- a/dev-lang/php/php-4.3.11-r5.ebuild +++ b/dev-lang/php/php-4.3.11-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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-r5.ebuild,v 1.8 2006/01/24 21:39:22 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r5.ebuild,v 1.9 2006/03/12 13:25:34 chtekk Exp $ IUSE="cgi cli discard-path force-cgi-redirect" KEYWORDS="~alpha arm ia64 ~ppc s390 sh sparc x86" @@ -8,42 +8,45 @@ KEYWORDS="~alpha arm ia64 ~ppc s390 sh sparc x86" # 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 -# -# This will be sorted out when GLEP 37 is implemented - PROVIDE="virtual/php virtual/httpd-php" # php package settings SLOT="4" -MY_PHP_P="php-${PV}" +MY_PHP_PV="${PV}" +MY_PHP_P="php-${MY_PHP_PV}" PHP_PACKAGE=1 # php patch settings -HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.3-gentoo.patch.gz" -LIB64_PATCH="${PV}/php${PV}-multilib-search-path.patch" +PHP_PATCHSET_REV="2" +HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.3-gentoo.patch.gz" +MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch" +FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch" -inherit eutils php4_4-sapi apache-module +inherit php4_4-sapi apache-module want_apache -DESCRIPTION="The PHP language runtime engine" +DESCRIPTION="The PHP language runtime engine." DEPEND="${DEPEND} app-admin/php-toolkit" RDEPEND="${RDEPEND} app-admin/php-toolkit" -# fixed PCRE library for security issues, bug #102373 -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" - # PHP patchsets -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${PV}-r1.tar.bz2" +SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2" + +# Hardened-PHP patch +[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )" + +# Fixed PCRE library for security issues, bug #102373 +SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2" pkg_setup() { # make sure the user has specified a SAPI einfo "Determining SAPI(s) to build" confutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2 - if useq apache || useq apache2 ; then - if [ "${APACHE_VERSION}" != "0" ] ; then + if useq apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; then if ! useq threads ; then APACHE2_SAFE_MPMS="peruser prefork" else @@ -80,51 +83,15 @@ pkg_setup() { src_unpack() { # custom src_unpack, used only for PHP ebuilds that need additional patches # normally the eclass src_unpack is used - if [ "${PHP_PACKAGE}" == 1 ] ; then + if [[ "${PHP_PACKAGE}" == 1 ]] ; then unpack ${A} fi cd "${S}" - # fix PHP branding - sed -e 's|^EXTRA_VERSION=""|EXTRA_VERSION="-pl5-gentoo"|g' -i configure.in - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${WORKDIR}/${PV}/php${PV}-pspell-ext-segf.patch" - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${WORKDIR}/${PV}/php${PV}-curl-open_basedir.patch" - - # fix header injection in mbstring extension - use nls && epatch "${WORKDIR}/${PV}/php${PV}-mbstring-header_inj.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${WORKDIR}/${PV}/php${PV}-gd-safe_mode.patch" - fi - - # patch open_basedir directory bypass, bug #102943 - epatch "${WORKDIR}/${PV}/php${PV}-fopen_wrappers.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${WORKDIR}/${PV}/php${PV}-globals_overwrite.patch" - - # patch phpinfo() XSS vulnerability, bug #111015 - epatch "${WORKDIR}/${PV}/php${PV}-phpinfo_xss.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${WORKDIR}/${PV}/php${PV}-apache2sapi.patch" - - # patch to fix some issues in the apache SAPI - epatch "${WORKDIR}/${PV}/php${PV}-apachesapi.patch" - - # patch to fix PCRE library security issues, bug #102373 - epatch "${WORKDIR}/${PV}/php${PV}-pcre-security.patch" - - # sobstitute the bundled PCRE library with a fixed version for bug #102373 + # Substitute the bundled PCRE library with a fixed version for bug #102373 einfo "Updating bundled PCRE library" - rm -rf "${S}/ext/pcre/pcrelib" && mv -f "${WORKDIR}/pcrelib-new" "${S}/ext/pcre/pcrelib" || die "Unable to update the bundled PCRE library" + rm -Rf "${S}/ext/pcre/pcrelib" && mv -f "${WORKDIR}/pcrelib-new" "${S}/ext/pcre/pcrelib" || die "Unable to update the bundled PCRE library" # we call the eclass src_unpack, but don't want ${A} to be unpacked again PHP_PACKAGE=0 @@ -133,7 +100,6 @@ src_unpack() { } php_determine_sapis() { - # holds the list of sapis that we want to build PHPSAPIS= @@ -147,16 +113,15 @@ php_determine_sapis() { # 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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" fi fi } src_compile() { - if useq fastbuild ; then + if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then src_compile_fastbuild else src_compile_normal @@ -221,6 +186,7 @@ src_compile_fastbuild() { 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" @@ -234,6 +200,7 @@ src_compile_fastbuild() { 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_apache} = 1 ]] ; then einfo einfo "Building apache${USE_APACHE2} SAPI" @@ -254,12 +221,12 @@ src_compile_normal() { CLEAN_REQUIRED=0 for x in ${PHPSAPIS} ; do - if [ "${CLEAN_REQUIRED}" = 1 ]; then + if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then make clean - # echo > /dev/null fi PHPSAPI=${x} + case ${x} in cli) my_conf="--enable-cli --disable-cgi" @@ -267,14 +234,14 @@ src_compile_normal() { cp sapi/cli/php php-cli ;; cgi) - my_conf="${orig_conf} --disable-cli --enable-cgi --enable-fastcgi" + my_conf="--disable-cli --enable-cgi --enable-fastcgi" enable_extension_enable "discard-path" "discard-path" 0 enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 php4_4-sapi_src_compile cp sapi/cgi/php php-cgi ;; apache*) - my_conf="${orig_conf} --disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" php4_4-sapi_src_compile ;; esac @@ -313,24 +280,22 @@ src_install() { apache*) einfo "Installing apache${USE_APACHE2} SAPI" make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing Apache2 config for PHP (70_mod_php.conf)" + if [[ -n "${USE_APACHE2}" ]] ; then + einfo "Installing Apache2 config file for PHP4 (70_mod_php.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/4-any/apache-2.0/70_mod_php.conf" + newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf" else - einfo "Installing Apache config for PHP (70_mod_php.conf)" + einfo "Installing Apache config file for PHP4 (70_mod_php.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/4-any/apache-1.3/70_mod_php.conf" + newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf" fi php4_4-sapi_install_ini ;; esac done - } -pkg_postinst() -{ +pkg_postinst() { # Output some general info to the user if useq apache || useq apache2 ; then APACHE1_MOD_DEFINE="PHP4" diff --git a/dev-lang/php/php-4.4.1-r3.ebuild b/dev-lang/php/php-4.4.1-r3.ebuild index 20b02baf41b5..bc42bcf5bb8d 100644 --- a/dev-lang/php/php-4.4.1-r3.ebuild +++ b/dev-lang/php/php-4.4.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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-r3.ebuild,v 1.10 2006/01/26 20:23:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r3.ebuild,v 1.11 2006/03/12 13:25:34 chtekk Exp $ IUSE="cgi cli discard-path force-cgi-redirect" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" @@ -8,39 +8,42 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" # 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 -# -# This will be sorted out when GLEP 37 is implemented - PROVIDE="virtual/php virtual/httpd-php" # php package settings SLOT="4" -MY_PHP_P="php-${PV}" +MY_PHP_PV="${PV}" +MY_PHP_P="php-${MY_PHP_PV}" PHP_PACKAGE=1 # php patch settings -HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.8-gentoo.patch.gz" -LIB64_PATCH="${PV}/php${PV}-multilib-search-path.patch" +PHP_PATCHSET_REV="2" +HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-gentoo.patch.gz" +MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch" +FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch" -inherit eutils php4_4-sapi apache-module +inherit php4_4-sapi apache-module want_apache -DESCRIPTION="The PHP language runtime engine" +DESCRIPTION="The PHP language runtime engine." DEPEND="${DEPEND} app-admin/php-toolkit" RDEPEND="${RDEPEND} app-admin/php-toolkit" # PHP patchsets -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${PV}-r1.tar.bz2" +SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2" + +# Hardened-PHP patch +[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )" pkg_setup() { # make sure the user has specified a SAPI einfo "Determining SAPI(s) to build" confutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2 - if useq apache || useq apache2 ; then - if [ "${APACHE_VERSION}" != "0" ] ; then + if useq apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; then if ! useq threads ; then APACHE2_SAFE_MPMS="peruser prefork" else @@ -74,44 +77,7 @@ pkg_setup() { php4_4-sapi_pkg_setup } -src_unpack() { - # custom src_unpack, used only for PHP ebuilds that need additional patches - # normally the eclass src_unpack is used - if [ "${PHP_PACKAGE}" == 1 ] ; then - unpack ${A} - fi - - cd "${S}" - - # fix PHP branding - sed -e 's|^EXTRA_VERSION=""|EXTRA_VERSION="-pl3-gentoo"|g' -i configure.in - - # fix open_basedir bypass in CURL extension - use curl && epatch "${WORKDIR}/${PV}/php${PV}-curl-open_basedir.patch" - - # fix header injection in mbstring extension - use nls && epatch "${WORKDIR}/${PV}/php${PV}-mbstring-header_inj.patch" - - # fix safe_mode bypass in GD extension - if use gd || use gd-external ; then - epatch "${WORKDIR}/${PV}/php${PV}-gd-safe_mode.patch" - fi - - # patch crash with mod_rewrite mentioned in bug #111032 and other Apache2 - # SAPI bugs fixed by upstream - epatch "${WORKDIR}/${PV}/php${PV}-apache2sapi.patch" - - # fix for http://bugs.php.net/bug.php?id=35067 - epatch "${WORKDIR}/${PV}/php${PV}-current_key_by_reference.patch" - - # we call the eclass src_unpack, but don't want ${A} to be unpacked again - PHP_PACKAGE=0 - php4_4-sapi_src_unpack - PHP_PACKAGE=1 -} - php_determine_sapis() { - # holds the list of sapis that we want to build PHPSAPIS= @@ -125,16 +91,15 @@ php_determine_sapis() { # 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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" fi fi } src_compile() { - if useq fastbuild ; then + if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then src_compile_fastbuild else src_compile_normal @@ -199,6 +164,7 @@ src_compile_fastbuild() { 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" @@ -212,6 +178,7 @@ src_compile_fastbuild() { 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_apache} = 1 ]] ; then einfo einfo "Building apache${USE_APACHE2} SAPI" @@ -232,12 +199,12 @@ src_compile_normal() { CLEAN_REQUIRED=0 for x in ${PHPSAPIS} ; do - if [ "${CLEAN_REQUIRED}" = 1 ]; then + if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then make clean - # echo > /dev/null fi PHPSAPI=${x} + case ${x} in cli) my_conf="--enable-cli --disable-cgi" @@ -245,14 +212,14 @@ src_compile_normal() { cp sapi/cli/php php-cli ;; cgi) - my_conf="${orig_conf} --disable-cli --enable-cgi --enable-fastcgi" + my_conf="--disable-cli --enable-cgi --enable-fastcgi" enable_extension_enable "discard-path" "discard-path" 0 enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 php4_4-sapi_src_compile cp sapi/cgi/php php-cgi ;; apache*) - my_conf="${orig_conf} --disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" php4_4-sapi_src_compile ;; esac @@ -291,24 +258,22 @@ src_install() { apache*) einfo "Installing apache${USE_APACHE2} SAPI" make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing Apache2 config for PHP (70_mod_php.conf)" + if [[ -n "${USE_APACHE2}" ]] ; then + einfo "Installing Apache2 config file for PHP4 (70_mod_php.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/4-any/apache-2.0/70_mod_php.conf" + newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf" else - einfo "Installing Apache config for PHP (70_mod_php.conf)" + einfo "Installing Apache config file for PHP4 (70_mod_php.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/4-any/apache-1.3/70_mod_php.conf" + newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf" fi php4_4-sapi_install_ini ;; esac done - } -pkg_postinst() -{ +pkg_postinst() { # Output some general info to the user if useq apache || useq apache2 ; then APACHE1_MOD_DEFINE="PHP4" diff --git a/dev-lang/php/php-4.4.2.ebuild b/dev-lang/php/php-4.4.2.ebuild new file mode 100644 index 000000000000..ce3c47bc5801 --- /dev/null +++ b/dev-lang/php/php-4.4.2.ebuild @@ -0,0 +1,286 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2.ebuild,v 1.1 2006/03/12 13:25:34 chtekk Exp $ + +IUSE="cgi cli discard-path force-cgi-redirect" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +# 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="4" +MY_PHP_PV="${PV}" +MY_PHP_P="php-${MY_PHP_PV}" +PHP_PACKAGE=1 + +# php patch settings +PHP_PATCHSET_REV="1" +HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-gentoo.patch.gz" +MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch" +FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch" + +inherit php4_4-sapi apache-module + +want_apache + +DESCRIPTION="The PHP language runtime engine." + +DEPEND="${DEPEND} app-admin/php-toolkit" +RDEPEND="${RDEPEND} app-admin/php-toolkit" + +# PHP patchsets +SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2" + +# Hardened-PHP patch +[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )" + +pkg_setup() { + # make sure the user has specified a SAPI + einfo "Determining SAPI(s) to build" + confutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2 + + if useq apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; then + if ! useq threads ; then + APACHE2_SAFE_MPMS="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 + + if useq fastbuild ; then + ewarn + ewarn "'fastbuild' attempts to build all SAPIs in a single pass." + ewarn "This is an experimental feature, which may fail to compile" + ewarn "and may produce PHP binaries which are broken." + ewarn + ewarn "Rebuild without 'fastbuild' and reproduce any bugs before filing" + ewarn "any bugs in Gentoo's Bugzilla or bugs.php.net." + ewarn + fi + + php4_4-sapi_pkg_setup +} + +php_determine_sapis() { + # holds the list of sapis that we want to build + PHPSAPIS= + + if useq 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_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_apache=0 + + for x in ${PHPSAPIS} ; do + case ${x} in + cli) + build_cli=1 + ;; + cgi) + build_cgi=1 + ;; + apache*) + build_apache=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" + enable_extension_enable "discard-path" "discard-path" 0 + enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 + else + my_conf="${my_conf} --disable-cgi" + fi + + if [[ ${build_apache} = 1 ]] ; then + my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + fi + + # now we know what we are building, build it + php4_4-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-php4"|g;' -i main/build-defs.h + sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php4/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-php4"|g;' -i main/build-defs.h + sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php4/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_apache} = 1 ]] ; then + einfo + einfo "Building apache${USE_APACHE2} SAPI" + einfo + + sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php4\"|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}-php4/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 build mod_php" + fi +} + +src_compile_normal() { + php_determine_sapis + + CLEAN_REQUIRED=0 + + for x in ${PHPSAPIS} ; do + if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then + make clean + fi + + PHPSAPI=${x} + + case ${x} in + cli) + my_conf="--enable-cli --disable-cgi" + php4_4-sapi_src_compile + cp sapi/cli/php php-cli + ;; + cgi) + my_conf="--disable-cli --enable-cgi --enable-fastcgi" + enable_extension_enable "discard-path" "discard-path" 0 + enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 + php4_4-sapi_src_compile + cp sapi/cgi/php php-cgi + ;; + apache*) + my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + php4_4-sapi_src_compile + ;; + esac + + CLEAN_REQUIRED=1 + done +} + +src_install() { + php_determine_sapis + + destdir=/usr/$(get_libdir)/php4 + + # let the eclass do the heavy lifting + php4_4-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" + php4_4-sapi_install_ini + ;; + cgi) + einfo "Installing CGI SAPI" + into ${destdir} + dobin php-cgi || die "Unable to install ${x} sapi" + php4_4-sapi_install_ini + ;; + apache*) + einfo "Installing apache${USE_APACHE2} SAPI" + make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" + if [[ -n "${USE_APACHE2}" ]] ; then + einfo "Installing Apache2 config file for PHP4 (70_mod_php.conf)" + insinto ${APACHE_MODULES_CONFDIR} + newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf" + else + einfo "Installing Apache config file for PHP4 (70_mod_php.conf)" + insinto ${APACHE_MODULES_CONFDIR} + newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf" + fi + php4_4-sapi_install_ini + ;; + esac + done +} + +pkg_postinst() { + # Output some general info to the user + if useq apache || useq apache2 ; then + APACHE1_MOD_DEFINE="PHP4" + APACHE1_MOD_CONF="70_mod_php" + APACHE2_MOD_DEFINE="PHP4" + APACHE2_MOD_CONF="70_mod_php" + apache-module_pkg_postinst + fi + php4_4-sapi_pkg_postinst +} diff --git a/dev-lang/php/php-5.0.5-r5.ebuild b/dev-lang/php/php-5.0.5-r5.ebuild index 6825a5772111..d625eb6f96f0 100644 --- a/dev-lang/php/php-5.0.5-r5.ebuild +++ b/dev-lang/php/php-5.0.5-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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-r5.ebuild,v 1.11 2006/02/24 23:46:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r5.ebuild,v 1.12 2006/03/12 13:25:34 chtekk Exp $ IUSE="cgi cli discard-path force-cgi-redirect" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" @@ -8,39 +8,41 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" # 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 -# -# This will be sorted out when GLEP 37 is implemented - PROVIDE="virtual/php virtual/httpd-php" # php package settings SLOT="5" -MY_PHP_P="php-${PV}" +MY_PHP_PV="${PV}" +MY_PHP_P="php-${MY_PHP_PV}" PHP_PACKAGE=1 # php patch settings -HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.8-gentoo.patch.gz" -LIB64_PATCH="${PV}/php${PV}-multilib-search-path.patch" +PHP_PATCHSET_REV="2" +HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-gentoo.patch.gz" +MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch" -inherit eutils php5_0-sapi apache-module +inherit php5_0-sapi apache-module want_apache -DESCRIPTION="The PHP language runtime engine" +DESCRIPTION="The PHP language runtime engine." DEPEND="${DEPEND} app-admin/php-toolkit" RDEPEND="${RDEPEND} app-admin/php-toolkit" # PHP patchsets -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${PV}-r1.tar.bz2" +SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2" + +# Hardened-PHP patch +[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )" pkg_setup() { # make sure the user has specified a SAPI einfo "Determining SAPI(s) to build" confutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2 - if useq apache || useq apache2 ; then - if [ "${APACHE_VERSION}" != "0" ] ; then + if useq apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; then if ! useq threads ; then APACHE2_SAFE_MPMS="peruser prefork" else @@ -63,56 +65,7 @@ pkg_setup() { php5_0-sapi_pkg_setup } -src_unpack() { - # custom src_unpack, used only for PHP ebuilds that need additional patches - # normally the eclass src_unpack is used - if [ "${PHP_PACKAGE}" == 1 ] ; then - unpack ${A} - fi - - cd "${S}" - - # fix PHP branding - sed -e 's|^EXTRA_VERSION=""|EXTRA_VERSION="-pl5-gentoo"|g' -i configure.in - - # patch to fix pspell extension, bug #99312 (new patch by upstream) - use spell && epatch "${WORKDIR}/${PV}/php${PV}-pspell-ext-segf.patch" - - # patch fo fix safe_mode bypass in CURL extension, bug #111032 - use curl && epatch "${WORKDIR}/${PV}/php${PV}-curl-open_basedir.patch" - - # fix header injection in mbstring extension - use nls && epatch "${WORKDIR}/${PV}/php${PV}-mbstring-header_inj.patch" - - # patch to fix safe_mode bypass in GD extension, bug #109669 - if use gd || use gd-external ; then - epatch "${WORKDIR}/${PV}/php${PV}-gd-safe_mode.patch" - fi - - # patch open_basedir directory bypass, bug #102943 - epatch "${WORKDIR}/${PV}/php${PV}-fopen_wrappers.patch" - - # patch $GLOBALS overwrite vulnerability, bug #111011 and bug #111014 - epatch "${WORKDIR}/${PV}/php${PV}-globals_overwrite.patch" - - # patch to fix session.save_path segfault and other issues in - # the apache2handler SAPI, bug #107602 - epatch "${WORKDIR}/${PV}/php${PV}-apache2sapi.patch" - - # patch to fix a GCC4 compile problem, bug #111261 - epatch "${WORKDIR}/${PV}/php${PV}-tsrm-gcc4.patch" - - # fix a object serialization bug, bug #105374 - epatch "${WORKDIR}/${PV}/php${PV}-obj-serialize.patch" - - # we call the eclass src_unpack, but don't want ${A} to be unpacked again - PHP_PACKAGE=0 - php5_0-sapi_src_unpack - PHP_PACKAGE=1 -} - php_determine_sapis() { - # holds the list of sapis that we want to build PHPSAPIS= @@ -126,9 +79,8 @@ php_determine_sapis() { # 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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" fi fi @@ -140,12 +92,12 @@ src_compile() { CLEAN_REQUIRED=0 for x in ${PHPSAPIS} ; do - if [ "${CLEAN_REQUIRED}" = 1 ]; then + if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then make clean - # echo > /dev/null fi PHPSAPI=${x} + case ${x} in cli) my_conf="--enable-cli --disable-cgi" @@ -153,14 +105,14 @@ src_compile() { cp sapi/cli/php php-cli ;; cgi) - my_conf="${orig_conf} --disable-cli --enable-cgi --enable-fastcgi" + my_conf="--disable-cli --enable-cgi --enable-fastcgi" enable_extension_enable "discard-path" "discard-path" 0 enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 php5_0-sapi_src_compile cp sapi/cgi/php php-cgi ;; apache*) - my_conf="${orig_conf} --disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" php5_0-sapi_src_compile ;; esac @@ -199,14 +151,14 @@ src_install() { apache*) einfo "Installing apache${USE_APACHE2} SAPI" make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing Apache2 config for PHP5 (70_mod_php5.conf)" + if [[ -n "${USE_APACHE2}" ]] ; then + einfo "Installing Apache2 config file for PHP5 (70_mod_php5.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.0-any/apache-2.0/70_mod_php5.conf" + newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf" else - einfo "Installing Apache config for PHP5 (70_mod_php5.conf)" + einfo "Installing Apache config file for PHP5 (70_mod_php5.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.0-any/apache-1.3/70_mod_php5.conf" + newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf" fi php5_0-sapi_install_ini ;; @@ -214,8 +166,7 @@ src_install() { done } -pkg_postinst() -{ +pkg_postinst() { # Output some general info to the user if useq apache || useq apache2 ; then APACHE1_MOD_DEFINE="PHP5" diff --git a/dev-lang/php/php-5.1.1.ebuild b/dev-lang/php/php-5.1.2.ebuild similarity index 78% rename from dev-lang/php/php-5.1.1.ebuild rename to dev-lang/php/php-5.1.2.ebuild index 5c5d9be14d20..acb7776eb991 100644 --- a/dev-lang/php/php-5.1.1.ebuild +++ b/dev-lang/php/php-5.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.1.ebuild,v 1.5 2006/01/26 13:40:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.2.ebuild,v 1.1 2006/03/12 13:25:34 chtekk Exp $ IUSE="cgi cli discard-path force-cgi-redirect" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" @@ -8,39 +8,42 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" # 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 -# -# This will be sorted out when GLEP 37 is implemented - PROVIDE="virtual/php virtual/httpd-php" # php package settings SLOT="5" -MY_PHP_P="php-${PV}" +MY_PHP_PV="${PV}" +MY_PHP_P="php-${MY_PHP_PV}" PHP_PACKAGE=1 # php patch settings -HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.8-gentoo.patch.gz" -LIB64_PATCH="${PV}/php${PV}-multilib-search-path.patch" +PHP_PATCHSET_REV="1" +HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-gentoo.patch.gz" +MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch" +FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch" -inherit eutils php5_1-sapi apache-module +inherit php5_1-sapi apache-module want_apache -DESCRIPTION="The PHP language runtime engine" +DESCRIPTION="The PHP language runtime engine." DEPEND="${DEPEND} app-admin/php-toolkit" RDEPEND="${RDEPEND} app-admin/php-toolkit" # PHP patchsets -SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${PV}-r1.tar.bz2" +SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2" + +# Hardened-PHP patch +[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )" pkg_setup() { # make sure the user has specified a SAPI einfo "Determining SAPI(s) to build" confutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2 - if useq apache || useq apache2 ; then - if [ "${APACHE_VERSION}" != "0" ] ; then + if useq apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; then if ! useq threads ; then APACHE2_SAFE_MPMS="peruser prefork" else @@ -74,32 +77,7 @@ pkg_setup() { php5_1-sapi_pkg_setup } -src_unpack() { - # custom src_unpack, used only for PHP ebuilds that need additional patches - # normally the eclass src_unpack is used - if [ "${PHP_PACKAGE}" == 1 ] ; then - unpack ${A} - fi - - cd "${S}" - - # fix PHP branding - sed -e 's|^EXTRA_VERSION=""|EXTRA_VERSION="-gentoo"|g' -i configure.in - - # fix CURL compilation error, bug #117767 - epatch "${WORKDIR}/${PV}/php${PV}-curl-gcry_threads.patch" - - # fix ming error in configure - epatch "${WORKDIR}/${PV}/php${PV}-ming-config.patch" - - # we call the eclass src_unpack, but don't want ${A} to be unpacked again - PHP_PACKAGE=0 - php5_1-sapi_src_unpack - PHP_PACKAGE=1 -} - php_determine_sapis() { - # holds the list of sapis that we want to build PHPSAPIS= @@ -113,16 +91,15 @@ php_determine_sapis() { # 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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" fi fi } src_compile() { - if useq fastbuild ; then + if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then src_compile_fastbuild else src_compile_normal @@ -187,6 +164,7 @@ src_compile_fastbuild() { 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" @@ -200,6 +178,7 @@ src_compile_fastbuild() { 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_apache} = 1 ]] ; then einfo einfo "Building apache${USE_APACHE2} SAPI" @@ -220,12 +199,12 @@ src_compile_normal() { CLEAN_REQUIRED=0 for x in ${PHPSAPIS} ; do - if [ "${CLEAN_REQUIRED}" = 1 ]; then + if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then make clean - # echo > /dev/null fi PHPSAPI=${x} + case ${x} in cli) my_conf="--enable-cli --disable-cgi" @@ -233,14 +212,14 @@ src_compile_normal() { cp sapi/cli/php php-cli ;; cgi) - my_conf="${orig_conf} --disable-cli --enable-cgi --enable-fastcgi" + my_conf="--disable-cli --enable-cgi --enable-fastcgi" enable_extension_enable "discard-path" "discard-path" 0 enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 php5_1-sapi_src_compile cp sapi/cgi/php php-cgi ;; apache*) - my_conf="${orig_conf} --disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" php5_1-sapi_src_compile ;; esac @@ -279,14 +258,14 @@ src_install() { apache*) einfo "Installing apache${USE_APACHE2} SAPI" make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing Apache2 config for PHP5 (70_mod_php5.conf)" + if [[ -n "${USE_APACHE2}" ]] ; then + einfo "Installing Apache2 config file for PHP5 (70_mod_php5.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.1-any/apache-2.0/70_mod_php5.conf" + newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf" else - einfo "Installing Apache config for PHP5 (70_mod_php5.conf)" + einfo "Installing Apache config file for PHP5 (70_mod_php5.conf)" insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.1-any/apache-1.3/70_mod_php5.conf" + newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf" fi php5_1-sapi_install_ini ;; @@ -294,8 +273,7 @@ src_install() { done } -pkg_postinst() -{ +pkg_postinst() { # Output some general info to the user if useq apache || useq apache2 ; then APACHE1_MOD_DEFINE="PHP5" -- 2.26.2