Merge ~mitchdz/ubuntu/+source/nginx:mitch/add-moutline-atomic into ubuntu/+source/nginx:ubuntu/focal-devel

Proposed by Mitchell Dzurick
Status: Merged
Merged at revision: 75b98132fa43cae680c6d9a4cd09d854238653fa
Proposed branch: ~mitchdz/ubuntu/+source/nginx:mitch/add-moutline-atomic
Merge into: ubuntu/+source/nginx:ubuntu/focal-devel
Diff against target: 27 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
debian/rules (+2/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Canonical Server Reporter Pending
git-ubuntu import Pending
Review via email: mp+465301@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mitchell Dzurick (mitchdz) wrote :

Autopkgtest results:
* Results:
  - nginx/1.18.0-0ubuntu1.5~focal1
    + ✅ nginx on focal for amd64 @ 04.04.24 21:22:11
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-mitchdz-lp2024019-moutline-atomic/focal/amd64/n/nginx/20240404_212211_49bde@/log.gz
    + ✅ nginx on focal for arm64 @ 04.04.24 19:18:03
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-mitchdz-lp2024019-moutline-atomic/focal/arm64/n/nginx/20240404_191803_775a6@/log.gz
    + ✅ nginx on focal for armhf @ 05.04.24 17:08:03
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-mitchdz-lp2024019-moutline-atomic/focal/armhf/n/nginx/20240405_170803_6169b@/log.gz
    + ❌ nginx on focal for i386 @ 04.04.24 23:25:39
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-mitchdz-lp2024019-moutline-atomic/focal/i386/n/nginx/20240404_232539_e271d@/log.gz
      • Status: FAIL
      • light-simple FAIL 🟥
      • core-simple FAIL 🟥
      • lua FAIL 🟥
      • full-simple FAIL 🟥
      • extras-simple FAIL 🟥
      • full-module-deps FAIL 🟥
      • light-module-deps FAIL 🟥
      • core-module-deps FAIL 🟥
      • extras-module-deps FAIL 🟥
    + ✅ nginx on focal for ppc64el @ 04.04.24 19:07:48
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-mitchdz-lp2024019-moutline-atomic/focal/ppc64el/n/nginx/20240404_190748_3f761@/log.gz
    + ✅ nginx on focal for s390x @ 04.04.24 19:10:12
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-mitchdz-lp2024019-moutline-atomic/focal/s390x/n/nginx/20240404_191012_b191a@/log.gz

i386 has been failing since 2019 due to uninstallable packages - https://autopkgtest.ubuntu.com/packages/nginx/focal/i386 so not an issue.

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

Verified that focal does indeed have gcc-10 (10-20200411 in -release; 10.5.0 in -updates).

I didn't run through the [Test Plan] but reviewed the steps: very thorough... nice.

A request for improved changelog entry text is inlined below.

Thanks for the link to the debian discussion; skimming through that answered many questions.

LGTM, +1

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

Uploaded

gpg: ../nginx_1.18.0-0ubuntu1.5_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../nginx_1.18.0-0ubuntu1.5.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nginx_1.18.0-0ubuntu1.5.dsc: done.
  Uploading nginx_1.18.0-0ubuntu1.5.debian.tar.xz: done.
  Uploading nginx_1.18.0-0ubuntu1.5_source.buildinfo: done.
  Uploading nginx_1.18.0-0ubuntu1.5_source.changes: done.
Successfully uploaded packages.

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/nginx
Vcs-Git-Commit: 75b98132fa43cae680c6d9a4cd09d854238653fa
Vcs-Git-Ref: refs/heads/mitch/add-moutline-atomic

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 9e239e2..e025817 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+nginx (1.18.0-0ubuntu1.5) focal; urgency=medium
7+
8+ * d/rules: add -moutline-atomics for arm64 (LP: #2024019).
9+
10+ -- Mitchell Dzurick <mitchell.dzurick@canonical.com> Wed, 20 Mar 2024 15:11:50 -0700
11+
12 nginx (1.18.0-0ubuntu1.4) focal-security; urgency=medium
13
14 * SECURITY UPDATE: memory corruption/disclosure issue
15diff --git a/debian/rules b/debian/rules
16index 655a7e5..3c72c18 100755
17--- a/debian/rules
18+++ b/debian/rules
19@@ -35,6 +35,8 @@ $(foreach flavour,$(FLAVOURS),$(eval BUILDDIR_$(flavour) = $(CURDIR)/debian/buil
20 DEB_BUILD_ARCH ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
21 ifeq ($(DEB_BUILD_ARCH),sparc)
22 debian_cflags += -m32 -mcpu=ultrasparc
23+else ifeq ($(DEB_BUILD_ARCH),arm64)
24+ debian_cflags += -moutline-atomics
25 endif
26
27 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

Subscribers

People subscribed via source and target branches