diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2004-03-29 10:42:30 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-03-29 10:42:30 +0000 |
commit | 18a859ab0c3a7b9c11092e5a371119aa430995e6 (patch) | |
tree | d27aead043f41a3e72e4c8c94cccf6e210feb8fd | |
parent | dep for a dep of bricolage, bug 21549 (diff) | |
download | historical-18a859ab0c3a7b9c11092e5a371119aa430995e6.tar.gz historical-18a859ab0c3a7b9c11092e5a371119aa430995e6.tar.bz2 historical-18a859ab0c3a7b9c11092e5a371119aa430995e6.zip |
fix bug #46048 for new php
-rw-r--r-- | dev-php/mod_php/ChangeLog | 5 | ||||
-rw-r--r-- | dev-php/mod_php/Manifest | 42 | ||||
-rw-r--r-- | dev-php/mod_php/mod_php-4.3.5.ebuild | 12 |
3 files changed, 34 insertions, 25 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 0d6d4058a8da..0f3d33d1c410 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.130 2004/03/29 00:05:16 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.131 2004/03/29 10:42:30 robbat2 Exp $ + + 29 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.5.ebuild: + fix bug #46048 for new php *mod_php-4.3.5 (29 Mar 2004) diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 28361b5758f4..7bc878b06968 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,27 +1,29 @@ -MD5 233ba34538a697386c6bb4d278cb9c0f mod_php-4.3.2.ebuild 3392 -MD5 193bde86baf386fbd519ee563ceca3f9 mod_php-4.3.3-r2.ebuild 4970 -MD5 475406c417d82d6dc0ea6e13afdf7910 mod_php-4.3.2-r5.ebuild 5109 -MD5 89b5aedbcfd87dc711a40caf7d42bdbb mod_php-4.3.4-r1.ebuild 5050 -MD5 d601c3fbb04d9ee67d7590d457a86885 mod_php-4.3.3_rc3.ebuild 5133 -MD5 9b2b6c5f70a67d3817491427754b2a4e mod_php-4.3.4.ebuild 4972 -MD5 28148a26446e58d9d8fb427fe2f2c936 mod_php-4.3.2-r2.ebuild 3696 -MD5 969102dd924e951bfa31e5a11215b8ea mod_php-4.3.4-r3.ebuild 5392 -MD5 412048e603d43d7fad459f2dc44ffe7d mod_php-4.3.3-r1.ebuild 4929 -MD5 c786ba6c1893384cab60c3c8c44321b8 mod_php-4.3.2-r4.ebuild 4978 -MD5 1d82562876ca9bdbcafaa426655c310a mod_php-4.3.3.ebuild 4898 -MD5 e8f6da390213b16ffdcdc4d374855719 mod_php-4.3.3-r3.ebuild 4977 -MD5 88dbd3f2adfe7f1c09fbee26bb20e5c7 mod_php-4.3.2-r1.ebuild 2759 -MD5 5907cb67785251cb124a26dfabe43f2f mod_php-4.3.4-r2.ebuild 5214 -MD5 ef1c0baf80506b6acbee73ec379adebe ChangeLog 26079 +MD5 bb5bcb20797a62e9fa0c1594668ffa0f mod_php-4.3.2.ebuild 3391 +MD5 a10cd5a0bba7a21bbb976f8e5d1dabd6 mod_php-4.3.3-r2.ebuild 4969 +MD5 4db7c44789a2ff27f5cae90f261bec21 mod_php-4.3.2-r5.ebuild 5108 +MD5 303960fe21c175ad22a7bfbe260aa3de mod_php-4.3.4-r1.ebuild 5049 +MD5 1d9cbacb67dfd7f5a162bb1ac2f4d627 mod_php-4.3.3_rc3.ebuild 5132 +MD5 47276f240531f20c7fe0c6ab59fc6f44 mod_php-4.3.4.ebuild 4971 +MD5 0cf0bccd963f65fcaa668e8a7ed38f32 mod_php-4.3.2-r2.ebuild 3695 +MD5 58959db8b43b27f0822409c7e1fd11ab mod_php-4.3.4-r3.ebuild 5391 +MD5 3f227db7cfc8e2579b9bed02e5ce37ad mod_php-4.3.3-r1.ebuild 4928 +MD5 369a7227b255ff46bb95ab0b57c24e93 mod_php-4.3.2-r4.ebuild 4977 +MD5 95608562cae58a1dc240d95229534916 mod_php-4.3.3.ebuild 4897 +MD5 087b691e6d410acef7d8fcc276b2787d mod_php-4.3.3-r3.ebuild 4976 +MD5 2fd282cd47ab587e674870c718ca69ec mod_php-4.3.2-r1.ebuild 2758 +MD5 b5214bf2798cf139bfbcae7ccfe4b729 mod_php-4.3.4-r2.ebuild 5213 +MD5 a10bcf4543c1f7d38ed82ed25bf2ef39 mod_php-4.3.5.ebuild 5686 +MD5 d7e397807f12cff85f80410951adafb2 ChangeLog 26184 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 f72efb54e1262a9401817b6034bfd00c mod_php-4.3.2-r3.ebuild 4939 -MD5 8f98d3d3c91b0024416c8a52afc2641d mod_php-4.3.4-r4.ebuild 5389 -MD5 1830642d4029e3f2eec92cb9a7b7d846 mod_php-4.3.5.ebuild 5422 +MD5 44490ae60ed8ffdddac710ed1ec0b482 mod_php-4.3.2-r3.ebuild 4938 +MD5 1c32f36002ca012447258bae423ed47e mod_php-4.3.4-r4.ebuild 5388 +MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2 137 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3 137 MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-mod_php-4.3.4 208 +MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-mod_php-4.3.5 137 MD5 bc61d89af9d65e3a482d9b2ffea4fcaf files/digest-mod_php-4.3.3_rc3 140 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r1 137 @@ -35,7 +37,5 @@ MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r3 137 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r1 137 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r2 137 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r3 137 -MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r4 137 -MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 -MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-mod_php-4.3.5 137 +MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717 diff --git a/dev-php/mod_php/mod_php-4.3.5.ebuild b/dev-php/mod_php/mod_php-4.3.5.ebuild index f58a0d5b155b..8accb7869ce6 100644 --- a/dev-php/mod_php/mod_php-4.3.5.ebuild +++ b/dev-php/mod_php/mod_php-4.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.5.ebuild,v 1.1 2004/03/29 00:05:16 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.5.ebuild,v 1.2 2004/03/29 10:42:30 robbat2 Exp $ IUSE="${IUSE} apache2" @@ -71,7 +71,13 @@ src_unpack() { fi # bug fix for security problem - bug #39952 - epatch ${FILESDIR}/mod_php-4.3.4-r3.diff + # integrated upstream now + #epatch ${FILESDIR}/mod_php-4.3.4-r3.diff + + # stop php from activing the apache config, as we will do that ourselves + for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4; do + sed -i.orig -e 's,-i -a -n php4,-i -n php4,g' $i + done } src_compile() { @@ -94,7 +100,7 @@ src_compile() { src_install() { PHP_INSTALLTARGETS="install" - php-sapi_src_install + php-sapi_src_install einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}" dodir /etc/apache${USE_APACHE2}/conf/ dodir ${PHPINIDIRECTORY} |