Ubuntu
apache2 package

Merge ~bryce/ubuntu/+source/apache2:merge-v2.4.54-3-lunar into ubuntu/+source/apache2:debian/sid

  1. Git
  2. lp:~bryce/ubuntu/+source/apache2
  3. merge-v2.4.54-3-lunar
  4. Merge into debian/sid
Proposed by Bryce Harrington
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: 41d5df1e18b8e7167aa892ce2cf29370826fba13
Proposed branch: ~bryce/ubuntu/+source/apache2:merge-v2.4.54-3-lunar
Merge into: ubuntu/+source/apache2:debian/sid
Diff against target: 2868 lines (+2159/-60)
10 files modified
debian/apache2-bin.install (+1/-0)
debian/apache2-utils.ufw.profile (+14/-0)
debian/apache2.dirs (+1/-0)
debian/apache2.install (+1/-0)
debian/apache2.postrm (+2/-0)
debian/apache2.py (+48/-0)
debian/changelog (+2036/-2)
debian/control (+4/-2)
debian/index.html (+51/-56)
debian/source/include-binaries (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Sergio Durigan Junior (community) Approve
Canonical Server Reporter Pending
Review via email: mp+433316@code.staging.launchpad.net

Description of the change

Fairly trivial merge of 2.4.54-3, to pick up one minor fix for alias /manual. The delta is all ubuntu-specific and so is just carried forward. Upstream releases every few months and last release was in June so I expect to be re-merging this at least once more this cycle.

PPA with test packages: https://launchpad.net/~bryce/+archive/ubuntu/apache2-merge-v2.4.54-3

    $ sudo add-apt-repository -yus ppa:bryce/apache2-merge-v2.4.54-3
    $ sudo apt-get install apache2

* gnome-terminal
  - lp-test-ppa ppa:bryce/apache2-merge-v2.4.54-3 --release lunar --showpass

* Results:
  - apache2/2.4.54-3ubuntu1~lunar1
    + ✅ apache2 on lunar for amd64 @ 18.11.22 21:49:18 Log️ 🗒️
    + ✅ apache2 on lunar for arm64 @ 18.11.22 21:54:28 Log️ 🗒️
    + ✅ apache2 on lunar for armhf @ 18.11.22 21:19:11 Log️ 🗒️
    + ❌ apache2 on lunar for i386 @ 18.11.22 21:48:17 Log️ 🗒️
      • run-test-suite FAIL 🟥
      • duplicate-module-load PASS 🟩
      • default-mods PASS 🟩
      • htcacheclean PASS 🟩
      • ssl-passphrase PASS 🟩
      • check-http2 PASS 🟩
      • chroot FAIL 🟥
    + ✅ apache2 on lunar for ppc64el @ 18.11.22 21:37:09 Log️ 🗒️
    + ✅ apache2 on lunar for s390x @ 18.11.22 21:04:39 Log️ 🗒️

The issues on i386 are assuredly just the usual flaky test situation apache2 is plagued with, but I've re-triggered to doublecheck.

Usual tags pushed for review:
  - tags/old/debian 5a3995743
  - tags/new/debian 36f5aa2f1
  - tags/old/ubuntu 7056ded95
  - tags/logical/2.4.54-2ubuntu1 e80266d97
  - tags/reconstruct/2.4.54-2ubuntu1 eb8dddba3
  - tags/split/2.4.54-2ubuntu1 f0bac5dcc

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I'm taking this one.

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks for the MP, Bryce.

Indeed, trivial merge it seems. Changes seem OK, builds finished without problems, dep8 tests seem OK modulo the usual flaky ones. d/changelog entry is alright. LGMT, +1.

Thanks.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: bryce, sergiodj
Uploaders: bryce, sergiodj
MP auto-approved

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

Thanks Sergio, uploaded

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/apache2
Vcs-Git-Commit: 41d5df1e18b8e7167aa892ce2cf29370826fba13
Vcs-Git-Ref: refs/heads/merge-v2.4.54-3-lunar
$ dput ubuntu ../apache2_2.4.54-3ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.54-3ubuntu1.dsc: done.
  Uploading apache2_2.4.54.orig.tar.gz: done.
  Uploading apache2_2.4.54-3ubuntu1.debian.tar.xz: done.
  Uploading apache2_2.4.54-3ubuntu1_source.buildinfo: done.
  Uploading apache2_2.4.54-3ubuntu1_source.changes: done.
Successfully uploaded packages.

The i386 tests failed again on retry, but I still think it's flaky tests. I'll keep an eye on if it fails in -proposed.

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