diff options
| -rw-r--r-- | dev-lang/php/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/php/Manifest | 16 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.11-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.11.ebuild | 7 |
4 files changed, 28 insertions, 10 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index e85d55958a34..b5ea07ec2936 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/php # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.358 2009/11/21 19:53:36 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.359 2009/12/16 21:53:55 hoffie Exp $ + + 16 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> php-5.2.11.ebuild, + php-5.2.11-r1.ebuild: + trying to fix the circular dependency we are seeing with suhosin since + 5.2.11 (where I added a version dependency without much thinking), bug + 295871, thanks to Oleg Gawriloff <barzog@telecom.by> 21 Nov 2009; nixnut <nixnut@gentoo.org> php-5.2.11-r1.ebuild: ppc stable #292132 diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index d2a192e1c4df..650474c4a253 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 AUX 70_mod_php5.conf-apache2 490 RMD160 745bdb5db622577f473703d5ee8dc7f3c66f8f0c SHA1 7daf9c9ec2e6d108f850981853f9f4f599be0b71 SHA256 5667d06cb7a18c30d11decd28d55b87e36287c76c4d3a450b1cb37271e7fdcd1 @@ -21,8 +24,15 @@ DIST suhosin-patch-5.2.9-0.9.7.patch.gz 23026 RMD160 1d2e01a935c4bbc9e858796f8f6 EBUILD php-5.2.10-r1.ebuild 16748 RMD160 e0b0798218cf89540133a51ad69a8f90a7fcd875 SHA1 29346dca57478197bdd5241c97ffc672a837da9d SHA256 b5e86d4d7b967649b0f59dad6c1b2bb41184d70a01539f7dab2384ed6f0603c4 EBUILD php-5.2.10-r2.ebuild 16837 RMD160 870d5cd011ae9ff2a3e9482b0c70995fb9ab6026 SHA1 5a568341061cdef5a9666c1dc12bcaf3b07c019e SHA256 db7c3e4a0d0c4ffafbb4c912ef001e386d6edc016b5a7b160a01ada4ff4a2569 EBUILD php-5.2.10.ebuild 16728 RMD160 521189c16994cbacfe19b0ace61b575febe44127 SHA1 68ec6a195e90567a16e8907f0b7ffc1b600ec786 SHA256 de179a373f19a95d698b32cadaa844a911182ffdcc82d6fc5eb549f196fef55f -EBUILD php-5.2.11-r1.ebuild 16952 RMD160 ffd723f1a0e3add18f529b4f197ba4a8f7ccbf07 SHA1 a08935e48043862710e9fbee554de677756ffe66 SHA256 d69f3149784fe8a81236db8cbcbb6454ee47d48ea79798f0e2162a6837d7abca -EBUILD php-5.2.11.ebuild 16789 RMD160 5574011183da002d3286596defacfab4afdd5f0c SHA1 88349a763ad89a9af6bec83725c8905dcfa65769 SHA256 2d790dcb8181e1b300266d5b36df2e0ddf7f785872886ca93a33bae3792f5302 +EBUILD php-5.2.11-r1.ebuild 16962 RMD160 1401521a6fa13024dfe3fedaa6a1f00756314dcb SHA1 4aad9dd4c5565f4d9afc467172d7525052ebf73c SHA256 809b1e77b5b97e9ea0fcd635124985672c7cadaa11221526efd02cf34e9b13eb +EBUILD php-5.2.11.ebuild 16798 RMD160 f067608a3effcab83f3c7d446759acc3dc770c97 SHA1 b0c70702deed26aa3e9b48e9c29626ba0b460059 SHA256 fcd2fb41fd3b66a2b21813072b8509ce9549bdfe1cef421cd377ad1ac4758ac5 EBUILD php-5.2.9-r2.ebuild 16731 RMD160 faf16639679e3391fdce77f60d95a26f6f960899 SHA1 725b035a6b399e62b7011522eebea9404957d220 SHA256 604d9d60c171ef9518b6f2136db42848220c12e0eef88f2745671ce4843d9148 -MISC ChangeLog 62147 RMD160 5eba2afa58d3de85e577aa06c02c2a68fcab52cf SHA1 8a3b36d7214f1f5425d5c156fd921f245dfb72b1 SHA256 fce0ececbdb3116402ed38b911209a605ed01e8c1e8b09cbde38ccc1aba2fb73 +MISC ChangeLog 62446 RMD160 06b69a3f590239b1e4a230c641066997b0af75d3 SHA1 c1ee0dcc3440cbf8314552c6f65d6c3828fb6c40 SHA256 6253fb73a17ea271b4a831c46d124680569e33f437a9bf0152b042b8e7da9ceb MISC metadata.xml 1494 RMD160 c8579965284d7e60e3bf12600eea425175e6c480 SHA1 24c24ff7bb2efb47c02f604f0896c99da87ffe67 SHA256 6a5df2911eff7c828d9da402914c08554b8c8752b0545a74af9ba6f8fa8f59a9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAkspVvkACgkQSamB34AN3N7ZxQCgwobZdzxj4K550sBoU3A0yc97 +r0MAn1dXUGzdhtdgkge8QJb2+kwgC4Dx +=6nOd +-----END PGP SIGNATURE----- diff --git a/dev-lang/php/php-5.2.11-r1.ebuild b/dev-lang/php/php-5.2.11-r1.ebuild index 04e12924f743..fe9403279b7c 100644 --- a/dev-lang/php/php-5.2.11-r1.ebuild +++ b/dev-lang/php/php-5.2.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11-r1.ebuild,v 1.7 2009/11/21 19:53:36 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11-r1.ebuild,v 1.8 2009/12/16 21:53:55 hoffie Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -42,8 +42,7 @@ DEPEND="app-admin/php-toolkit imap? ( >=virtual/imap-c-client-2006k ) pcre? ( >=dev-libs/libpcre-7.8 ) xml? ( >=dev-libs/libxml2-2.7.2-r2 ) - xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv ) - suhosin? ( >=dev-php5/suhosin-0.9.29 )" + xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )" RDEPEND="${DEPEND}" if [[ -n "${KOLAB_PATCH}" ]] ; then @@ -52,6 +51,8 @@ if [[ -n "${KOLAB_PATCH}" ]] ; then kolab? ( >=net-libs/c-client-2004g-r1 )" fi +PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )" + want_apache pkg_setup() { diff --git a/dev-lang/php/php-5.2.11.ebuild b/dev-lang/php/php-5.2.11.ebuild index 1ab0faa03966..eca80ea9efe1 100644 --- a/dev-lang/php/php-5.2.11.ebuild +++ b/dev-lang/php/php-5.2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11.ebuild,v 1.8 2009/10/19 09:12:38 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11.ebuild,v 1.9 2009/12/16 21:53:55 hoffie Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -42,8 +42,7 @@ DEPEND="app-admin/php-toolkit imap? ( >=virtual/imap-c-client-2006k ) pcre? ( >=dev-libs/libpcre-7.8 ) xml? ( >=dev-libs/libxml2-2.7.2-r2 ) - xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv ) - suhosin? ( >=dev-php5/suhosin-0.9.29 )" + xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )" RDEPEND="${DEPEND}" if [[ -n "${KOLAB_PATCH}" ]] ; then @@ -52,6 +51,8 @@ if [[ -n "${KOLAB_PATCH}" ]] ; then kolab? ( >=net-libs/c-client-2004g-r1 )" fi +PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )" + want_apache pkg_setup() { |