| 1 |
mabi 10/10/17 19:23:35 |
| 2 |
|
| 3 |
Modified: src_install-v1.eblit src_install-v2.eblit |
| 4 |
Log: |
| 5 |
change allow_url_fopen back to Off (bug #332763) |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 dev-lang/php/files/eblits/src_install-v1.eblit |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: src_install-v1.eblit |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- src_install-v1.eblit 11 Aug 2010 19:13:32 -0000 1.10 |
| 22 |
+++ src_install-v1.eblit 17 Oct 2010 19:23:35 -0000 1.11 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
eblit-php-src_install() { |
| 30 |
# see bug #324739 for what happens when we don't have that |
| 31 |
@@ -92,6 +92,9 @@ |
| 32 |
local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" |
| 33 |
cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" |
| 34 |
|
| 35 |
+ # default to allow_url_open=Off, bug 332763 |
| 36 |
+ sed -e 's|^allow_url_fopen .*|allow_url_open = Off|g' -i "${phpinisrc}" |
| 37 |
+ |
| 38 |
# default to expose_php=Off, bug 300695 |
| 39 |
sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.4 dev-lang/php/files/eblits/src_install-v2.eblit |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.4&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.4&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.3&r2=1.4 |
| 49 |
|
| 50 |
Index: src_install-v2.eblit |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v |
| 53 |
retrieving revision 1.3 |
| 54 |
retrieving revision 1.4 |
| 55 |
diff -u -r1.3 -r1.4 |
| 56 |
--- src_install-v2.eblit 8 Oct 2010 18:25:10 -0000 1.3 |
| 57 |
+++ src_install-v2.eblit 17 Oct 2010 19:23:35 -0000 1.4 |
| 58 |
@@ -1,6 +1,6 @@ |
| 59 |
# Copyright 1999-2010 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
-# $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 $ |
| 62 |
+# $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 $ |
| 63 |
|
| 64 |
eblit-php-src_install() { |
| 65 |
# see bug #324739 for what happens when we don't have that |
| 66 |
@@ -94,6 +94,9 @@ |
| 67 |
local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" |
| 68 |
cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" |
| 69 |
|
| 70 |
+ # default to allow_url_open=Off, bug 332763 |
| 71 |
+ sed -e 's|^allow_url_fopen .*|allow_url_open = Off|g' -i "${phpinisrc}" |
| 72 |
+ |
| 73 |
# default to expose_php=Off, bug 300695 |
| 74 |
sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" |
| 75 |
|
| 76 |
@@ -127,7 +130,7 @@ |
| 77 |
|
| 78 |
# SAPI-specific handling |
| 79 |
if [[ "${sapi}" == "apache2" ]] ; then |
| 80 |
- einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf" |
| 81 |
+ einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf (${PHP_DESTDIR})" |
| 82 |
insinto ${PHP_DESTDIR}/apache2 |
| 83 |
newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ |
| 84 |
"70_mod_php${PHP_MV}.conf" |
Archives