Merge ~paelzer/ubuntu/+source/dnsmasq:lp-1894619-dhcp6-use-desired-default into ubuntu/+source/dnsmasq:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Updated to work for 1.0 source format

[Andreas Hasenack (ahasenack)]

Ugh, 1.0 format...

Ok, no further discussion in the ML, and the upstream git repo has had no further commits since 4d85e409cd2f4b0935d6ac5e8c72f6a151735d52 which introduced the break.

Can you just fix the commit message of a1359421df5a8a4be95b95d9c8caea2248f4a463 please?

And maybe add a link to http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2020q3/014345.html? It's a bit long for d/changelog, but I don't know where else to put it :(

Up to you wrt the link

review: Approve

[Christian Ehrhardt  (paelzer)]

Fixed the wording to match 1.0 format behavior, added a note for it and linked to the upstream discussion.

[Christian Ehrhardt  (paelzer)]

The tests confirmed the issue that Iain reported and that the fix works.

Old (there are many, but I picked test_wpa2_ip6):
 AssertionError: Regex didn't match:
 'inet6 2600::[0-9a-f:]+/64 scope global (?:tentative )?(?:mngtmpaddr )?(?:noprefixroute )?dynamic'

     inet6 2600::6020:9609:2ebc:7103/64 scope global temporary dynamic
                  ^^- temporary should not be here
     inet6 2600::8405:af0d:f0b3:c3a5/64 scope global mngtmpaddr noprefixroute
                  ^^- dynamic missing for this rule to match

With the new build these tests now work fine.

[Christian Ehrhardt  (paelzer)]

autopkgtest [08:37:22]: test nm.py: [-----------------------
test_auto_ip4 (__main__.ColdplugEthernet)
ethernet: auto-connection, IPv4 ... ok
test_auto_ip6_dhcp (__main__.ColdplugEthernet)
ethernet: auto-connection, IPv6 with DHCP ... ok
test_auto_ip6_raonly_no_pe (__main__.ColdplugEthernet)
ethernet: auto-connection, IPv6 with only RA, PE disabled ... ok
test_manual_ip4 (__main__.ColdplugEthernet)
ethernet: manual connection, IPv4 ... ok
test_manual_ip6_raonly_pubaddr (__main__.ColdplugEthernet)
ethernet: manual connection, IPv6 with only RA, preferring public address ... ok
test_manual_ip6_raonly_tmpaddr (__main__.ColdplugEthernet)
ethernet: manual connection, IPv6 with only RA, preferring temp address ... ok
test_no_ap (__main__.ColdplugWifi)
no available access point ... ok
test_open_b_ip4 (__main__.ColdplugWifi)
Open network, 802.11b, IPv4 ... ok
test_open_b_ip6_dhcp (__main__.ColdplugWifi)
Open network, 802.11b, IPv6 with DHCP, preferring temp address ... ok
test_open_b_ip6_raonly_no_pe (__main__.ColdplugWifi)
Open network, 802.11b, IPv6 with only RA, PE disabled ... ok
test_open_b_ip6_raonly_pubaddr (__main__.ColdplugWifi)
Open network, 802.11b, IPv6 with only RA, preferring public address ... ok
test_open_b_ip6_raonly_tmpaddr (__main__.ColdplugWifi)
Open network, 802.11b, IPv6 with only RA, preferring temp address ... ok
test_open_g_ip4 (__main__.ColdplugWifi)
Open network, 802.11g, IPv4 ... ok
test_rfkill (__main__.ColdplugWifi)
shut down connection on killswitch, restore it on unblock ... ok
test_wpa1_ip4 (__main__.ColdplugWifi)
WPA1, 802.11g, IPv4 ... ok
test_wpa2_ip4 (__main__.ColdplugWifi)
WPA2, 802.11g, IPv4 ... ok
test_wpa2_ip6 (__main__.ColdplugWifi)
WPA2, 802.11g, IPv6 with only RA ... ok
test_auto_detect_ap (__main__.Hotplug)
new AP is being detected automatically within 30s ... expected failure
test_auto_detect_eth (__main__.Hotplug)
new eth router is being detected automatically within 30s ... Cannot find device "eth0"
cat: /sys/class/net/eth0/ifindex: No such file or directory
expected failure

----------------------------------------------------------------------
Ran 19 tests in 218.566s

OK (expected failures=2)

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/dnsmasq
 * [new tag] upload/2.82-1ubuntu1 -> upload/2.82-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dnsmasq_2.82-1ubuntu1.dsc: done.
  Uploading dnsmasq_2.82-1ubuntu1.diff.gz: done.
  Uploading dnsmasq_2.82-1ubuntu1_source.buildinfo: done.
  Uploading dnsmasq_2.82-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index f041f98..d1a41e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dnsmasq (2.82-1ubuntu1) groovy; urgency=medium
+
+  * src/radv.c: avoid leases to be issued forever when not set (LP: #1894619)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 16 Sep 2020 14:26:58 +0200
+
 dnsmasq (2.82-1) unstable; urgency=low
 
    * New upstream.
diff --git a/debian/control b/debian/control
index 0407eb3..ad1a417 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Build-depends: gettext, libnetfilter-conntrack-dev [linux-any],
                nettle-dev (>=2.4-3), libbsd-dev [kfreebsd-any],
 	       liblua5.2-dev, dh-runit, debhelper-compat (= 10),
                pkg-config
-Maintainer: Simon Kelley <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Simon Kelley <[e-mail]>
 Homepage: http://www.thekelleys.org.uk/dnsmasq/doc.html
 Vcs-Git: http://thekelleys.org.uk/git/dnsmasq.git
 Vcs-Browser: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
diff --git a/src/radv.c b/src/radv.c
index 41df852..269d3c4 100644
--- a/src/radv.c
+++ b/src/radv.c
@@ -628,8 +628,9 @@ 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. */
-		if ((context->flags & CONTEXT_SETLEASE) &&
+		   use that as a floor.
+		   Always set lease time if requested to do so. */
+		if ((context->flags & CONTEXT_SETLEASE) ||
 		    time > context->lease_time)
 		  {
 		    time = context->lease_time;