Merge ~bryce/ubuntu/+source/nmap:sru-lp1908223-jammy into ubuntu/+source/nmap:ubuntu/jammy-devel

Proposed by Bryce Harrington
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: Bryce Harrington
Merged at revision: 0faf9c91c31cb0a636a286c765699b68466ddc65
Proposed branch: ~bryce/ubuntu/+source/nmap:sru-lp1908223-jammy
Merge into: ubuntu/+source/nmap:ubuntu/jammy-devel
Diff against target: 102 lines (+61/-1) (has conflicts)
4 files modified
debian/changelog (+16/-0)
debian/control (+2/-1)
debian/patches/avoid-assertion-failure-when-unsolicited-arp-response-received.patch (+38/-0)
debian/patches/series (+5/-0)
Conflict in debian/changelog
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Athos Ribeiro (community) Approve
Canonical Server Pending
Canonical Server Reporter Pending
Canonical Server Core Reviewers Pending
Review via email: mp+437077@code.staging.launchpad.net

Description of the change

SRUs a patch to fix an assertion crash that none of us seem to be able to reproduce but several community members have. The reporter indicates running it in a loop several hundred times might trigger it; I haven't attempted that but might be worth a try. In any case, we're going to rely on the community to perform the testing.

The patch itself is just a couple code lines, that only stops the clock when it's running. That seems straightforward and unlikely to lead to regression. Please doublecheck that my SRU text in the bug report makes sense.

Note:
The diff for this is messed up, because there is a ghost release on the jammy-devel branch. The package was in sync, and autosync pulled in version 7.92+dfsg2-1 during the jammy cycle, however the publishing history indicates it was deleted by Ɓukasz Zemczak on 2022-04-29. I'm guessing the new version was stuck in migration, and deleted from -proposed once jammy hit release. I can recreate the MP against pkg/ubuntu/jammy if you'd like.

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Although I could not reproduce the issue, the patch is short and simple, and the SRU text makes sense (in special the test plan). The package builds fine. Unfortunately, there are no dep8 tests for the package.

While this is the first time I am seeing a case where the git-ubuntu data is not in sync with the archive, I suppose this is quite common after removing packages from proposed. I wonder what happens after an upload with git metadata (I suppose git-ubuntu will just start pointing jammy-devel to whatever information is in your branch).

LGTM. Thanks, Bryce!

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

Approvers: bryce, athos-ribeiro
Uploaders: bryce, athos-ribeiro
MP auto-approved

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

Thanks Athos, yes the jammy-devel mismatch was surprising, but per robie is a known issue. I'm surprised I haven't run into it before, but this was the first time.

Anyway, package uploaded:

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/nmap
Vcs-Git-Commit: 0faf9c91c31cb0a636a286c765699b68466ddc65
Vcs-Git-Ref: refs/heads/sru-lp1908223-jammy
$ dput ubuntu ../nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1_source.changes
gpg: ../nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1.dsc: done.
  Uploading nmap_7.91+dfsg1+really7.80+dfsg1.orig.tar.xz: done.
  Uploading nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1.debian.tar.xz: done.
  Uploading nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1_source.buildinfo: done.
  Uploading nmap_7.91+dfsg1+really7.80+dfsg1-2ubuntu0.1_source.changes: done.
Successfully uploaded packages.

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