Christian Ehrhardt  has proposed merging 
~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior 
into ubuntu/+source/network-manager:ubuntu/impish-devel.

Requested reviews:
  Desktop Packages (desktop-packages)
  Iain Lane (laney)
  Canonical Server Team (canonical-server)
  Canonical Server packageset reviewers (canonical-server-packageset-reviewers)
  Ubuntu Server Dev import team (usd-import-team)
Related bugs:
  Bug #1894619 in dnsmasq (Ubuntu): "[2.82 regression] router announcements 
have 'forever' lifetime by default"
  https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/1894619

For more details, see:
https://code.launchpad.net/~paelzer/ubuntu/+source/network-manager/+git/network-manager/+merge/405081
-- 
Your team Desktop Packages is requested to review the proposed merge of 
~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior 
into ubuntu/+source/network-manager:ubuntu/impish-devel.
diff --git a/debian/changelog b/debian/changelog
index ec1fe7b..31ddee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.30.0-1ubuntu4) impish; urgency=medium
+
+  * d/t/nm.py: adapt to changes dnsmasq behavior (LP: #1894619)
+
+ -- Christian Ehrhardt <[email protected]>  Fri, 02 Jul 2021 11:13:46 +0200
+
 network-manager (1.30.0-1ubuntu3) hirsute; urgency=medium
 
   * SECURITY UPDATE: crash via setting match.path
diff --git a/debian/tests/nm.py b/debian/tests/nm.py
index f4fe46d..529f4cb 100755
--- a/debian/tests/nm.py
+++ b/debian/tests/nm.py
@@ -357,7 +357,7 @@ class NetworkManagerTest(network_test_base.NetworkTestBase):
                 expected_ip_a.append('inet6 2600::[0-9a-f]+/')
             else:
                 # has address with our prefix and MAC
-                expected_ip_a.append('inet6 2600::[0-9a-f:]+/64 scope global (?:tentative )?(?:mngtmpaddr )?(?:noprefixroute )?dynamic')
+                expected_ip_a.append('inet6 2600::[0-9a-f:]+/64 scope global (?:tentative )?(?:mngtmpaddr )?(?:noprefixroute )?(dynamic|\n\s*valid_lft forever preferred_lft forever)')
                 # has address with our prefix and random IP (Privacy
                 # Extension), if requested
                 priv_re = 'inet6 2600:[0-9a-f:]+/64 scope global temporary (?:tentative )?(?:mngtmpaddr )?dynamic'
-- 
Mailing list: https://launchpad.net/~desktop-packages
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~desktop-packages
More help   : https://help.launchpad.net/ListHelp

Reply via email to