Ubuntu
dnsmasq package

Merge ~paride/ubuntu/+source/dnsmasq:lp1785383-bionic into ubuntu/+source/dnsmasq:ubuntu/bionic-devel

  1. Git
  2. lp:~paride/ubuntu/+source/dnsmasq
  3. lp1785383-bionic
  4. Merge into ubuntu/bionic-devel
Proposed by Paride Legovini
Status: Merged
Merged at revision: 629df40bbd7574dcf01d0c3e2e9c21c3d857db6d
Proposed branch: ~paride/ubuntu/+source/dnsmasq:lp1785383-bionic
Merge into: ubuntu/+source/dnsmasq:ubuntu/bionic-devel
Diff against target: 39 lines (+13/-1)
2 files modified
debian/changelog (+6/-0)
src/forward.c (+7/-1)
Reviewer Review Type Date Requested Status
Utkarsh Gupta (community) Approve
Canonical Server packageset reviewers Pending
Review via email: mp+409149@code.staging.launchpad.net

Commit message

Bionic SRU for LP: #1785383, partial cherry-pick from upstream.
Test plan: see the SRU template.
Test PPA: https://launchpad.net/~paride/+archive/ubuntu/dnsmasq
Autopkgtest: not available.
Note that the source package is format 1.0.

Please review, no sponsorship needed.

Thanks!

To post a comment you must log in.
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Interesting to see that the first hunk of the upstream commit:
`unsigned char *oph = find_pseudoheader(header, plen, NULL, NULL, NULL, NULL);`
was already included but not the later parts. Do you happen to know how/why?

review: Needs Information
Revision history for this message
Paride Legovini (paride) wrote :

The second hunk is also already included in the diff. I didn't dig to check which upload exactly added those, however the diff is pretty big and contain a bunch of security fix. I imagine that those changes were needed to cleanly bring in fixes for those CVEs or to fix LP: #1916462...

Revision history for this message
Paride Legovini (paride) wrote :

As mentioned on MM, the already included hunks were part of 2.79-1ubuntu0.2:

https://launchpad.net/ubuntu/+source/dnsmasq/2.79-1ubuntu0.2

That page offers a "diff from 2.79-1ubuntu0.1 to 2.79-1ubuntu0.2", however version 2.79-1ubuntu0.1 doesn't exist in the package upload history. It seems that 0.1 got skipped and LP got somehow confused. The changes are however visible in the diff file:

https://launchpadlibrarian.net/516630258/dnsmasq_2.79-1ubuntu0.2.diff.gz

This is mentioned in the commit message.

Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Me likey. +1 w a trivial d/ch entry comment.

review: Approve
Revision history for this message
Paride Legovini (paride) wrote :

I amended d/changelog as requested. Thanks for reviewing!

Revision history for this message
Paride Legovini (paride) wrote :

Uploaded:

 OK: dnsmasq_2.79.orig.tar.gz
 OK: dnsmasq_2.79-1ubuntu0.5.diff.gz
 OK: dnsmasq_2.79-1ubuntu0.5.dsc

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