Merge ~bryce/ubuntu/+source/php8.1:fix-lp1890263-jammy into ubuntu/+source/php8.1:ubuntu/devel

[Bryce Harrington]

Since the package name providing mod-php includes the php version number, when moving to new PHP versions it gets removed rather than upgraded. This branch adds dummy packages with the same names as the old mod-phps; these dummy packages are empty and just serve to require the 'libapache2-mod-php' virtual package, when in turn pulls in the latest versioned mod-php. Breaks/Replaces are included to ensure the old stuff gets ejected in favor of the newer.

I found that the build would fail building in PPA (but not locally) during dh_install because these packages weren't found. I worked around this via a couple --exclude arguments, as suggested by some random internet pages, but am not sure if there may be better solutions for this.

I've tested this only lightly so far, so there may still be some large corner cases I've overlooked. I'll be continuing to test it, and appreciate any additional banging on it others can do.

I'm also looking for feedback on the general approach. I plan to SRU this fix to focal as well (for bionic->focal upgrades), etc.

A PPA with this fix is at:
 https://launchpad.net/~bryce/+archive/ubuntu/modphp-upgrade-lp1890263-fixed-backports/+packages

Easiest way to test this is to set up an impish LXC container, install libapache2-mod-php8.0, then install the PPA and apt-get full-upgrade. It should install libapache2-mod-php8.1.

[Christian Ehrhardt  (paelzer)]

I was curious what the outcome of this testing will be - I see it ended as double replaces combined with a double transitional package.

You have made the versioned transitional to depend on the generic libapache2-mod-php.
Which will depend on whatever the current version is.
I know that you know that there might be corner cases left.
For example:
If you installed in the past the generic libapache2-mod-php all will be fine anyway.
But if you installed the versioned pkg in the past it will now via the transitional depend on the new version. But since the transitional says "can be removed" people might remove it and then nothing will depend on the new versioned mod-php anymore leading to the old problem. So the new version might show in auto-remove.

I have done some testing to check my assumptions, after upgrade I got:
ii libapache2-mod-php 2:8.1+92ubuntu2~impish2
ii libapache2-mod-php8.0 8.1.2-1ubuntu2~impish4
ii libapache2-mod-php8.1 8.1.2-1ubuntu2~impish4
Good so far,

But also as assumed if I do remove the transitional now I get:
The following packages were automatically installed and are no longer required:
  apache2 apache2-bin apache2-data apache2-utils libapache2-mod-php libapache2-mod-php8.1 libapr1 libaprutil1 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.3-0 php-common php8.1-cli
  php8.1-common php8.1-opcache php8.1-readline ssl-cert
Use 'apt autoremove' to remove them.
The following packages will be REMOVED:
  libapache2-mod-php8.0
0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
After this operation, 6144 B disk space will be freed.
Do you want to continue? [Y/n]

After "apt install libapache2-mod-php8.1" or "apt install libapache2-mod-php" this would no more happen.

But I stay to my word that I think it might be ok to close 95% of this issue which is much better not fixing it at all.
- It does no more remove mod-php on upgrade +1
- It does not list it on auto-remove +1
- Removing the transitional only puts the new one on auto-remove
-> That might indeed be enough, open for future improvement but enough to fix the immediate issue before people upgrade to 22.04

---

I have also a few very minor comments inline below ...

About the issues that made you add "--exclude=" do you have a pastebin of those issues?
I think only than can others think about suggesting alternatives (if there are any).

Disabling the pedantic along the way LGTM as well.

+99 from my side

Not consuming the review slot to leave this open for other reviews or suggestions.

[Bryce Harrington (bryce)]

Yes, using the libapache2-mod-php virtual package to indirectly pull in the versioned package feels like a bit of a hack, and you're right there's gonna be some corner cases people hit there. I'd love to know if there's a way we can tighten that up, but at least it's something people would have to hit via making a mistake rather than purely by accident so it's at least a good improvement over the current situation and does not appear likely to affect or break proper workflows.

For the "--exclude=" items, unfortunately I didn't save the output I hit there, but should be straightforward to reproduce. I'll try to remember to include that with the SRU tickets.

For those curious about the pedantic errors, they are visible in the current build logs on launchpad.

[Bryce Harrington (bryce)]

Regarding the "PHP is a..." boilerplate, I included it only because the other packages all included it, however looking closer at least one transitional dummy package (php8.1-xsl) omits it. I'll drop it.

diff --git a/debian/changelog b/debian/changelog
index 1421b49..5a2f7ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+php8.1 (8.1.2-1ubuntu2) jammy; urgency=medium
+
+  * d/control: Add transitional packages and Breaks/Replaces to force
+    upgrade from earlier mod-php's to version 8.1.
+    (LP: #1890263)
+  * d/rules: Don't fill up build log with pedantic warnings.
+
+ -- Bryce Harrington <[e-mail]>  Thu, 07 Apr 2022 17:46:26 +0000
+
 php8.1 (8.1.2-1ubuntu1) jammy; urgency=medium
 
   * SECURITY UPDATE: use-after-free in php_filter_float()
diff --git a/debian/control b/debian/control
index 7636a6f..d0a76ae 100644
--- a/debian/control
+++ b/debian/control
@@ -94,6 +94,8 @@ Depends: libmagic1,
 Provides: libapache2-mod-php,
           php8.1-json,
           ${php:Provides}
+Replaces: libapache2-mod-php7.4 (>> 8.1.2-1~),
+         libapache2-mod-php8.0 (>> 8.1.2-1~)
 Recommends: apache2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
@@ -107,6 +109,36 @@ Description: server-side, HTML-embedded scripting language (Apache 2 module)
  open source general-purpose scripting language that is especially suited
  for web development and can be embedded into HTML.
 
+Package: libapache2-mod-php7.4
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php7.4 (<< 7.4.3-5~)
+Breaks: libapache2-mod-php7.4 (<< 7.4.3-5~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional package to libapache2-mod-php8.1.  It can be safely removed.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
+Package: libapache2-mod-php8.0
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php8.0 (<< 8.0.8-2~)
+Breaks: libapache2-mod-php8.0 (<< 8.0.8-2~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional package to libapache2-mod-php8.1.  It can be safely removed.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
 Package: libphp8.1-embed
 Architecture: any
 Depends: libmagic1,
diff --git a/debian/control.in b/debian/control.in
index 709af91..1d5a42e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -94,6 +94,8 @@ Depends: libmagic1,
 Provides: libapache2-mod-php,
           php@PHP_VERSION@-json,
           ${php:Provides}
+Replaces: libapache2-mod-php7.4 (>> 8.1.2-1~),
+         libapache2-mod-php8.0 (>> 8.1.2-1~)
 Recommends: apache2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
@@ -107,6 +109,36 @@ Description: server-side, HTML-embedded scripting language (Apache 2 module)
  open source general-purpose scripting language that is especially suited
  for web development and can be embedded into HTML.
 
+Package: libapache2-mod-php7.4
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php7.4 (<< 7.4.3-5~)
+Breaks: libapache2-mod-php7.4 (<< 7.4.3-5~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional package to libapache2-mod-php8.1.  It can be safely removed.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
+Package: libapache2-mod-php8.0
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php8.0 (<< 8.0.8-2~)
+Breaks: libapache2-mod-php8.0 (<< 8.0.8-2~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional package to libapache2-mod-php8.1.  It can be safely removed.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
 Package: libphp@PHP_VERSION@-embed
 Architecture: any
 Depends: libmagic1,
diff --git a/debian/rules b/debian/rules
index 69374a7..1b3fc90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,7 +138,7 @@ ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
   DEB_CFLAGS_MAINT_APPEND += -O0
 endif
-DEB_CFLAGS_MAINT_APPEND += -Wall -pedantic -fsigned-char -fno-strict-aliasing 
+DEB_CFLAGS_MAINT_APPEND += -Wall -fsigned-char -fno-strict-aliasing
 DEB_CFLAGS_MAINT_APPEND += $(shell getconf LFS_CFLAGS)
 
 # Enable IEEE-conformant floating point math on alphas (not the default)
@@ -499,7 +499,7 @@ override_dh_install-arch: remove-files-stamp prepare-fpm-pools
 	install -d -m 755 debian/tmp/usr/lib/cgi-bin/
 	ln debian/tmp/usr/bin/php-cgi$(PHP_NAME_VERSION) debian/tmp/usr/lib/cgi-bin/php$(PHP_NAME_VERSION)
 
-	dh_install --fail-missing
+	dh_install --fail-missing --exclude=libapache2-mod-php7.4 --exclude=libapache2-mod-php8.0
 
 # Install a helper script for checking PHP FPM configuration
 	mkdir -p debian/$(PHP_FPM)/usr/lib/php/