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

Proposed by Bryce Harrington on 2020-03-27
Status: Merged
Approved by: Bryce Harrington on 2020-03-31
Approved revision: 3971cb7b932e15f901394f38ed4cbc4831277746
Merged at revision: 3971cb7b932e15f901394f38ed4cbc4831277746
Proposed branch: ~bryce/ubuntu/+source/php7.4:fix-lp1850933-focal
Merge into: ubuntu/+source/php7.4:ubuntu/devel
Diff against target: 62 lines (+16/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+4/-1)
debian/control.in (+4/-1)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  2020-03-27 Approve on 2020-03-31
Canonical Server Team 2020-03-27 Pending
Ubuntu Server 2020-03-27 Pending
Review via email: mp+381283@code.launchpad.net

Description of the change

To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

Quote: "Debian differs from Ubuntu here in that they try to support multiple php versions co-installed. So, it's unlikely this fix would be upstreamable."

That would have been the only thing I wanted to see, but I agree to the above.
The change itself LGTM to avoid a serious issues for upgraders to 20.04.

I'm glad that after PHP itself has migrated it is time for such fixes now.

This is based on my suggestion that was for 7.2 in Eoan.
But for Focal the solution has to be slightly different. Here the fix needs to consider two upgrade paths:
- from Eoan
- from Bionic
IMHO we need also to conflict with libapache2-mod-php7.2 (Bionics version) to fix both paths.

Do you agree?

review: Needs Fixing
Bryce Harrington (bryce) wrote :

Yep, that makes sense. I've updated the branch to also conflict for php7.2.

Christian Ehrhardt  (paelzer) wrote :

Thanks, LGTM now +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index b37796e..c82a2a9 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+php7.4 (7.4.3-4ubuntu1) focal; urgency=medium
7+
8+ * d/control, d/control.in: Conflict with mod-php from php7.2 and
9+ php7.3 to ensure safe upgrade path for apache2.
10+ (Fixes LP: #1850933)
11+
12+ -- Bryce Harrington <bryce@canonical.com> Thu, 26 Mar 2020 20:24:23 +0000
13+
14 php7.4 (7.4.3-4build2) focal; urgency=medium
15
16 * No-change rebuild for icu soname change.
17diff --git a/debian/control b/debian/control
18index 9d0db02..8eb38a4 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: php7.4
23 Section: php
24 Priority: optional
25-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
28 Uploaders: Ondřej Surý <ondrej@debian.org>,
29 Lior Kaplan <kaplan@debian.org>
30 Build-Depends: apache2-dev (>= 2.4),
31@@ -95,6 +96,8 @@ Depends: libmagic1,
32 ${shlibs:Depends}
33 Provides: libapache2-mod-php,
34 ${php:Provides}
35+Conflicts: libapache2-mod-php7.3,
36+ libapache2-mod-php7.2
37 Recommends: apache2
38 Suggests: php-pear
39 Description: server-side, HTML-embedded scripting language (Apache 2 module)
40diff --git a/debian/control.in b/debian/control.in
41index 2e2339a..360e31d 100644
42--- a/debian/control.in
43+++ b/debian/control.in
44@@ -1,7 +1,8 @@
45 Source: php@PHP_VERSION@
46 Section: php
47 Priority: optional
48-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
49+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
50+XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
51 Uploaders: Ondřej Surý <ondrej@debian.org>,
52 Lior Kaplan <kaplan@debian.org>
53 Build-Depends: apache2-dev (>= 2.4),
54@@ -95,6 +96,8 @@ Depends: libmagic1,
55 ${shlibs:Depends}
56 Provides: libapache2-mod-php,
57 ${php:Provides}
58+Conflicts: libapache2-mod-php7.3,
59+ libapache2-mod-php7.2
60 Recommends: apache2
61 Suggests: php-pear
62 Description: server-side, HTML-embedded scripting language (Apache 2 module)

Subscribers

People subscribed via source and target branches