diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 77 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 6 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 18 | ||||
| -rwxr-xr-x | debian/rules | 8 |
5 files changed, 103 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 0a215bbe..150c4753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,80 @@ +network-manager (1.39.90-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 <jbicha@ubuntu.com> Thu, 18 Aug 2022 08:31:11 -0400 + +network-manager (1.39.90-1) experimental; urgency=medium + + * New upstream version 1.39.90 (1.40 rc1) + * Rebase patches + * Drop obsolete --with-dnssec-trigger configure option. + The unbound DNS plugin was marked deprecated for a while and has been + removed now in this release. + * Simplify dh_autoreconf override by calling upstream provided autogen.sh. + This ensures the correct sequence of commands is run. In this specific + case we were still using intltoolize when upstream dropped its usage in + favour of gettext a while ago. + * Replace intltool Build-Depends with gettext + * Add Build-Depends on policykit-1. + The file /usr/share/gettext/its/polkit.its is required when generating + the translations. + * Add Build-Depends on python3-pexpect. + Required by the test suite. + * Update symbols file for libnm0 + + -- Michael Biebl <biebl@debian.org> Wed, 17 Aug 2022 11:35:39 +0200 + +network-manager (1.38.4-1) unstable; urgency=medium + + * New upstream version 1.38.4 + - core: avoid stale entries in the DNS manager for non-virtual devices + (Closes: #1006724) + * Clean up build dependencies + + -- Michael Biebl <biebl@debian.org> Sat, 13 Aug 2022 15:51:32 +0200 + network-manager (1.38.2-1ubuntu1) kinetic; urgency=medium * Resynchronize on Debian, remaining changes: diff --git a/debian/control b/debian/control index 77c44501..2fb7f1e5 100644 --- a/debian/control +++ b/debian/control @@ -10,18 +10,18 @@ Build-Depends: debhelper-compat (= 13), dh-sequence-gir, automake (>= 1.12), pkg-config, - intltool, - libglib2.0-dev (>= 2.32), - ppp-dev (>= 2.4.7-1+1), + gettext (>= 0.19.8), + libglib2.0-dev (>= 2.40), + ppp-dev, libselinux1-dev, libaudit-dev, libgnutls28-dev (>= 2.12), uuid-dev, - systemd (>= 185), + systemd, libsystemd-dev (>= 209), libudev-dev (>= 175), - libgirepository1.0-dev (>= 0.10.7-1~), - gobject-introspection (>= 0.9.12-4~), + libgirepository1.0-dev, + gobject-introspection, python3-gi, libpsl-dev (>= 0.1), libcurl4-gnutls-dev (>= 7.24.0), @@ -32,11 +32,13 @@ Build-Depends: debhelper-compat (= 13), libreadline-dev, libnewt-dev (>= 0.52.15), libteam-dev (>= 1.9), - libjansson-dev, + libjansson-dev (>= 2.7), libbluetooth-dev (>= 5), - valac (>= 0.17.1.24), + valac, + policykit-1, dbus <!nocheck>, python3-dbus <!nocheck>, + python3-pexpect <!nocheck>, iproute2 <!nocheck>, Standards-Version: 4.6.1 Rules-Requires-Root: no diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index f90d3ac2..c91ebc43 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -30,6 +30,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_34_0@libnm_1_34_0 1.34.0 libnm_1_36_0@libnm_1_36_0 1.36.0 libnm_1_38_0@libnm_1_38_0 1.38.0 + libnm_1_40_0@libnm_1_40_0 1.39.90 libnm_1_4_0@libnm_1_4_0 1.4.0 libnm_1_6_0@libnm_1_6_0 1.6.0 libnm_1_8_0@libnm_1_8_0 1.8.0 @@ -191,6 +192,7 @@ libnm.so.0 libnm0 #MINVER# nm_client_wwan_get_enabled@libnm_1_0_0 1.0.0 nm_client_wwan_hardware_get_enabled@libnm_1_0_0 1.0.0 nm_client_wwan_set_enabled@libnm_1_0_0 1.0.0 + nm_conn_wireguard_import@libnm_1_40_0 1.39.90 nm_connection_add_setting@libnm_1_0_0 1.0.0 nm_connection_clear_secrets@libnm_1_0_0 1.0.0 nm_connection_clear_secrets_with_flags@libnm_1_0_0 1.0.0 @@ -629,6 +631,7 @@ libnm.so.0 libnm0 #MINVER# nm_manager_reload_flags_get_type@libnm_1_22_0 1.22.0 nm_metered_get_type@libnm_1_0_6 1.0.6 nm_metered_get_type@libnm_1_2_0 1.2.0 + nm_mptcp_flags_get_type@libnm_1_40_0 1.39.90 nm_object_get_client@libnm_1_24_0 1.24.0 nm_object_get_path@libnm_1_0_0 1.0.0 nm_object_get_type@libnm_1_0_0 1.0.0 @@ -884,6 +887,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_connection_get_timestamp@libnm_1_0_0 1.0.0 nm_setting_connection_get_type@libnm_1_0_0 1.0.0 nm_setting_connection_get_uuid@libnm_1_0_0 1.0.0 + nm_setting_connection_get_wait_activation_delay@libnm_1_40_0 1.39.90 nm_setting_connection_get_wait_device_timeout@libnm_1_20_0 1.20.0 nm_setting_connection_get_zone@libnm_1_0_0 1.0.0 nm_setting_connection_is_slave_type@libnm_1_0_0 1.0.0 @@ -973,10 +977,12 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip4_config_get_dhcp_vendor_class_identifier@libnm_1_26_4 1.28.0 nm_setting_ip4_config_get_type@libnm_1_0_0 1.0.0 nm_setting_ip4_config_new@libnm_1_0_0 1.0.0 + nm_setting_ip4_link_local_get_type@libnm_1_40_0 1.39.90 nm_setting_ip6_config_addr_gen_mode_get_type@libnm_1_2_0 1.2.0 nm_setting_ip6_config_get_addr_gen_mode@libnm_1_2_0 1.2.0 nm_setting_ip6_config_get_dhcp_duid@libnm_1_12_0 1.12.0 nm_setting_ip6_config_get_ip6_privacy@libnm_1_0_0 1.0.0 + nm_setting_ip6_config_get_mtu@libnm_1_40_0 1.39.90 nm_setting_ip6_config_get_ra_timeout@libnm_1_22_8 1.22.8 nm_setting_ip6_config_get_token@libnm_1_4_0 1.4.0 nm_setting_ip6_config_get_type@libnm_1_0_0 1.0.0 diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index e6b80752..4bc8202e 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,10 +12,10 @@ 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 5215369..462b887 100644 +index 3af24aa..aacd4ea 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c -@@ -51,6 +51,8 @@ +@@ -52,6 +52,8 @@ #define DEVICE_STATE_PRUNE_RATELIMIT_MAX 100u @@ -24,7 +24,7 @@ index 5215369..462b887 100644 /*****************************************************************************/ typedef struct { -@@ -191,6 +193,10 @@ typedef struct { +@@ -195,6 +197,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 5215369..462b887 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1491,6 +1497,27 @@ find_best_device_state(NMManager *manager) +@@ -1502,6 +1508,27 @@ find_best_device_state(NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 5215369..462b887 100644 static void nm_manager_update_metered(NMManager *self) { -@@ -1537,6 +1564,9 @@ nm_manager_update_state(NMManager *self) +@@ -1548,6 +1575,9 @@ nm_manager_update_state(NMManager *self) else new_state = find_best_device_state(self); @@ -73,7 +73,7 @@ index 5215369..462b887 100644 if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; } -@@ -6872,6 +6902,62 @@ impl_manager_get_logging(NMDBusObject *obj, +@@ -6941,6 +6971,62 @@ impl_manager_get_logging(NMDBusObject *obj, g_variant_new("(ss)", nm_logging_level_to_string(), nm_logging_domains_to_string())); } @@ -136,7 +136,7 @@ index 5215369..462b887 100644 typedef struct { NMManager *self; GDBusMethodInvocation *context; -@@ -7182,6 +7268,9 @@ nm_manager_start(NMManager *self, GError **error) +@@ -7237,6 +7323,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 5215369..462b887 100644 return TRUE; } -@@ -8035,6 +8124,22 @@ nm_manager_init(NMManager *self) +@@ -8112,6 +8201,22 @@ nm_manager_init(NMManager *self) _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 5215369..462b887 100644 priv->metered = NM_METERED_UNKNOWN; priv->sleep_devices = g_hash_table_new(nm_direct_hash, NULL); } -@@ -8317,6 +8422,16 @@ dispose(GObject *object) +@@ -8399,6 +8504,16 @@ dispose(GObject *object) g_clear_object(&priv->fw_monitor); } diff --git a/debian/rules b/debian/rules index 4fee0570..9b50b7ea 100755 --- a/debian/rules +++ b/debian/rules @@ -15,13 +15,8 @@ PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) %: dh $@ --with ppp $(BUILD_PACKAGES) -autoreconf: - gtkdocize --copy - autopoint --force - AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install - override_dh_autoreconf: - dh_autoreconf debian/rules -- autoreconf + NOCONFIGURE=true dh_autoreconf ./autogen.sh override_dh_auto_configure: dh_auto_configure -- \ @@ -34,7 +29,6 @@ override_dh_auto_configure: --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 \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-udev-dir=/lib/udev \ |