diff -Nru fusionforge-6.0.3+20151023/debian/changelog fusionforge-6.0.3+20151023/debian/changelog --- fusionforge-6.0.3+20151023/debian/changelog 2016-03-23 16:09:00.000000000 -0700 +++ fusionforge-6.0.3+20151023/debian/changelog 2016-06-23 16:23:25.000000000 -0700 @@ -1,3 +1,10 @@ +fusionforge (6.0.3+20151023-1ubuntu1.1) xenial; urgency=medium + + * debian/patches/update-for-php7.patch: correct Apache syntax for + PHP7.0 (LP: #1595749). + + -- Nishanth Aravamudan Thu, 23 Jun 2016 16:15:37 -0700 + fusionforge (6.0.3+20151023-1ubuntu1) xenial; urgency=medium * Update to PHP7.0 dependencies (LP: #1544352). diff -Nru fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch --- fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch 2016-03-23 16:08:03.000000000 -0700 +++ fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch 2016-06-23 16:21:51.000000000 -0700 @@ -2,9 +2,9 @@ Author: Nishanth Aravamudan Bug-Ubuntu: https://launchpad.net/bugs/1544352 ---- fusionforge-6.0.3+20151023.orig/common/include/env.inc.php -+++ fusionforge-6.0.3+20151023/common/include/env.inc.php -@@ -100,7 +100,7 @@ $include_path = join(PATH_SEPARATOR, +--- a/common/include/env.inc.php ++++ b/common/include/env.inc.php +@@ -100,7 +100,7 @@ '/usr/share/php', '/usr/share/php/htmlpurifier', '/usr/share/pear', @@ -13,24 +13,26 @@ ) ); ---- fusionforge-6.0.3+20151023.orig/etc/httpd.conf.d/disable-scripts.inc -+++ fusionforge-6.0.3+20151023/etc/httpd.conf.d/disable-scripts.inc -@@ -17,6 +17,6 @@ RequestHeader unset Cookie +--- a/etc/httpd.conf.d/disable-scripts.inc ++++ b/etc/httpd.conf.d/disable-scripts.inc +@@ -16,7 +16,7 @@ + SetHandler default - # Disable PHP5 explicitly for security (CVE-2014-0468) +-# Disable PHP5 explicitly for security (CVE-2014-0468) - -+ ++# Disable PHP7 explicitly for security (CVE-2014-0468) ++ php_admin_flag engine off ---- fusionforge-6.0.3+20151023.orig/post-install.d/web/web.sh -+++ fusionforge-6.0.3+20151023/post-install.d/web/web.sh -@@ -108,7 +108,7 @@ case "$1" in +--- a/post-install.d/web/web.sh ++++ b/post-install.d/web/web.sh +@@ -108,7 +108,7 @@ if [ -x /usr/sbin/a2enmod ]; then a2enmod version 2>/dev/null || true # opensuse.. a2enmod macro - a2enmod php5 -+ a2enmod php ++ a2enmod php7.0 a2enmod ssl a2enmod env a2enmod headers