From 6d3b749caf5bfa7ce96a6962bf7da3c2f8401a6b Mon Sep 17 00:00:00 2001
From: root <root@uhu1.uhu-banane.de>
Date: Tue, 20 Sep 2016 16:13:16 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper                         |  1 -
 apache2/modules.d/70_mod_php5.conf | 28 ----------------------------
 conf.d/apache2                     |  2 +-
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 apache2/modules.d/70_mod_php5.conf

diff --git a/.etckeeper b/.etckeeper
index ca0f285..3e4dadf 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -87,7 +87,6 @@ maybe chmod 0644 'apache2/modules.d/45_mod_dav.conf'
 maybe chmod 0644 'apache2/modules.d/46_mod_ldap.conf'
 maybe chmod 0644 'apache2/modules.d/47_mod_dav_svn.conf'
 maybe chmod 0644 'apache2/modules.d/70_mod_php.conf'
-maybe chmod 0644 'apache2/modules.d/70_mod_php5.conf'
 maybe chmod 0644 'apache2/modules.d/99_nagios4.conf'
 maybe chmod 0755 'apache2/ssl'
 maybe chmod 0600 'apache2/ssl/egroupware-cert.pem'
diff --git a/apache2/modules.d/70_mod_php5.conf b/apache2/modules.d/70_mod_php5.conf
deleted file mode 100644
index bd79f78..0000000
--- a/apache2/modules.d/70_mod_php5.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-###########
-# 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>
diff --git a/conf.d/apache2 b/conf.d/apache2
index 4996ace..eff1a47 100644
--- a/conf.d/apache2
+++ b/conf.d/apache2
@@ -34,7 +34,7 @@
 #                     when you enable SSL)
 #
 #APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D MANUAL -D SSL -D SSL_DEFAULT_VHOST -D SUEXEC -D LANGUAGE"
-APACHE2_OPTS="-D DEFAULT_VHOST -D PHP5 -D SSL -D SSL_DEFAULT_VHOST -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE"
+APACHE2_OPTS="-D DEFAULT_VHOST -D PHP -D SSL -D SSL_DEFAULT_VHOST -D MANUAL -D INFO -D STATUS -D ERRORDOCS -D LANGUAGE"
 
 # Extended options for advanced uses of Apache ONLY
 # You don't need to edit these unless you are doing crazy Apache stuff
-- 
2.39.5