Ubuntu
apache2 package

Merge ~bryce/ubuntu/+source/apache2:apache2-fix-lp1832182-hirsute into ubuntu/+source/apache2:ubuntu/devel

  1. Git
  2. lp:~bryce/ubuntu/+source/apache2
  3. apache2-fix-lp1832182-hirsute
  4. Merge into ubuntu/devel
Proposed by Bryce Harrington
Status: Merged
Approved by: Bryce Harrington
Approved revision: 2fea15554926ad8a677ad04b3720d73a7cca08d7
Merge reported by: Christian Ehrhardt 
Merged at revision: 2fea15554926ad8a677ad04b3720d73a7cca08d7
Proposed branch: ~bryce/ubuntu/+source/apache2:apache2-fix-lp1832182-hirsute
Merge into: ubuntu/+source/apache2:ubuntu/devel
Diff against target: 98 lines (+40/-18)
2 files modified
debian/apache2ctl (+30/-18)
debian/changelog (+10/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Lucas Kanashiro (community) Needs Fixing
Canonical Server packageset reviewers Pending
Canonical Server Pending
Review via email: mp+393426@code.qastaging.launchpad.net

Description of the change

This is a re-send of a server-next fix for Apache2, which supersedes an earlier MP targeting groovy: https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/391856

This fixes some errors in the earlier code and incorporates Christian's review comments. I've tested the code via the test case in the bug with some variations, and it seems good. Autopkgtest checks out too, although the test cases don't exercise the 'graceful' command.

The issue is applicable to all past supported releases, so once this is accepted for hirsute I plan to also apply it to groovy, focal, bionic, and xenial. Thus please also review the SRU text in the bug report itself.

To post a comment you must log in.
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I am grabbing this for review.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

The package changes and the SRU bug description LGMT in general, just some comments below:

- In the changelog your target is groovy but this MP is targeting hirsute.

- This is me being nitpick: I would change this commit message:

commit a4a20160eefd3cd0a3cb07d2a95fb9665c1f2b16
Author: Bryce Harrington <email address hidden>
Date: Mon Oct 5 16:03:00 2020 -0700

    * d/apache2ctl: Also use systemd for graceful if it is in use. This extends an earlier fix for the start command to behave similarly for restart / graceful. Fixes service failures on unattended upgrade. (LP: #1832182)

to something like:

    * d/apache2ctl: Also use systemd for graceful if it is in use (LP: #1832182).

    This extends an earlier fix for the start command to behave similarly for
    restart / graceful. Fixes service failures on unattended upgrade.

It is a better reading IMO.

- I see this same bug was reported to Debian here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

Could we forward these changes to Debian as well?

Apart from that the package built fine and I was able to confirm that the fix is working as expected (following the instructions in the SRU bug). I also confirmed that autopkgtest did not identify any regression (despite it does not exercise the path of proposed changes):

autopkgtest [10:51:10]: @@@@@@@@@@@@@@@@@@@@ summary
run-test-suite PASS
duplicate-module-load PASS
htcacheclean PASS
default-mods PASS
ssl-passphrase PASS
check-http2 PASS
chroot PASS

review: Needs Fixing
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks for the review. I've incorporated the suggested changes.

I've forwarded the debdiff to debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

Branch and PPA are updated.

Revision history for this message
Bryce Harrington (bryce) wrote :

Since I incorporated all the review feedback, and since Christian also reviewed and approved the same changes for the SRUs I've gone ahead and uploaded this one too.

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This is fix released in hirsute -> merged

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches