Merge ~bryce/ubuntu/+source/php7.4:fix-lp1890263-focal into ubuntu/+source/php7.4:ubuntu/focal-devel

[Bryce Harrington]

This SRU includes a fix for bionic->focal upgrades. It's the same fix essentially as the one already deployed for focal->bionic and impish->bionic which seems to be working ok, at least no bug reports filed about it.

The PPA is at:

  https://launchpad.net/~bryce/+archive/ubuntu/modphp-upgrade-lp1890263/

It hasn't published the binaries yet, so I've not yet verified it, but the detailed testcase is in the SRU text on the bug report, LP: #1890263, which should be straightforward to follow.

The version specifications, "(<< 7.2.24-0~)", etc. I am guessing based on my understanding of the Debian policies but I've not done these before so not 100% sure I have the right numbers, so any advice/tips on those is welcomed.

[Athos Ribeiro (athos-ribeiro)]

I am reviewing this one

[Athos Ribeiro (athos-ribeiro)]

This LGTM. It does follow the same rationale of
https://code.launchpad.net/~bryce/ubuntu/+source/php8.1/+git/php8.1/+merge/419245

I do have a few questions regarding the transitional package method being applied and the versions referred by the MP:

In the libapache2-mod-php7.4 package, why does the new
Replaces version is not pointing to the exact version being shipped here?
i.e., why ">> 7.4.3-4~" instead of ">> 7.4.3-4ubuntu2.11~"?

The same question applies for the transitional packages:
why aren't the Replaces/Breaks versions saying that this replaces/breaks anything that is lower than "this version"? i.e., "<< 7.4.3-4ubuntu2.11~" instead of "<< 7.2.24-0~" and "<< 7.3.8-1~"

Finally, I am wondering why this design differs of the one proposed in
https://wiki.debian.org/RenamingPackages#Transition_package_method,
where the transitional packages would only depend on the new package and the new package would replace/break the old ones.

review: Needs Information

[Bryce Harrington (bryce)]

> In the libapache2-mod-php7.4 package, why does the new
> Replaces version is not pointing to the exact version being shipped here?
> i.e., why ">> 7.4.3-4~" instead of ">> 7.4.3-4ubuntu2.11~"?

Yeah, this was a point I was really uncertain of so glad you brought it up. I followed the debian documentation, and looked at some similar packages on our side, but the precise Ubuntu policy wasn't clear. I wanted to make sure it doesn't fail if, e.g. someone had only -security and not -updates, or even if they had neither enabled. This seemed to work. Do you have more certainty that it should be ">> 7.4.3-4ubuntu2.11~"?

> Finally, I am wondering why this design differs from the one proposed in
> https://wiki.debian.org/RenamingPackages#Transition_package_method,
> where the transitional packages would only depend on the new package
> and the new package would replace/break the old ones.

Originally my hope had been to force dependence on the libapache2-mod-php package instead of the versioned package, but I could not get that to behave as I wished. The solution possibly could be simplified by omitting mention of libapache2-mod-php, which I believe would result in essentially what you describe? Including libapache2-mod-php seems to cause no harm, but it appears to get removed when the user does apt-get autoremove. Anyway, most definitely open to alternative suggestions.

Thanks for reviewing.

[Athos Ribeiro (athos-ribeiro)]

Thanks for the replies here, Bryce.

Using replaces for ">> 7.4.3-4~" should be enough then.

We may keep the current approach since it does work and since this is what we have been doing for the other upgrade paths.

Thanks!

I will proceed to file a new MP merging this change with the one in https://code.launchpad.net/~athos-ribeiro/ubuntu/+source/php7.4/+git/php7.4/+merge/421559 so we can upload them together.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index e85e83c..d2e096b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php7.4 (7.4.3-4ubuntu2.11) focal; urgency=medium
+
+  * d/control, d/control.in: Add transitional packages and
+    Breaks/Replaces to force upgrade from earlier mod-php's to v7.4.
+    (LP: #1890263)
+
+ -- Bryce Harrington <[e-mail]>  Thu, 05 May 2022 00:01:04 +0000
+
 php7.4 (7.4.3-4ubuntu2.10) focal-security; urgency=medium
 
   * SECURITY UPDATE: DoS in zend_string_extend function
diff --git a/debian/control b/debian/control
index 8eb38a4..06d420a 100644
--- a/debian/control
+++ b/debian/control
@@ -96,8 +96,8 @@ Depends: libmagic1,
          ${shlibs:Depends}
 Provides: libapache2-mod-php,
           ${php:Provides}
-Conflicts: libapache2-mod-php7.3,
-	   libapache2-mod-php7.2
+Replaces: libapache2-mod-php7.3 (>> 7.4.3-4~),
+	   libapache2-mod-php7.2 (>> 7.4.3-4~)
 Recommends: apache2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
@@ -111,6 +111,30 @@ 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.2
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php7.2 (<< 7.2.24-0~)
+Breaks: libapache2-mod-php7.2 (<< 7.2.24-0~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional dummy package to libapache2-mod-php7.4.  It can
+ be safely removed and libapache2-mod-php installed instead.
+
+Package: libapache2-mod-php7.3
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php7.3 (<< 7.3.8-1~)
+Breaks: libapache2-mod-php7.3 (<< 7.3.8-1~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional dummy package to libapache2-mod-php7.4.  It can
+ be safely removed and libapache2-mod-php installed instead.
+
 Package: libphp7.4-embed
 Architecture: any
 Depends: libmagic1,
diff --git a/debian/control.in b/debian/control.in
index 360e31d..5b551a5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -96,8 +96,8 @@ Depends: libmagic1,
          ${shlibs:Depends}
 Provides: libapache2-mod-php,
           ${php:Provides}
-Conflicts: libapache2-mod-php7.3,
-	   libapache2-mod-php7.2
+Replaces: libapache2-mod-php7.3 (>> 7.4.3-4~),
+          libapache2-mod-php7.2 (>> 7.4.3-4~)
 Recommends: apache2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
@@ -111,6 +111,30 @@ 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.2
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php7.2 (<< 7.2.24-0~)
+Breaks: libapache2-mod-php7.2 (<< 7.2.24-0~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional dummy package to libapache2-mod-php7.4.  It can
+ be safely removed and libapache2-mod-php installed instead.
+
+Package: libapache2-mod-php7.3
+Section: httpd
+Architecture: any
+Replaces: libapache2-mod-php7.3 (<< 7.3.8-1~)
+Breaks: libapache2-mod-php7.3 (<< 7.3.8-1~)
+Depends: libapache2-mod-php,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Transitional package
+ This is a transitional dummy package to libapache2-mod-php7.4.  It can
+ be safely removed and libapache2-mod-php installed instead.
+
 Package: libphp@PHP_VERSION@-embed
 Architecture: any
 Depends: libmagic1,