Re: [Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
This is in proposed and working fine there. -- 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. -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
The proposal to merge ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel has been updated. Status: Approved => Merged 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. -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
The proposal to merge ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel has been updated. Status: Needs review => Approved 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. -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
Re: [Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
I wasn't aware of that tree - thanks for the hint, I cloned rebased and pushed the change there as well. To ssh://git.launchpad.net/ubuntu/+source/network-manager * [new tag] upload/1.30.0-1ubuntu4 -> upload/1.30.0-1ubuntu4 Uploading to ubuntu (via ftp to upload.ubuntu.com): Uploading network-manager_1.30.0-1ubuntu4.dsc: done. Uploading network-manager_1.30.0-1ubuntu4.debian.tar.xz: done. Uploading network-manager_1.30.0-1ubuntu4_source.buildinfo: done. Uploading network-manager_1.30.0-1ubuntu4_source.changes: done. Successfully uploaded packages. And to also cover this extra repo: To git+ssh://git.launchpad.net/network-manager 87d561d6..9996e637 ubuntu/master -> ubuntu/master -- 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. -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
Re: [Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
Hi, I thought about dropping dynamic - but not ALL test cases switch to forever. There were a few that still returned dynamic (something with a wireless connection for example). I decided against a massive matrix of testcase->output and went for the simple yet reasonable change. -- 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. -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
Re: [Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
Review: Approve Thanks Christian. Assuming you've tested this it looks fine to merge, but two things - I'm not sure we shouldn't drop 'dynamic' if that's not expected any more (and bump the required version of dnsmasq then). I could go either way on this - what do you think? - Please do the change in https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu/+ref/ubuntu/master Feel free to make the change, or not, merge and upload - thanks! -- 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. -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Desktop-packages] [Merge] ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel
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 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 : desktop-packages@lists.launchpad.net
Unsubscribe : https://launchpad.net/~desktop-packages
More help : https://help.launchpad.net/ListHelp
