app-eselect/eselect-php: new revision with backwards-compatible apache config.

If the user has an unmodified 70_mod_php5.conf, the previous revision
will allow that file to be removed. This can break PHP support in
Apache before the user notices that he needs to run eselect-php and
update his Apache -DPHP5 line.

In this revision we supply the latest copy of 70_mod_php5.conf for
backwards compatibility. There is now a notice at the top of that file
informing users to upgrade their configuration.

Package-Manager: portage-2.2.24
This commit is contained in:
Michael Orlitzky
2016-01-05 14:10:55 -05:00
parent c47455d764
commit 1ae81f5e49
2 changed files with 30 additions and 1 deletions

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,6 +30,7 @@ src_install() {
if use apache2 ; then
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
doins "${FILESDIR}/70_mod_php.conf"
newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
fi
if use fpm ; then

View File

@@ -0,0 +1,28 @@
###########
# WARNING #
###########
#
# This file is provided for backwards compatibility only. The Apache
# PHP configuration is now located in 70_mod_php.conf and requires you
# to set -DPHP in your Apache conf.d file. Please examine
# 70_mod_php.conf and update your Apache configuration to use -DPHP
# instead of -DPHP5. Afterwards you may delete this file.
#
<IfDefine PHP5>
# Load the module first
<IfModule !mod_php5.c>
LoadModule php5_module modules/libphp5.so
</IfModule>
# Set it to handle the files
# NOTE: Avoiding AddHandler/AddType for security (bug #538822)
# NOTE: Please read the related news item!
<FilesMatch "\.(php|php5|phtml)$">
SetHandler application/x-httpd-php
</FilesMatch>
<FilesMatch "\.phps$">
SetHandler application/x-httpd-php-source
</FilesMatch>
DirectoryIndex index.php index.phtml
</IfDefine>