diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 47 | ||||
| -rw-r--r-- | debian/patches/Update-dnsmasq-parameters.patch | 20 | ||||
| -rw-r--r-- | debian/patches/ubuntu_revert_systemd.patch | 10 |
3 files changed, 62 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index e7bb2044..bf56a2fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +network-manager (1.38.0-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 + + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 17 May 2022 15:36:10 +0200 + network-manager (1.38.0-1) unstable; urgency=medium * New upstream version 1.38.0 diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index 61685795..56ac8bad 100644 --- a/debian/patches/Update-dnsmasq-parameters.patch +++ b/debian/patches/Update-dnsmasq-parameters.patch @@ -10,10 +10,10 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv src/core/dns/nm-dns-manager.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c -index f0abf56..01afd52 100644 ---- a/src/core/dns/nm-dns-dnsmasq.c -+++ b/src/core/dns/nm-dns-dnsmasq.c +Index: network-manager/src/core/dns/nm-dns-dnsmasq.c +=================================================================== +--- network-manager.orig/src/core/dns/nm-dns-dnsmasq.c ++++ network-manager/src/core/dns/nm-dns-dnsmasq.c @@ -522,8 +522,8 @@ _gl_pid_spawn_next_step(void) argv[argv_idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[argv_idx++] = "--bind-interfaces"; @@ -25,11 +25,11 @@ index f0abf56..01afd52 100644 argv[argv_idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ argv[argv_idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ argv[argv_idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ -diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c -index efbf847..a419dd2 100644 ---- a/src/core/dns/nm-dns-manager.c -+++ b/src/core/dns/nm-dns-manager.c -@@ -1740,12 +1740,12 @@ plugin_skip:; +Index: network-manager/src/core/dns/nm-dns-manager.c +=================================================================== +--- network-manager.orig/src/core/dns/nm-dns-manager.c ++++ network-manager/src/core/dns/nm-dns-manager.c +@@ -1725,12 +1725,12 @@ plugin_skip:; NM_CAST_STRV_CC(nameservers), NM_CAST_STRV_CC(options)); @@ -44,7 +44,7 @@ index efbf847..a419dd2 100644 gboolean need_edns0; gboolean need_trust; -@@ -2096,7 +2096,7 @@ nm_dns_manager_stop(NMDnsManager *self) +@@ -2093,7 +2093,7 @@ nm_dns_manager_stop(NMDnsManager *self) _LOGT("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one diff --git a/debian/patches/ubuntu_revert_systemd.patch b/debian/patches/ubuntu_revert_systemd.patch index c8cbc701..7a9cab0b 100644 --- a/debian/patches/ubuntu_revert_systemd.patch +++ b/debian/patches/ubuntu_revert_systemd.patch @@ -5,10 +5,10 @@ the new systemd doesn't work there (lp: #1914062) src/libnm-platform/nm-linux-platform.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) -diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c -index 78df53e..2f3d852 100644 ---- a/src/libnm-platform/nm-linux-platform.c -+++ b/src/libnm-platform/nm-linux-platform.c +Index: network-manager/src/libnm-platform/nm-linux-platform.c +=================================================================== +--- network-manager.orig/src/libnm-platform/nm-linux-platform.c ++++ network-manager/src/libnm-platform/nm-linux-platform.c @@ -29,7 +29,6 @@ #include <poll.h> #include <sys/ioctl.h> @@ -17,7 +17,7 @@ index 78df53e..2f3d852 100644 #include <unistd.h> #include "libnm-glib-aux/nm-c-list.h" -@@ -9598,34 +9597,12 @@ constructed(GObject *_object) +@@ -9830,34 +9829,12 @@ constructed(GObject *_object) } } |