Merge ~bryce/ubuntu/+source/php7.4:fix-lp1865218-mod-php-upgrade-focal into ubuntu/+source/php7.4:ubuntu/focal-devel

[Bryce Harrington]

SRU to fix failure when upgrading with mod-php enabled.

I've verified this works using the test case from the bug #1865218, using this PPA:

PPA: https://launchpad.net/~bryce/+archive/ubuntu/php-defaults-fix-lp1865218-mod-php-upgrade

[Christian Ehrhardt  (paelzer)]

See groovy MP

review: Needs Information

[Bryce Harrington (bryce)]

Suggested changes applied, ready for re-review.

[Christian Ehrhardt  (paelzer)]

Checked in detail in groovy, this matches +1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index a8f481d..434c2a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php7.4 (7.4.3-4ubuntu2.1) focal; urgency=medium
+
+  * libapache2-mod-php.postinst.extra: Disable other mod-php versions.
+    Fixes failure when upgrading from previous versions of mod-php.
+    (LP: #1865218)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 21 Apr 2020 23:04:30 +0000
+
 php7.4 (7.4.3-4ubuntu2) focal; urgency=medium
 
   * SECURITY UPDATE: Read one byte of uninitialized memory
diff --git a/debian/libapache2-mod-php.postinst.extra b/debian/libapache2-mod-php.postinst.extra
index 923e475..6c6ef99 100644
--- a/debian/libapache2-mod-php.postinst.extra
+++ b/debian/libapache2-mod-php.postinst.extra
@@ -13,9 +13,14 @@ if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
 	fi
 
 	PHP_MODULE=$(a2query -m | sed -n 's/^\(php[\.0-9]*\) (enabled.*)/\1/p')
-        if [ -n "$PHP_MODULE" -a "$PHP_MODULE" != "php@PHP_VERSION@" ]; then
-	    apache2_msg "err" "$DPKG_MAINTSCRIPT_PACKAGE: $PHP_MODULE module already enabled, not enabling PHP @PHP_VERSION@"
-	    return 1
+	if [ -n "$PHP_MODULE" -a "$PHP_MODULE" != "php@PHP_VERSION@" ]; then
+	    local a2invoke_ret=0
+	    apache2_msg "info" "$DPKG_MAINTSCRIPT_PACKAGE: Disabling old $PHP_MODULE in favor of using PHP @PHP_VERSION@"
+	    apache2_invoke dismod $PHP_MODULE || a2invoke_ret=1
+	    if [ "${a2invoke_ret}" -ne 0 ]; then
+		apache2_msg "err" "$DPKG_MAINTSCRIPT_PACKAGE: (${a2invoke_ret}) failed to disable old $PHP_MODULE"
+		return 1
+	    fi
 	fi
 
 	mpm=$(a2query -M)