Merge tag 'debian/1.34.0-2' into ubuntu/master

network-manager Debian release 1.34.0-2

11 files changed, 156 insertions, 81 deletions

diff --git a/debian/changelog b/debian/changelog
index 1c00736a..1653cffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,99 @@
+network-manager (1.34.0-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize on Debian, remaining changes:
+    - debian/control:
+      + Depend on isc-dhcp-client
+      + Recommend network-manager-pptp
+      + Suggest avahi-autoipd for IPv4LL support
+    - debian/rules:
+      + Run build tests
+      + Set --enable-lto.
+      + Build without symbolic functions, needed for tests to pass on Ubuntu
+      + Don't build the network-manager* packages on i386
+        (unneeded and depends on wpasupplicant)
+    - debian/rules, debian/network-manager.postinst:
+      + Don't restart NetworkManager on upgrade but recommend restarting
+        the computer
+    - debian/rules, debian/network-manager.postinst:
+      + Don't install sysvinit scripts or migrate from sysvinit
+    - d/network-manager.install, d/rules, d/10-dns-resolved.conf:
+      + Use systemd-resolved instead of dnsmasq
+    - d/network-manager.install, d/10-globally-managed-devices.conf:
+      + Explicitly unmanage everything that isn't WiFi or WWAN (mobile data)
+    - debian/network-manager.postinst:
+      + Don't add the netdev group.
+      + drop in an empty override file for NetworkManager to manage all
+        devices for upgrade from any version, as long as there is no
+        netplan configuration yet.
+    - d/network-manager.install, d/default-wifi-powersave-on.conf:
+      + Install a config file to enable WiFi powersave
+    - Add autopkgtests
+    - debian/source_network-manager.py, debian/network-manager.install,
+      debian/network-manager.links: Add apport hook
+    - Add network-manager-config-connectivity-ubuntu package
+    - d/NetworkManager.conf: disable MAC randomization feature. There is no
+      easy way for desktop users to disable this feature yet. And there are
+      reports that it doesn't work well with some systems.
+    - Update Vcs links to point to Ubuntu branch
+    - Add patches. See patch descriptions for more details:
+      + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
+      + Update-dnsmasq-parameters.patch
+      + Disable-general-with-expect.patch
+      + libnm-Check-self-still-NMManager-or-not.patch
+      + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
+      + Read-system-connections-from-run.patch
+      + ubuntu_revert_systemd.patch
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Thu, 03 Feb 2022 09:47:11 -0500
+
+network-manager (1.34.0-2) unstable; urgency=medium
+
+  * Demote wpasupplicant to Recommends.
+    There are enough use cases for network-manager not involving Wi-Fi which
+    justifies to make this dependency optional. (Closes: #919619, #980218)
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 18 Jan 2022 20:59:36 +0100
+
+network-manager (1.34.0-1) unstable; urgency=medium
+
+  * New upstream version 1.34.0
+  * Rebase patches
+  * Install nm-priv-helper service
+  * Update symbols file for libnm0
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 14 Jan 2022 00:18:58 +0100
+
+network-manager (1.32.12-1) unstable; urgency=medium
+
+  * New upstream version 1.32.12
+  * Rebase patches
+  * Update symbols file for libnm0
+  * Bump Standards-Version to 4.6.0
+  * Drop dh_missing override.
+    As --fail-missing is the default in compat 13, the override is no longer
+    necessary.
+  * Remove obsolete upgrade code
+  * Drop obsolete Breaks/Replaces
+  * Update debian/copyright
+  * Remove isc-dhcp-client from Suggests.
+    Unless explicitly configured otherwise the internal DHCP client is used.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 02 Oct 2021 09:42:17 +0200
+
+network-manager (1.30.6-1) unstable; urgency=medium
+
+  * New upstream version 1.30.6
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 16 Aug 2021 09:56:57 +0200
+
+network-manager (1.30.0-2) unstable; urgency=medium
+
+  * core: fix crash in nm_wildcard_match_check()
+    (CVE-2021-20297, Closes: #986809)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 12 Apr 2021 21:15:36 +0200
+
 network-manager (1.32.12-0ubuntu2) jammy; urgency=medium
 
   * debian/tests: drop which usage to fix adt failure in jammy
diff --git a/debian/control b/debian/control
index 06e05a33..7a0e060b 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Build-Depends: debhelper-compat (= 13),
                dbus <!nocheck>,
                python3-dbus <!nocheck>,
                iproute2 <!nocheck>,
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Rules-Requires-Root: no
 XS-Debian-Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager
@@ -51,8 +51,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libnm0 (= ${binary:Version}),
-         wpasupplicant,
          dbus,
+         isc-dhcp-client,
          udev,
          adduser,
          policykit-1
@@ -62,15 +62,15 @@ Recommends: ppp,
             modemmanager,
             network-manager-pptp,
             wireless-regdb,
+            wpasupplicant,
             libpam-systemd,
 Suggests: avahi-autoipd,
           libteam-utils,
-          isc-dhcp-client,
 Breaks: ${misc:Breaks}
 Description: network management framework (daemon and userspace tools)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
- available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ available. It manages ethernet, Wi-Fi, mobile broadband (WWAN), and PPPoE
  devices, and provides VPN integration with a variety of different VPN
  services.
  .
@@ -107,7 +107,7 @@ Depends: ${shlibs:Depends},
 Description: GObject-based client library for NetworkManager
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
- available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ available. It manages ethernet, Wi-Fi, mobile broadband (WWAN), and PPPoE
  devices, and provides VPN integration with a variety of different VPN
  services.
  .
@@ -125,7 +125,7 @@ Depends: ${misc:Depends},
 Description: GObject-based client library for NetworkManager (development files)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
- available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ available. It manages ethernet, Wi-Fi, mobile broadband (WWAN), and PPPoE
  devices, and provides VPN integration with a variety of different VPN
  services.
  .
@@ -138,12 +138,10 @@ Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Breaks: gir1.2-networkmanager-1.0 (<< 1.8.0-2)
-Replaces: gir1.2-networkmanager-1.0 (<< 1.8.0-2)
 Description: GObject introspection data for the libnm library
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
- available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
+ available. It manages ethernet, Wi-Fi, mobile broadband (WWAN), and PPPoE
  devices, and provides VPN integration with a variety of different VPN
  services.
  .
diff --git a/debian/copyright b/debian/copyright
index c802a459..6417d5ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,27 +3,21 @@ Upstream-Name: NetworkManager
 Source: https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/
 
 Files: *
-Copyright: 2004 - 2016 Red Hat, Inc.
+Copyright: 2004 - 2019 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: GPL-2+
 
-Files: libnm-util/*
-       libnm-glib/*
-       libnm-core/*
-       libnm/*
-       shared/*
-Copyright: 2005 - 2016 Red Hat, Inc.
+Files: src/lib*
+Copyright: 2005 - 2019 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
-License: LGPL-2+
+License: LGPL-2.1+
 
-Files: src/systemd/*
-Copyright: 2013 - 2015 Tom Gundersen
-           2010 - 2015 Lennart Poettering
-           2014 Susant Sahani
+Files: src/libnm-systemd-*
+Copyright: 2014 - 2019 Red Hat, Inc.
            2014 - 2015 Intel Corporation. All rights reserved.
 License: LGPL-2.1+
 
-Files: doc/*
+Files: docs/*
        man/*
 Copyright: 2012 - 2016 The NetworkManager Authors
 License: GFDL-NIV-1.1+
@@ -45,23 +39,6 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: LGPL-2+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-2".
-
 License: LGPL-2.1+
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols
index cdc84629..612ecf54 100644
--- a/debian/libnm0.symbols
+++ b/debian/libnm0.symbols
@@ -24,8 +24,10 @@ libnm.so.0 libnm0 #MINVER#
  libnm_1_2_0@libnm_1_2_0 1.1.90
  libnm_1_2_4@libnm_1_2_4 1.2.4
  libnm_1_30_0@libnm_1_30_0 1.29.90
- libnm_1_32_0@libnm_1_32_0 1.32.2
- libnm_1_32_4@libnm_1_32_4 1.32.10
+ libnm_1_30_8@libnm_1_30_8 1.34.0
+ libnm_1_32_0@libnm_1_32_0 1.32.12
+ libnm_1_32_4@libnm_1_32_4 1.32.12
+ libnm_1_34_0@libnm_1_34_0 1.34.0
  libnm_1_4_0@libnm_1_4_0 1.4.0
  libnm_1_6_0@libnm_1_6_0 1.5.90
  libnm_1_8_0@libnm_1_8_0 1.8.0
@@ -329,6 +331,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_device_get_nm_plugin_missing@libnm_1_2_0 1.1.90
  nm_device_get_path@libnm_1_26_0 1.25.90
  nm_device_get_physical_port_id@libnm_1_0_0 1.0.0
+ nm_device_get_ports@libnm_1_34_0 1.34.0
  nm_device_get_product@libnm_1_0_0 1.0.0
  nm_device_get_setting_type@libnm_1_0_0 1.0.0
  nm_device_get_state@libnm_1_0_0 1.0.0
@@ -493,11 +496,12 @@ libnm.so.0 libnm0 #MINVER#
  nm_dns_entry_unref@libnm_1_6_0 1.5.90
  nm_ethtool_optname_is_coalesce@libnm_1_26_0 1.25.90
  nm_ethtool_optname_is_feature@libnm_1_14_8 1.19.90
- nm_ethtool_optname_is_pause@libnm_1_32_0 1.32.2
+ nm_ethtool_optname_is_pause@libnm_1_32_0 1.32.12
  nm_ethtool_optname_is_ring@libnm_1_26_0 1.25.90
  nm_ip_address_cmp_flags_get_type@libnm_1_22_0 1.22.0
  nm_ip_address_cmp_full@libnm_1_22_0 1.22.0
- nm_ip_address_dup@libnm_1_32_0 1.32.2
+ nm_ip_address_dup@libnm_1_30_8 1.34.0
+ nm_ip_address_dup@libnm_1_32_0 1.32.12
  nm_ip_address_equal@libnm_1_0_0 1.0.0
  nm_ip_address_get_address@libnm_1_0_0 1.0.0
  nm_ip_address_get_address_binary@libnm_1_0_0 1.0.0
@@ -524,7 +528,8 @@ libnm.so.0 libnm0 #MINVER#
  nm_ip_config_get_type@libnm_1_0_0 1.0.0
  nm_ip_config_get_wins_servers@libnm_1_0_0 1.0.0
  nm_ip_route_attribute_validate@libnm_1_8_0 1.8.0
- nm_ip_route_dup@libnm_1_32_0 1.32.2
+ nm_ip_route_dup@libnm_1_30_8 1.34.0
+ nm_ip_route_dup@libnm_1_32_0 1.32.12
  nm_ip_route_equal@libnm_1_0_0 1.0.0
  nm_ip_route_equal_full@libnm_1_10_0 1.9.90
  nm_ip_route_get_attribute@libnm_1_0_0 1.0.0
@@ -573,6 +578,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_ip_routing_rule_get_to_len@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_get_tos@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_get_type@libnm_1_18_0 1.18.0
+ nm_ip_routing_rule_get_uid_range@libnm_1_34_0 1.34.0
  nm_ip_routing_rule_is_sealed@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_new@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_new_clone@libnm_1_18_0 1.18.0
@@ -592,6 +598,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_ip_routing_rule_set_table@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_set_to@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_set_tos@libnm_1_18_0 1.18.0
+ nm_ip_routing_rule_set_uid_range@libnm_1_34_0 1.34.0
  nm_ip_routing_rule_to_string@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_unref@libnm_1_18_0 1.18.0
  nm_ip_routing_rule_validate@libnm_1_18_0 1.18.0
@@ -779,6 +786,9 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_bond_get_type@libnm_1_0_0 1.0.0
  nm_setting_bond_get_valid_options@libnm_1_0_0 1.0.0
  nm_setting_bond_new@libnm_1_0_0 1.0.0
+ nm_setting_bond_port_get_queue_id@libnm_1_34_0 1.34.0
+ nm_setting_bond_port_get_type@libnm_1_34_0 1.34.0
+ nm_setting_bond_port_new@libnm_1_34_0 1.34.0
  nm_setting_bond_remove_option@libnm_1_0_0 1.0.0
  nm_setting_bond_validate_option@libnm_1_0_0 1.0.0
  nm_setting_bridge_add_vlan@libnm_1_18_0 1.18.0
@@ -839,6 +849,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_connection_add_secondary@libnm_1_0_0 1.0.0
  nm_setting_connection_autoconnect_slaves_get_type@libnm_1_0_4 1.0.4
  nm_setting_connection_autoconnect_slaves_get_type@libnm_1_2_0 1.1.90
+ nm_setting_connection_dns_over_tls_get_type@libnm_1_34_0 1.34.0
  nm_setting_connection_get_auth_retries@libnm_1_10_0 1.9.90
  nm_setting_connection_get_autoconnect@libnm_1_0_0 1.0.0
  nm_setting_connection_get_autoconnect_priority@libnm_1_0_0 1.0.0
@@ -846,6 +857,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_connection_get_autoconnect_slaves@libnm_1_0_4 1.0.4
  nm_setting_connection_get_autoconnect_slaves@libnm_1_2_0 1.1.90
  nm_setting_connection_get_connection_type@libnm_1_0_0 1.0.0
+ nm_setting_connection_get_dns_over_tls@libnm_1_34_0 1.34.0
  nm_setting_connection_get_gateway_ping_timeout@libnm_1_0_0 1.0.0
  nm_setting_connection_get_id@libnm_1_0_0 1.0.0
  nm_setting_connection_get_interface_name@libnm_1_0_0 1.0.0
@@ -1004,7 +1016,8 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_ip_config_get_num_dns_searches@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_num_routes@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_num_routing_rules@libnm_1_18_0 1.18.0
- nm_setting_ip_config_get_required_timeout@libnm_1_32_4 1.32.10
+ nm_setting_ip_config_get_required_timeout@libnm_1_30_8 1.34.0
+ nm_setting_ip_config_get_required_timeout@libnm_1_32_4 1.32.12
  nm_setting_ip_config_get_route@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_route_metric@libnm_1_0_0 1.0.0
  nm_setting_ip_config_get_route_table@libnm_1_10_0 1.9.90
@@ -1079,7 +1092,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_match_get_path@libnm_1_26_0 1.25.90
  nm_setting_match_get_paths@libnm_1_26_0 1.25.90
  nm_setting_match_get_type@libnm_1_14_0 1.13.90
- nm_setting_match_new@libnm_1_32_0 1.32.2
+ nm_setting_match_new@libnm_1_32_0 1.32.12
  nm_setting_match_remove_driver@libnm_1_26_0 1.25.90
  nm_setting_match_remove_driver_by_value@libnm_1_26_0 1.25.90
  nm_setting_match_remove_interface_name@libnm_1_14_0 1.13.90
@@ -1325,7 +1338,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_wired_add_mac_blacklist_item@libnm_1_0_0 1.0.0
  nm_setting_wired_add_s390_option@libnm_1_0_0 1.0.0
  nm_setting_wired_clear_mac_blacklist_items@libnm_1_0_0 1.0.0
- nm_setting_wired_get_accept_all_mac_addresses@libnm_1_32_0 1.32.2
+ nm_setting_wired_get_accept_all_mac_addresses@libnm_1_32_0 1.32.12
  nm_setting_wired_get_auto_negotiate@libnm_1_0_0 1.0.0
  nm_setting_wired_get_cloned_mac_address@libnm_1_0_0 1.0.0
  nm_setting_wired_get_duplex@libnm_1_0_0 1.0.0
diff --git a/debian/network-manager.bug-control b/debian/network-manager.bug-control
new file mode 100644
index 00000000..78581f83
--- /dev/null
+++ b/debian/network-manager.bug-control
@@ -0,0 +1 @@
+package-status: isc-dhcp-client
diff --git a/debian/network-manager.install b/debian/network-manager.install
index ed4c2e0b..c969c8dc 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -14,6 +14,7 @@ usr/share/man/
 usr/share/dbus-1/system-services/
 usr/share/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 usr/share/dbus-1/system.d/nm-dispatcher.conf
+usr/share/dbus-1/system.d/nm-priv-helper.conf
 usr/share/polkit-1/
 usr/share/bash-completion/
 etc/NetworkManager/
@@ -22,9 +23,11 @@ lib/udev/rules.d/*.rules
 lib/systemd/system/NetworkManager.service
 lib/systemd/system/NetworkManager-dispatcher.service
 lib/systemd/system/NetworkManager-wait-online.service
+lib/systemd/system/nm-priv-helper.service
 debian/NetworkManager.conf etc/NetworkManager/
 debian/org.freedesktop.NetworkManager.pkla var/lib/polkit-1/localauthority/10-vendor.d/
-debian/10-*.conf usr/lib/NetworkManager/conf.d/
 debian/60-network-manager.rules usr/share/polkit-1/rules.d/
 debian/01-ifupdown etc/NetworkManager/dispatcher.d/
+debian/10-*.conf usr/lib/NetworkManager/conf.d/
+debian/default-wifi-powersave-on.conf etc/NetworkManager/conf.d
 debian/source_network-manager.py /usr/share/apport/package-hooks/
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index bb7498aa..47090bb9 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1,4 +1 @@
-mv_conffile /etc/NetworkManager/dispatcher.d/01ifupdown /etc/NetworkManager/dispatcher.d/01-ifupdown 1.8.0-5~
-rm_conffile /etc/dbus-1/system.d/nm-dispatcher.conf 1.14.4-4~
-rm_conffile /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 1.14.4-4~
 rm_conffile /etc/init.d/network-manager 1.25.91-1~
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index 446a5513..daf65243 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -48,13 +48,6 @@ case "$1" in
             fi
         fi
 
-        # Fix up existing /etc/resolv.conf symlinks after the migration to /run
-        if dpkg --compare-versions "$2" lt-nl "1.8.0-4"; then
-            if [ "$(readlink /etc/resolv.conf)" = /var/run/NetworkManager/resolv.conf ] ; then
-                ln -sf  /run/NetworkManager/resolv.conf /etc/resolv.conf
-            fi
-        fi
-
 	if dpkg --compare-versions "$2" le-nl "9999"; then
 		mkdir -p /etc/NetworkManager/conf.d || true
 		# for old versions, override the global config with a null config,
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 2af94a6f..bd8cad96 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -11,11 +11,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  src/core/nm-manager.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 115 insertions(+)
 
-Index: network-manager/src/core/nm-manager.c
-===================================================================
---- network-manager.orig/src/core/nm-manager.c
-+++ network-manager/src/core/nm-manager.c
-@@ -52,6 +52,8 @@
+diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
+index 3c9660c..62ffdd0 100644
+--- a/src/core/nm-manager.c
++++ b/src/core/nm-manager.c
+@@ -51,6 +51,8 @@
  
  #define DEVICE_STATE_PRUNE_RATELIMIT_MAX 100u
  
@@ -24,7 +24,7 @@ Index: network-manager/src/core/nm-manager.c
  /*****************************************************************************/
  
  typedef struct {
-@@ -187,6 +189,10 @@ typedef struct {
+@@ -186,6 +188,10 @@ typedef struct {
      GFileMonitor *fw_monitor;
      guint         fw_changed_id;
  
@@ -35,7 +35,7 @@ Index: network-manager/src/core/nm-manager.c
      guint timestamp_update_id;
  
      guint devices_inited_id;
-@@ -1471,6 +1477,27 @@ find_best_device_state(NMManager *manage
+@@ -1477,6 +1483,27 @@ find_best_device_state(NMManager *manager)
      return best_state;
  }
  
@@ -63,7 +63,7 @@ Index: network-manager/src/core/nm-manager.c
  static void
  nm_manager_update_metered(NMManager *self)
  {
-@@ -1517,6 +1544,9 @@ nm_manager_update_state(NMManager *self)
+@@ -1523,6 +1550,9 @@ nm_manager_update_state(NMManager *self)
      else
          new_state = find_best_device_state(self);
  
@@ -73,10 +73,11 @@ Index: network-manager/src/core/nm-manager.c
      if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
          new_state = NM_STATE_CONNECTED_GLOBAL;
      }
-@@ -6647,6 +6677,62 @@ impl_manager_set_logging(NMDBusObject *
+@@ -6671,6 +6701,62 @@ impl_manager_set_logging(NMDBusObject *                     obj,
+         g_dbus_method_invocation_return_value(invocation, NULL);
  }
  
- static void
++static void
 +check_ifstate_file(gpointer user_data)
 +{
 +    NMManager        *self   = NM_MANAGER(user_data);
@@ -132,11 +133,10 @@ Index: network-manager/src/core/nm-manager.c
 +    }
 +}
 +
-+static void
+ static void
  impl_manager_get_logging(NMDBusObject *                     obj,
                           const NMDBusInterfaceInfoExtended *interface_info,
-                          const NMDBusMethodInfoExtended *   method_info,
-@@ -6969,6 +7055,9 @@ nm_manager_start(NMManager *self, GError
+@@ -6999,6 +7085,9 @@ nm_manager_start(NMManager *self, GError **error)
      nm_clear_g_source(&priv->devices_inited_id);
      priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -146,7 +146,7 @@ Index: network-manager/src/core/nm-manager.c
      return TRUE;
  }
  
-@@ -7949,6 +8038,22 @@ nm_manager_init(NMManager *self)
+@@ -7979,6 +8068,22 @@ nm_manager_init(NMManager *self)
          _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR);
      }
  
@@ -169,7 +169,7 @@ Index: network-manager/src/core/nm-manager.c
      /* Update timestamps in active connections */
      priv->timestamp_update_id =
          g_timeout_add_seconds(300,
-@@ -8232,6 +8337,16 @@ dispose(GObject *object)
+@@ -8262,6 +8367,16 @@ dispose(GObject *object)
          g_clear_object(&priv->fw_monitor);
      }
  
diff --git a/debian/patches/ubuntu_revert_systemd.patch b/debian/patches/ubuntu_revert_systemd.patch
index 1eb2508b..9b1b1e78 100644
--- a/debian/patches/ubuntu_revert_systemd.patch
+++ b/debian/patches/ubuntu_revert_systemd.patch
@@ -1,3 +1,7 @@
+Description: temporarly revert an upstream commit that made udev enabled under lxc
+the new systemd doesn't work there (lp: #1914062)
+
+
 Index: network-manager/src/libnm-platform/nm-linux-platform.c
 ===================================================================
 --- network-manager.orig/src/libnm-platform/nm-linux-platform.c
diff --git a/debian/rules b/debian/rules
index 4d6e65f5..f97e9391 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,13 +73,6 @@ override_dh_install:
 	rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager
 	dh_install
 
-override_dh_missing:
-	dh_missing --fail-missing
-
-	# copy powersave configuration
-	mkdir -p debian/network-manager/etc/NetworkManager/conf.d
-	cp debian/default-wifi-powersave-on.conf debian/network-manager/etc/NetworkManager/conf.d/
-
 override_dh_installinit:
 	dh_installinit --noscripts
 
@@ -87,7 +80,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
 
 override_dh_installsystemd:
-	dh_installsystemd -pnetwork-manager --no-start NetworkManager-dispatcher.service NetworkManager-wait-online.service
+	dh_installsystemd -pnetwork-manager --no-start NetworkManager-dispatcher.service NetworkManager-wait-online.service nm-priv-helper.service
 	dh_installsystemd -pnetwork-manager --no-also NetworkManager.service
 
 override_dh_ppp: