diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2010-10-17 19:23:35 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2010-10-17 19:23:35 +0000 |
| commit | 5dbbfd198da15ab4f22a60890863ade39cc9594d (patch) | |
| tree | 1271a9b72f8dd1e254df31350bf7caaf6baf10fc | |
| parent | Add Enrico Tagliavini as maintainer (diff) | |
| download | gentoo-2-5dbbfd198da15ab4f22a60890863ade39cc9594d.tar.gz gentoo-2-5dbbfd198da15ab4f22a60890863ade39cc9594d.tar.bz2 gentoo-2-5dbbfd198da15ab4f22a60890863ade39cc9594d.zip | |
change allow_url_fopen back to Off (bug #332763)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/src_install-v1.eblit | 5 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/src_install-v2.eblit | 7 |
3 files changed, 14 insertions, 4 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 6a6d61aaf1e1..bbf5f84b544b 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.420 2010/10/14 15:11:51 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.421 2010/10/17 19:23:35 mabi Exp $ + + 17 Oct 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v1.eblit, files/eblits/src_install-v2.eblit: + change allow_url_fopen back to Off (bug #332763) 14 Oct 2010; Christian Faulhammer <fauli@gentoo.org> php-5.3.3-r1.ebuild: x86 stable, bug 336869 diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit index 536042dd21d7..b7fb0b5ad14f 100644 --- a/dev-lang/php/files/eblits/src_install-v1.eblit +++ b/dev-lang/php/files/eblits/src_install-v1.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.10 2010/08/11 19:13:32 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.11 2010/10/17 19:23:35 mabi Exp $ eblit-php-src_install() { # see bug #324739 for what happens when we don't have that @@ -92,6 +92,9 @@ php_install_ini() { local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + # default to allow_url_open=Off, bug 332763 + sed -e 's|^allow_url_fopen .*|allow_url_open = Off|g' -i "${phpinisrc}" + # default to expose_php=Off, bug 300695 sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" diff --git a/dev-lang/php/files/eblits/src_install-v2.eblit b/dev-lang/php/files/eblits/src_install-v2.eblit index 84c624c0d1b0..4e4ff2b10c88 100644 --- a/dev-lang/php/files/eblits/src_install-v2.eblit +++ b/dev-lang/php/files/eblits/src_install-v2.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.3 2010/10/08 18:25:10 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.4 2010/10/17 19:23:35 mabi Exp $ eblit-php-src_install() { # see bug #324739 for what happens when we don't have that @@ -94,6 +94,9 @@ php_install_ini() { local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + # default to allow_url_open=Off, bug 332763 + sed -e 's|^allow_url_fopen .*|allow_url_open = Off|g' -i "${phpinisrc}" + # default to expose_php=Off, bug 300695 sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" @@ -127,7 +130,7 @@ php_install_ini() { # SAPI-specific handling if [[ "${sapi}" == "apache2" ]] ; then - einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf" + einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf (${PHP_DESTDIR})" insinto ${PHP_DESTDIR}/apache2 newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ "70_mod_php${PHP_MV}.conf" |