Merge tag 'debian/1.36.2-1' into ubuntu/master

network-manager Debian release 1.36.2-1

2 files changed, 65 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 20d443ea..d41725c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,64 @@
+network-manager (1.36.2-1ubuntu1) 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.
+      + 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.
+      See gnome-control-center issue 743
+    - 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
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Thu, 24 Feb 2022 15:06:34 -0500
+
+network-manager (1.36.2-1) unstable; urgency=medium
+
+  * New upstream version 1.36.2
+  * Rebase patches
+  * Downgrade log message to info if we fail to open /run/network/ifstate
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 08 Mar 2022 09:50:49 +0100
+
+network-manager (1.36.0-2) unstable; urgency=medium
+
+  * core: initialize l3cd dns-priority for ppp and wwan (Closes: #1006396)
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 26 Feb 2022 10:57:32 +0100
+
 network-manager (1.36.0-1ubuntu1) jammy; urgency=medium
 
   * Resynchronize on Debian, remaining changes:
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index e009f715..4765891f 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 115 insertions(+)
 
 diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
-index b440b22..9b1057f 100644
+index 6c73d23..9a73a16 100644
 --- a/src/core/nm-manager.c
 +++ b/src/core/nm-manager.c
 @@ -51,6 +51,8 @@
@@ -88,7 +88,7 @@ index b440b22..9b1057f 100644
 +
 +    channel = g_io_channel_new_file(IFUPDOWN_STATE_FILE, "r", NULL);
 +    if (!channel) {
-+        nm_log_warn(LOGD_CORE, "Error: failed to open %s", IFUPDOWN_STATE_FILE);
++        nm_log_info(LOGD_CORE, "failed to open %s", IFUPDOWN_STATE_FILE);
 +        return;
 +    }
 +
@@ -146,7 +146,7 @@ index b440b22..9b1057f 100644
      return TRUE;
  }
  
-@@ -7967,6 +8056,22 @@ nm_manager_init(NMManager *self)
+@@ -7984,6 +8073,22 @@ nm_manager_init(NMManager *self)
          _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR);
      }
  
@@ -169,7 +169,7 @@ index b440b22..9b1057f 100644
      /* Update timestamps in active connections */
      priv->timestamp_update_id =
          g_timeout_add_seconds(300,
-@@ -8252,6 +8357,16 @@ dispose(GObject *object)
+@@ -8269,6 +8374,16 @@ dispose(GObject *object)
          g_clear_object(&priv->fw_monitor);
      }