Merge NetworkManager with Debian 1.10.0-1

Bug #1734586 reported by Jeremy Bícha
18
This bug affects 2 people
Affects Status Importance Assigned to Milestone
network-manager (Ubuntu)
Fix Released
Wishlist
Unassigned
python-dbusmock (Ubuntu)
Fix Released
High
Unassigned

Bug Description

Debian has packaged the latest major release of NetworkManager, 1.10. We should update to this version for Ubuntu 18.04 "bionic".

I have prepared the merge at
https://git.launchpad.net/network-manager?h=bionic

The only thing missing is that this patch needs to be rebased or dropped:
https://git.launchpad.net/network-manager/tree/debian/patches/dns-manager-don-t-merge-split-DNS-search-domains.patch?h=bionic

Otherwise, the build will fail:

src/.libs/libNetworkManagerTest.a(src_libNetworkManager_la-nm-dns-manager.o):
In function `merge_one_ip_config_data':
./src/dns/nm-dns-manager.c:417: undefined reference to
`nm_ip4_config_get_never_default'
./src/dns/nm-dns-manager.c:419: undefined reference to
`nm_ip4_config_get_never_default'

There's been a lot of refactoring, but this commit looks important:
https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=5c29945

Revision history for this message
Sebastien Bacher (seb128) wrote :

@Mathieu, seems you wrote that patch, could you have a look? (do you know if it was upstream/if there is a corresponding upstream report)

Revision history for this message
Sebastien Bacher (seb128) wrote :

is the issue the patch try to resolve the same as https://bugzilla.gnome.org/show_bug.cgi?id=782469 ?

Revision history for this message
Jeremy Bícha (jbicha) wrote :

I have re-merged with Debian in the same bionic branch. (Next time I do a merge like this that gets stuck, I should use a different branch name so that 'bionic' could actually represent what is currently in 'bionic'.)

dns-manager-don-t-merge-split-DNS-search-domains.patch won't even apply now.

The merge also includes the postinst fix from 1.8.4-1ubuntu4.

I have dropped the 3 Ubuntu Phone related patches Tony Espy mentioned today.

And I've dropped the diff that disabled libteam support now that the libteam MIR was approved.

Revision history for this message
Launchpad Janitor (janitor) wrote :

Status changed to 'Confirmed' because the bug affects multiple users.

Changed in network-manager (Ubuntu):
status: New → Confirmed
Revision history for this message
Jeremy Bícha (jbicha) wrote :
Changed in network-manager (Ubuntu):
status: Confirmed → Fix Committed
Revision history for this message
Bryan Quigley (bryanquigley) wrote :

Autopkgtets, The urfkill-intergration is failing because if you start network-manager first, it clears the rfkill flags.

I think it should be safe to assume network-manager should start before urfkill - in that case removing the last network-manager stop (and the resulting start one) and I think we should be good for that test.

The python-dbusmock changes I believe are mostly due to upstream commit 6fde475b2705381eb54350f116e978659f28b004. "...This basically uses "wifi" in place of "802-11-wireless" and analogously..."

I was able to get the python file to do all pass with the changes listed in https://pastebin.ubuntu.com/=BFwMCgTKkv/.

I plan to submit the python-dbusmock changes upstream.

Revision history for this message
Bryan Quigley (bryanquigley) wrote :

Python-dbusmock upstream - https://github.com/martinpitt/python-dbusmock/issues/37

Although I don't think we should delay network-manager because of it..

Revision history for this message
Sebastien Bacher (seb128) wrote :

the python-dbusmock fix has been commited upstream, now the n-m one needs to be resolved

Changed in python-dbusmock (Ubuntu):
importance: Undecided → High
status: New → In Progress
Revision history for this message
Sebastien Bacher (seb128) wrote :
Changed in python-dbusmock (Ubuntu):
status: In Progress → Fix Committed
Changed in python-dbusmock (Ubuntu):
status: Fix Committed → Fix Released
Revision history for this message
Bryan Quigley (bryanquigley) wrote :

Here's the changes for the test. Confirmed test using local autopkgtest to the source package.

Revision history for this message
Ubuntu Foundations Team Bug Bot (crichton) wrote :

The attachment "network-manager_1.10.4-1ubuntu2.debdiff" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

tags: added: patch
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Uploaded Bryan's patch so I'm unsubscribing ubuntu-sponsors. Thanks!

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package network-manager - 1.10.4-1ubuntu2

---------------
network-manager (1.10.4-1ubuntu2) bionic; urgency=medium

  [ Bryan Quigley ]
  * debian/tests/urfkill-integration - don't stop/start network manager

  [ Jeremy Bicha ]
  * Cherry-pick patch from 1.10 branch to fix double prompt for wifi password
    on Kubuntu (LP: #1572244)

 -- Bryan Quigley <email address hidden> Fri, 23 Feb 2018 13:52:48 -0500

Changed in network-manager (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.