* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v1.eblit src_install-v2.eblit
@ 2010-10-17 19:23 Matti Bickel (mabi)
0 siblings, 0 replies; 2+ messages in thread
From: Matti Bickel (mabi) @ 2010-10-17 19:23 UTC (permalink / raw
To: gentoo-commits
mabi 10/10/17 19:23:35
Modified: src_install-v1.eblit src_install-v2.eblit
Log:
change allow_url_fopen back to Off (bug #332763)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.11 dev-lang/php/files/eblits/src_install-v1.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?rev=1.11&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?r1=1.10&r2=1.11
Index: src_install-v1.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src_install-v1.eblit 11 Aug 2010 19:13:32 -0000 1.10
+++ src_install-v1.eblit 17 Oct 2010 19:23:35 -0000 1.11
@@ -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 @@
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}"
1.4 dev-lang/php/files/eblits/src_install-v2.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.4&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.3&r2=1.4
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src_install-v2.eblit 8 Oct 2010 18:25:10 -0000 1.3
+++ src_install-v2.eblit 17 Oct 2010 19:23:35 -0000 1.4
@@ -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 @@
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 @@
# 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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v1.eblit src_install-v2.eblit
@ 2010-10-27 10:33 Ole Markus With (olemarkus)
0 siblings, 0 replies; 2+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-10-27 10:33 UTC (permalink / raw
To: gentoo-commits
olemarkus 10/10/27 10:33:18
Modified: src_install-v1.eblit src_install-v2.eblit
Log:
Corrected typo in the src_install eblit (#342769)
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.12 dev-lang/php/files/eblits/src_install-v1.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit?r1=1.11&r2=1.12
Index: src_install-v1.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src_install-v1.eblit 17 Oct 2010 19:23:35 -0000 1.11
+++ src_install-v1.eblit 27 Oct 2010 10:33:18 -0000 1.12
@@ -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.11 2010/10/17 19:23:35 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.12 2010/10/27 10:33:18 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -93,7 +93,7 @@
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}"
+ sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}"
# default to expose_php=Off, bug 300695
sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
1.7 dev-lang/php/files/eblits/src_install-v2.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.6&r2=1.7
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src_install-v2.eblit 24 Oct 2010 12:17:01 -0000 1.6
+++ src_install-v2.eblit 27 Oct 2010 10:33:18 -0000 1.7
@@ -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.6 2010/10/24 12:17:01 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.7 2010/10/27 10:33:18 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -95,7 +95,7 @@
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}"
+ sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}"
# default to expose_php=Off, bug 300695
sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-27 10:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-27 10:33 [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v1.eblit src_install-v2.eblit Ole Markus With (olemarkus)
-- strict thread matches above, loose matches on Subject: below --
2010-10-17 19:23 Matti Bickel (mabi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox