Merge ~paelzer/ubuntu/+source/dnsmasq:revert-delta-impish into ubuntu/+source/dnsmasq:ubuntu/impish-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Git-ubuntu hasn't imported the latest version
 dnsmasq | 2.85-1 | unstable | source, all
 dnsmasq | 2.85-1ubuntu1 | impish | source
 dnsmasq | 2.85-1ubuntu1 | impish/universe | all

But it is available as pkg/upload/2.85-1ubuntu1

While we resolve that this MP is against my former merge branch.
That way the diff should be ok.

[Christian Ehrhardt  (paelzer)]

Force-fetched, rebased and resubmitted here - should be good now once LP refreshes.

[Utkarsh Gupta (utkarsh)]

Thanks, Christian. Looks good!

Two quick things:

1. Can you please add the upstream discussion's URL[1] in the revert commit, please? This way, it's easier to spot.
[1]: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q2/015134.html

2. Spelling typo in d/ch (commented inline).

Since these two are trivial, you can fix these and upload directly, so +1! Yay! \o/

review: Approve

[Utkarsh Gupta (utkarsh)]

BTW, I am wondering if you wanted to run NM's test against these changes via PPA or something to get an idea of the fallout already, if any? ¯\_(ツ)_/¯

[Christian Ehrhardt  (paelzer)]

Both changes done - and yes once approved (=now) I wanted to do autopkgtest from PPA.

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4595/+packages

[Christian Ehrhardt  (paelzer)]

LP-Git refuses to take the tag :-/
But it is a trivial change ...

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dnsmasq_2.85-1ubuntu2.dsc: done.
  Uploading dnsmasq_2.85-1ubuntu2.tar.gz: done.
  Uploading dnsmasq_2.85-1ubuntu2_source.buildinfo: done.
  Uploading dnsmasq_2.85-1ubuntu2_source.changes: done.
Successfully uploaded packages.

Unmerged commits

676980d... by Christian Ehrhardt  on 2021-06-22

changelog: Revert: src/radv.c: avoid leases to be issued forever when not set (LP 1894619)

Signed-off-by: Christian Ehrhardt <email address hidden>

0bd0b88... by Christian Ehrhardt  on 2021-06-22

Revert "src/radv.c: avoid leases to be issued forever when not set LP 1894619"

This reverts commit 0e315046d6b89bcef2049f09fcfff60c569bd879.
As discussed with upstream [1], the new behavior is intentional and we will
follow (and some tools might need to adapt) instead to be different and
potentally create other - harder to predict and handle - fallout.

[1]: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q2/015134.html

diff --git a/debian/changelog b/debian/changelog
index e6ba3fb..03dd6f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dnsmasq (2.85-1ubuntu2) impish; urgency=medium
+
+  * Revert: "src/radv.c: avoid leases to be issued forever when not set"
+    (LP 1894619) according to the bug and upstream discussion.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 22 Jun 2021 07:18:30 +0200
+
 dnsmasq (2.85-1ubuntu1) impish; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/src/radv.c b/src/radv.c
index d10f2b6..3255904 100644
--- a/src/radv.c
+++ b/src/radv.c
@@ -628,9 +628,8 @@ static int add_prefixes(struct in6_addr *local,  int prefix,
 
 		/* find floor time, don't reduce below 3 * RA interval.
 		   If the lease time has been left as default, don't
-		   use that as a floor.
-		   Always set lease time if requested to do so. */
-		if ((context->flags & CONTEXT_SETLEASE) ||
+		   use that as a floor. */
+		if ((context->flags & CONTEXT_SETLEASE) &&
 		    time > context->lease_time)
 		  {
 		    time = context->lease_time;