summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2011-07-20 12:41:38 +0000
committerOle Markus With <olemarkus@gentoo.org>2011-07-20 12:41:38 +0000
commit908877a8041658b3910af46c5c12f2cd8bc459c7 (patch)
tree125e1fe5e8d062f2544a1ea0945f559264e2f1e7 /dev-lang/php
parentFix for Prefix, bug #367651 (diff)
downloadgentoo-2-908877a8041658b3910af46c5c12f2cd8bc459c7.tar.gz
gentoo-2-908877a8041658b3910af46c5c12f2cd8bc459c7.tar.bz2
gentoo-2-908877a8041658b3910af46c5c12f2cd8bc459c7.zip
Removed some 'security' fixes for php.ini.
Diffstat (limited to 'dev-lang/php')
-rw-r--r--dev-lang/php/ChangeLog5
-rw-r--r--dev-lang/php/files/eblits/src_install-v3.eblit8
2 files changed, 5 insertions, 8 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 4cced3f55048..0389db7e0a10 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.495 2011/07/02 15:14:41 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.496 2011/07/20 12:41:38 olemarkus Exp $
+
+ 20 Jul 2011; <olemarkus@gentoo.org> files/eblits/src_install-v3.eblit:
+ Removed some 'security' fixes for php.ini.
02 Jul 2011; Ole Markus With <olemarkus@gentoo.org>
+files/eblits/pkg_setup-v3.eblit, files/eblits/src_configure-v3.eblit,
diff --git a/dev-lang/php/files/eblits/src_install-v3.eblit b/dev-lang/php/files/eblits/src_install-v3.eblit
index 6ac274ff69c5..19e4b89a359f 100644
--- a/dev-lang/php/files/eblits/src_install-v3.eblit
+++ b/dev-lang/php/files/eblits/src_install-v3.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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-v3.eblit,v 1.1 2011/06/30 07:30:11 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.2 2011/07/20 12:41:38 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -89,12 +89,6 @@ 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_fopen = Off|g' -i "${phpinisrc}"
-
- # default to expose_php=Off, bug 300695
- sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
-
# default to /tmp for save_path, bug #282768
sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}"