diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 68 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/network-manager.install | 2 | ||||
| -rw-r--r-- | debian/network-manager.lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 3 | ||||
| -rw-r--r-- | debian/org.freedesktop.NetworkManager.rules (renamed from debian/60-network-manager.rules) | 0 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 12 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | debian/watch | 4 |
9 files changed, 88 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 75214bfe..970d888e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,71 @@ +network-manager (1.35.92-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, 03 Feb 2022 12:18:58 -0500 + +network-manager (1.35.92-1) unstable; urgency=medium + + * New upstream version 1.35.92 ((1.36 rc3) + * Rename polkit rules file to org.freedesktop.NetworkManager.rules + * Set path to nft binary + * Demote iptables to Suggests + + -- Michael Biebl <biebl@debian.org> Sat, 19 Feb 2022 21:50:39 +0100 + +network-manager (1.35.91-1) unstable; urgency=medium + + * New upstream version 1.35.91 (1.36 rc2) + * Rebase patches + * Update debian/watch to version 4 + * Update symbols file for libnm0 + * Add lintian override for custom-library-search-path + * Enable all hardening build flags + * Clean up nm-priv-helper.service enablement state on upgrades + + -- Michael Biebl <biebl@debian.org> Mon, 14 Feb 2022 22:24:06 +0100 + network-manager (1.35.91-0ubuntu1) jammy; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 7a0e060b..285318f0 100644 --- a/debian/control +++ b/debian/control @@ -58,7 +58,6 @@ Depends: ${shlibs:Depends}, policykit-1 Recommends: ppp, dnsmasq-base, - iptables, modemmanager, network-manager-pptp, wireless-regdb, @@ -66,6 +65,7 @@ Recommends: ppp, libpam-systemd, Suggests: avahi-autoipd, libteam-utils, + iptables, Breaks: ${misc:Breaks} Description: network management framework (daemon and userspace tools) NetworkManager is a system network service that manages your network devices diff --git a/debian/network-manager.install b/debian/network-manager.install index c969c8dc..ceebe43b 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -26,7 +26,7 @@ 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/60-network-manager.rules usr/share/polkit-1/rules.d/ +debian/org.freedesktop.NetworkManager.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 diff --git a/debian/network-manager.lintian-overrides b/debian/network-manager.lintian-overrides new file mode 100644 index 00000000..3676e749 --- /dev/null +++ b/debian/network-manager.lintian-overrides @@ -0,0 +1,2 @@ +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996270 +network-manager: custom-library-search-path RUNPATH /usr/lib/*/NetworkManager/* diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index daf65243..e2cb0498 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -65,6 +65,9 @@ case "$1" in if dpkg --compare-versions "$2" lt-nl "1.25.91-1"; then update-rc.d -f network-manager remove || true fi + if dpkg --compare-versions "$2" lt-nl "1.35.91-1"; then + deb-systemd-helper purge "nm-priv-helper.service" || true + fi ;; abort-upgrade|abort-deconfigure|abort-remove) diff --git a/debian/60-network-manager.rules b/debian/org.freedesktop.NetworkManager.rules index 83b05767..83b05767 100644 --- a/debian/60-network-manager.rules +++ b/debian/org.freedesktop.NetworkManager.rules diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 0d687210..e009f715 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..b4599d9 100644 +index b440b22..9b1057f 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -51,6 +51,8 @@ @@ -73,8 +73,8 @@ index b440b22..b4599d9 100644 if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; } -@@ -6659,6 +6689,62 @@ impl_manager_set_logging(NMDBusObject *obj, - g_dbus_method_invocation_return_value(invocation, NULL); +@@ -6673,6 +6703,62 @@ impl_manager_get_logging(NMDBusObject *obj, + g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string())); } +static void @@ -133,9 +133,9 @@ index b440b22..b4599d9 100644 + } +} + - static void - impl_manager_get_logging(NMDBusObject *obj, - const NMDBusInterfaceInfoExtended *interface_info, + typedef struct { + NMManager *self; + GDBusMethodInvocation *context; @@ -6987,6 +7073,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); diff --git a/debian/rules b/debian/rules index 2893e95e..c6823fbf 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,8 @@ ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) BUILD_PACKAGES += -Nnetwork-manager endif +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + export PYTHON=/usr/bin/python3 PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) @@ -27,9 +29,10 @@ override_dh_auto_configure: --runstatedir=/run \ --with-pppd-plugin-dir=$(PPPD_PLUGIN_DIR) \ --with-pppd=/usr/sbin/pppd \ - --with-resolvconf=no \ - --with-dhclient=/sbin/dhclient \ + --with-nft=/usr/sbin/nft \ --with-iptables=/usr/sbin/iptables \ + --with-resolvconf=/sbin/resolvconf \ + --with-dhclient=/sbin/dhclient \ --with-dnsmasq=/usr/sbin/dnsmasq \ --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ --with-polkit-agent-helper-1=/usr/lib/policykit-1/polkit-agent-helper-1 \ diff --git a/debian/watch b/debian/watch index b28a2c12..3262126e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=3 -https://download.gnome.org/sources/NetworkManager/([\d\.]+[02468])/NetworkManager-(.*)\.tar\.xz +version=4 +https://download.gnome.org/sources/NetworkManager/([\d\.]+[02468])/NetworkManager-@ANY_VERSION@\.tar\.xz |