From 85b54c33239239aa9ec8ff2f128f25a72dd587e1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 25 Nov 2019 18:47:22 +0100 Subject: Use DEP-14 branch names Gbp-Dch: Ignore --- debian/gbp.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf index 478d845c..05e704d0 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,5 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = master +debian-branch = debian/master +upstream-branch = upstream/latest -- cgit 1.3.0-6-gf8a5 From 5a1ec72c4e4f117afba34877b4cb042f98fca1eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 25 Nov 2019 19:00:15 +0100 Subject: New upstream version 1.20.8 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b8a5ed41..49380bac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.20.8-1) UNRELEASED; urgency=medium + + * New upstream version 1.20.8 + + -- Michael Biebl Mon, 25 Nov 2019 19:00:14 +0100 + network-manager (1.20.6-1) unstable; urgency=medium * New upstream version 1.20.6 -- cgit 1.3.0-6-gf8a5 From ae999a4d6b951dbdb236aa76bc9b93c82eea3d9e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 25 Nov 2019 19:00:28 +0100 Subject: Rebase patches --- debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index d5ea3a2a..78f89c1a 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/nm-manager.c b/src/nm-manager.c -index 78f3722..c49e94a 100644 +index d112fcf..267a5a8 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -60,6 +60,8 @@ @@ -73,7 +73,7 @@ index 78f3722..c49e94a 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6485,6 +6515,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6491,6 +6521,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 78f3722..c49e94a 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6658,6 +6744,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6664,6 +6750,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 78f3722..c49e94a 100644 return TRUE; } -@@ -7506,6 +7595,22 @@ nm_manager_init (NMManager *self) +@@ -7512,6 +7601,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 78f3722..c49e94a 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7788,6 +7893,16 @@ dispose (GObject *object) +@@ -7794,6 +7899,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From e24ab61a6252a5d191dfd2d57e461516d4eafb22 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 25 Nov 2019 19:23:17 +0100 Subject: Bump Standards Version to 4.4.1 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 9f9b4aaf..04e73f43 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Build-Depends: debhelper-compat (= 12), valac (>= 0.17.1.24), dbus , python3-dbus -Standards-Version: 4.3.0 +Standards-Version: 4.4.1 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager -- cgit 1.3.0-6-gf8a5 From bbf6329c27676323a899b7328575cc3f6c5f48cc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 25 Nov 2019 19:23:40 +0100 Subject: Release version 1.20.8-1 to unstable --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 49380bac..1e9acc9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (1.20.8-1) UNRELEASED; urgency=medium +network-manager (1.20.8-1) unstable; urgency=medium * New upstream version 1.20.8 + * Rebase patches + * Bump Standards Version to 4.4.1 - -- Michael Biebl Mon, 25 Nov 2019 19:00:14 +0100 + -- Michael Biebl Mon, 25 Nov 2019 19:23:25 +0100 network-manager (1.20.6-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From ee8d4bafc514fe60f046918273ebfe54b9e8f8f4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:30:42 +0100 Subject: New upstream version 1.22.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1e9acc9c..60bd318d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.22.0-1) UNRELEASED; urgency=medium + + * New upstream version 1.22.0 + + -- Michael Biebl Wed, 18 Dec 2019 18:30:40 +0100 + network-manager (1.20.8-1) unstable; urgency=medium * New upstream version 1.20.8 -- cgit 1.3.0-6-gf8a5 From a889cc2dc58d4adc94b70a23f06f3b697b4773f6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:31:05 +0100 Subject: Rebase patches --- ...etup-Sleep-Monitor-if-not-booted-with-systemd.patch | 6 +++--- .../Force-online-state-with-unmanaged-devices.patch | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch index 7252cb85..098e89d7 100644 --- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch @@ -16,10 +16,10 @@ Closes: #742933 1 file changed, 5 insertions(+) diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index c97f6f7..5ea0a64 100644 +index c16dc07..cb2ca21 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c -@@ -22,6 +22,7 @@ +@@ -10,6 +10,7 @@ #include #include @@ -27,7 +27,7 @@ index c97f6f7..5ea0a64 100644 #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -@@ -341,6 +342,10 @@ on_proxy_acquired (GObject *object, +@@ -329,6 +330,10 @@ on_proxy_acquired (GObject *object, static void nm_sleep_monitor_init (NMSleepMonitor *self) { diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 78f89c1a..07322947 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/nm-manager.c b/src/nm-manager.c -index d112fcf..267a5a8 100644 +index 132cf5a..e08badd 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -60,6 +60,8 @@ +@@ -50,6 +50,8 @@ #include "nm-dispatcher.h" #include "NetworkManagerUtils.h" @@ -24,7 +24,7 @@ index d112fcf..267a5a8 100644 /*****************************************************************************/ typedef struct { -@@ -198,6 +200,10 @@ typedef struct { +@@ -188,6 +190,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index d112fcf..267a5a8 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1436,6 +1442,27 @@ find_best_device_state (NMManager *manager) +@@ -1426,6 +1432,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index d112fcf..267a5a8 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1482,6 +1509,9 @@ nm_manager_update_state (NMManager *self) +@@ -1472,6 +1499,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index d112fcf..267a5a8 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6491,6 +6521,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6536,6 +6566,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index d112fcf..267a5a8 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6664,6 +6750,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6709,6 +6795,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 d112fcf..267a5a8 100644 return TRUE; } -@@ -7512,6 +7601,22 @@ nm_manager_init (NMManager *self) +@@ -7557,6 +7646,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index d112fcf..267a5a8 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7794,6 +7899,16 @@ dispose (GObject *object) +@@ -7839,6 +7944,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From 92b9bb1458a71f0176502b5a40cf53c8ddbdb87a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:33:01 +0100 Subject: Explicitly disable (experimental) nm-cloud-setup tool --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index e58592f0..1f478736 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,7 @@ override_dh_auto_configure: --with-libaudit \ --with-iwd \ --without-dhcpcanon \ + --without-nm-cloud-setup \ --enable-polkit \ --enable-polkit-agent \ --enable-ppp \ -- cgit 1.3.0-6-gf8a5 From 12e2ec968e98672412f9136e4f8cb1d92a0363d7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:55:08 +0100 Subject: Update symbols file for linm0 --- debian/libnm0.symbols | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index a31ac003..db82f785 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -13,6 +13,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_18_0@libnm_1_18_0 1.18.0 libnm_1_20_0@libnm_1_20_0 1.19.90 libnm_1_20_6@libnm_1_20_6 1.20.6 + libnm_1_22_0@libnm_1_22_0 1.22.0 libnm_1_2_0@libnm_1_2_0 1.1.90 libnm_1_2_4@libnm_1_2_4 1.2.4 libnm_1_4_0@libnm_1_4_0 1.4.0 @@ -119,6 +120,9 @@ libnm.so.0 libnm0 #MINVER# nm_client_get_connection_by_uuid@libnm_1_0_0 1.0.0 nm_client_get_connections@libnm_1_0_0 1.0.0 nm_client_get_connectivity@libnm_1_0_0 1.0.0 + nm_client_get_context_busy_watcher@libnm_1_22_0 1.22.0 + nm_client_get_dbus_connection@libnm_1_22_0 1.22.0 + nm_client_get_dbus_name_owner@libnm_1_22_0 1.22.0 nm_client_get_device_by_iface@libnm_1_0_0 1.0.0 nm_client_get_device_by_path@libnm_1_0_0 1.0.0 nm_client_get_devices@libnm_1_0_0 1.0.0 @@ -126,6 +130,8 @@ libnm.so.0 libnm0 #MINVER# nm_client_get_dns_mode@libnm_1_6_0 1.5.90 nm_client_get_dns_rc_manager@libnm_1_6_0 1.5.90 nm_client_get_logging@libnm_1_0_0 1.0.0 + nm_client_get_main_context@libnm_1_22_0 1.22.0 + nm_client_get_metered@libnm_1_22_0 1.22.0 nm_client_get_nm_running@libnm_1_0_0 1.0.0 nm_client_get_permission_result@libnm_1_0_0 1.0.0 nm_client_get_primary_connection@libnm_1_0_0 1.0.0 @@ -143,9 +149,11 @@ libnm.so.0 libnm0 #MINVER# nm_client_new_finish@libnm_1_0_0 1.0.0 nm_client_permission_get_type@libnm_1_0_0 1.0.0 nm_client_permission_result_get_type@libnm_1_0_0 1.0.0 + nm_client_reload@libnm_1_22_0 1.22.0 nm_client_reload_connections@libnm_1_0_0 1.0.0 nm_client_reload_connections_async@libnm_1_0_0 1.0.0 nm_client_reload_connections_finish@libnm_1_0_0 1.0.0 + nm_client_reload_finish@libnm_1_22_0 1.22.0 nm_client_save_hostname@libnm_1_0_0 1.0.0 nm_client_save_hostname_async@libnm_1_0_0 1.0.0 nm_client_save_hostname_finish@libnm_1_0_0 1.0.0 @@ -290,6 +298,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_get_firmware_version@libnm_1_0_0 1.0.0 nm_device_get_hw_address@libnm_1_0_0 1.0.0 nm_device_get_iface@libnm_1_0_0 1.0.0 + nm_device_get_interface_flags@libnm_1_22_0 1.22.0 nm_device_get_ip4_config@libnm_1_0_0 1.0.0 nm_device_get_ip6_config@libnm_1_0_0 1.0.0 nm_device_get_ip_iface@libnm_1_0_0 1.0.0 @@ -311,6 +320,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_infiniband_get_carrier@libnm_1_0_0 1.0.0 nm_device_infiniband_get_hw_address@libnm_1_0_0 1.0.0 nm_device_infiniband_get_type@libnm_1_0_0 1.0.0 + nm_device_interface_flags_get_type@libnm_1_22_0 1.22.0 nm_device_ip_tunnel_get_encapsulation_limit@libnm_1_2_0 1.1.90 nm_device_ip_tunnel_get_flags@libnm_1_12_0 1.11.3 nm_device_ip_tunnel_get_flow_label@libnm_1_2_0 1.1.90 @@ -450,6 +460,7 @@ libnm.so.0 libnm0 #MINVER# nm_dhcp_config_get_one_option@libnm_1_0_0 1.0.0 nm_dhcp_config_get_options@libnm_1_0_0 1.0.0 nm_dhcp_config_get_type@libnm_1_0_0 1.0.0 + nm_dhcp_hostname_flags_get_type@libnm_1_22_0 1.22.0 nm_dns_entry_get_domains@libnm_1_6_0 1.5.90 nm_dns_entry_get_interface@libnm_1_6_0 1.5.90 nm_dns_entry_get_nameservers@libnm_1_6_0 1.5.90 @@ -458,6 +469,8 @@ libnm.so.0 libnm0 #MINVER# nm_dns_entry_get_vpn@libnm_1_6_0 1.5.90 nm_dns_entry_unref@libnm_1_6_0 1.5.90 nm_ethtool_optname_is_feature@libnm_1_14_8 1.19.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_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 @@ -567,6 +580,7 @@ libnm.so.0 libnm0 #MINVER# nm_lldp_neighbor_unref@libnm_1_2_0 1.1.90 nm_manager_error_get_type@libnm_1_0_0 1.0.0 nm_manager_error_quark@libnm_1_0_0 1.0.0 + 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.1.90 nm_object_get_path@libnm_1_0_0 1.0.0 @@ -848,6 +862,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_get_secret_flags@libnm_1_0_0 1.0.0 nm_setting_get_type@libnm_1_0_0 1.0.0 nm_setting_gsm_get_apn@libnm_1_0_0 1.0.0 + nm_setting_gsm_get_auto_config@libnm_1_22_0 1.22.0 nm_setting_gsm_get_device_id@libnm_1_2_0 1.1.90 nm_setting_gsm_get_home_only@libnm_1_0_0 1.0.0 nm_setting_gsm_get_mtu@libnm_1_8_0 1.8.0 @@ -897,6 +912,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_get_address@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_dad_timeout@libnm_1_2_0 1.1.91 nm_setting_ip_config_get_dhcp_hostname@libnm_1_0_0 1.0.0 + nm_setting_ip_config_get_dhcp_hostname_flags@libnm_1_22_0 1.22.0 nm_setting_ip_config_get_dhcp_send_hostname@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_dhcp_timeout@libnm_1_2_0 1.1.91 nm_setting_ip_config_get_dns@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From e21e666d84bc37832ab20a7ff30bb15f237df9ba Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 19:05:48 +0100 Subject: Release version 1.22.0-1 to unstable --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 60bd318d..eaacb10b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -network-manager (1.22.0-1) UNRELEASED; urgency=medium +network-manager (1.22.0-1) unstable; urgency=medium * New upstream version 1.22.0 + * Rebase patches + * Explicitly disable (experimental) nm-cloud-setup tool + * Update symbols file for linm0 - -- Michael Biebl Wed, 18 Dec 2019 18:30:40 +0100 + -- Michael Biebl Wed, 18 Dec 2019 19:05:33 +0100 network-manager (1.20.8-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 3a262330b691ba58cca571c5329a46fe6a9784f5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Dec 2019 18:03:08 +0100 Subject: dhcp: nettools: fix parsing of search domains option Closes: #947003 --- ...ools-fix-parsing-of-search-domains-option.patch | 32 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 33 insertions(+) create mode 100644 debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch (limited to 'debian') diff --git a/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch b/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch new file mode 100644 index 00000000..a361aa31 --- /dev/null +++ b/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch @@ -0,0 +1,32 @@ +From: Beniamino Galvani +Date: Tue, 17 Dec 2019 14:23:33 +0100 +Subject: dhcp: nettools: fix parsing of search domains option + +'first' was never modified and so the dot was never added. + +Fixes: 6adade6f21d5 ('dhcp: add nettools dhcp4 client') + +https://bugzilla.redhat.com/show_bug.cgi?id=1783981 +(cherry picked from commit 9aa00a8a14cb64f851234d025498ff2f9ec18e94) +(cherry picked from commit ea22135384edaf57a41293bd517ff1445b8c88a8) +--- + src/dhcp/nm-dhcp-nettools.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c +index e557c00..a537ee8 100644 +--- a/src/dhcp/nm-dhcp-nettools.c ++++ b/src/dhcp/nm-dhcp-nettools.c +@@ -246,10 +246,10 @@ lease_option_print_domain_name (GString *str, uint8_t *cache, size_t *n_cachep, + return TRUE; + } + +- if (!first) { ++ if (!first) + g_string_append_c(str, '.'); ++ else + first = FALSE; +- } + + if (!lease_option_print_label (str, n_label, domainp, n_domainp)) + return FALSE; diff --git a/debian/patches/series b/debian/patches/series index 9a20acf2..f14d66cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +dhcp-nettools-fix-parsing-of-search-domains-option.patch -- cgit 1.3.0-6-gf8a5 From e6e01bf48a28c03e61ac5424829a08dfc372533e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Dec 2019 18:07:14 +0100 Subject: Release version 1.22.0-2 to unstable --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eaacb10b..9df67095 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.22.0-2) unstable; urgency=medium + + * dhcp: nettools: fix parsing of search domains option (Closes: #947003) + + -- Michael Biebl Mon, 23 Dec 2019 18:04:05 +0100 + network-manager (1.22.0-1) unstable; urgency=medium * New upstream version 1.22.0 -- cgit 1.3.0-6-gf8a5 From 2a2c31d1bb1ee4a37e79774e41b527729f38a3c9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 26 Dec 2019 06:50:29 +0100 Subject: New upstream version 1.22.2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9df67095..6c4235d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.22.2-1) UNRELEASED; urgency=medium + + * New upstream version 1.22.2 + + -- Michael Biebl Thu, 26 Dec 2019 06:50:27 +0100 + network-manager (1.22.0-2) unstable; urgency=medium * dhcp: nettools: fix parsing of search domains option (Closes: #947003) -- cgit 1.3.0-6-gf8a5 From 69d25f00e8f6ea8e6d2b864c229d834f2f2a9bf7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 26 Dec 2019 06:54:20 +0100 Subject: Rebase patches --- ...Force-online-state-with-unmanaged-devices.patch | 2 +- ...ools-fix-parsing-of-search-domains-option.patch | 32 ---------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch (limited to 'debian') diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 07322947..40c5217a 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/nm-manager.c b/src/nm-manager.c -index 132cf5a..e08badd 100644 +index 3696c78..abd71c4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -50,6 +50,8 @@ diff --git a/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch b/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch deleted file mode 100644 index a361aa31..00000000 --- a/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Beniamino Galvani -Date: Tue, 17 Dec 2019 14:23:33 +0100 -Subject: dhcp: nettools: fix parsing of search domains option - -'first' was never modified and so the dot was never added. - -Fixes: 6adade6f21d5 ('dhcp: add nettools dhcp4 client') - -https://bugzilla.redhat.com/show_bug.cgi?id=1783981 -(cherry picked from commit 9aa00a8a14cb64f851234d025498ff2f9ec18e94) -(cherry picked from commit ea22135384edaf57a41293bd517ff1445b8c88a8) ---- - src/dhcp/nm-dhcp-nettools.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c -index e557c00..a537ee8 100644 ---- a/src/dhcp/nm-dhcp-nettools.c -+++ b/src/dhcp/nm-dhcp-nettools.c -@@ -246,10 +246,10 @@ lease_option_print_domain_name (GString *str, uint8_t *cache, size_t *n_cachep, - return TRUE; - } - -- if (!first) { -+ if (!first) - g_string_append_c(str, '.'); -+ else - first = FALSE; -- } - - if (!lease_option_print_label (str, n_label, domainp, n_domainp)) - return FALSE; diff --git a/debian/patches/series b/debian/patches/series index f14d66cb..9a20acf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -dhcp-nettools-fix-parsing-of-search-domains-option.patch -- cgit 1.3.0-6-gf8a5 From d23bd83ee941b5aa68ad23ba39f426cedf058b09 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 26 Dec 2019 07:17:54 +0100 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index db82f785..9cd0d45e 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -14,6 +14,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_20_0@libnm_1_20_0 1.19.90 libnm_1_20_6@libnm_1_20_6 1.20.6 libnm_1_22_0@libnm_1_22_0 1.22.0 + libnm_1_22_2@libnm_1_22_2 1.22.2 libnm_1_2_0@libnm_1_2_0 1.1.90 libnm_1_2_4@libnm_1_2_4 1.2.4 libnm_1_4_0@libnm_1_4_0 1.4.0 @@ -114,6 +115,7 @@ libnm.so.0 libnm0 #MINVER# nm_client_get_activating_connection@libnm_1_0_0 1.0.0 nm_client_get_active_connections@libnm_1_0_0 1.0.0 nm_client_get_all_devices@libnm_1_2_0 1.1.90 + nm_client_get_capabilities@libnm_1_22_2 1.22.2 nm_client_get_checkpoints@libnm_1_12_0 1.11.3 nm_client_get_connection_by_id@libnm_1_0_0 1.0.0 nm_client_get_connection_by_path@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From 9df3252f7292894d10c275536829ce4671ea0c51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 26 Dec 2019 07:18:12 +0100 Subject: Release version 1.22.2-1 to unstable --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6c4235d6..4d24d0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (1.22.2-1) UNRELEASED; urgency=medium +network-manager (1.22.2-1) unstable; urgency=medium * New upstream version 1.22.2 + * Rebase patches + * Update symbols file for libnm0 - -- Michael Biebl Thu, 26 Dec 2019 06:50:27 +0100 + -- Michael Biebl Thu, 26 Dec 2019 07:17:58 +0100 network-manager (1.22.0-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 8b7f7901d7e0106bbe294fff6ea29e4cf07992e6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Jan 2020 16:32:36 +0100 Subject: More nettools DHCP fixes Closes: #947613 --- ...ettools-handle-retracted-event-as-expired.patch | 36 +++++++++++ ...lling-listen-on-already-listening-connect.patch | 29 +++++++++ ...dhcp4-restart-the-transaction-after-a-NAK.patch | 70 ++++++++++++++++++++++ debian/patches/series | 3 + 4 files changed, 138 insertions(+) create mode 100644 debian/patches/dhcp-nettools-handle-retracted-event-as-expired.patch create mode 100644 debian/patches/n-dhcp4-allow-calling-listen-on-already-listening-connect.patch create mode 100644 debian/patches/n-dhcp4-restart-the-transaction-after-a-NAK.patch (limited to 'debian') diff --git a/debian/patches/dhcp-nettools-handle-retracted-event-as-expired.patch b/debian/patches/dhcp-nettools-handle-retracted-event-as-expired.patch new file mode 100644 index 00000000..23378ce5 --- /dev/null +++ b/debian/patches/dhcp-nettools-handle-retracted-event-as-expired.patch @@ -0,0 +1,36 @@ +From: Beniamino Galvani +Date: Tue, 7 Jan 2020 12:03:21 +0100 +Subject: dhcp: nettools: handle 'retracted' event as 'expired' + +The 'retracted' event is emitted when the client receives a NAK in the +rebooting, requesting, renewing or rebinding state, while 'expired' +means that the client wasn't able to renew the lease before expiry. + +In both cases the old lease is no longer valid and n-dhcp4 keep trying +to get a lease, so the two events should be handlded in the same way. + +Note that the systemd client doesn't have a 'retracted' event and +considers all NAKs as 'expired' events. + +(cherry picked from commit 2523000b36b113fd7b94ae6b7178f6fd33908ef9) +(cherry picked from commit 92b382e2f85b0870b553358cec0209a0a0e3ce31) +--- + src/dhcp/nm-dhcp-nettools.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c +index 1f76c64..b4c0a45 100644 +--- a/src/dhcp/nm-dhcp-nettools.c ++++ b/src/dhcp/nm-dhcp-nettools.c +@@ -1028,10 +1028,10 @@ dhcp4_event_handle (NMDhcpNettools *self, + _LOGW ("selecting lease failed: %d", r); + } + break; ++ case N_DHCP4_CLIENT_EVENT_RETRACTED: + case N_DHCP4_CLIENT_EVENT_EXPIRED: + nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_EXPIRE, NULL, NULL); + break; +- case N_DHCP4_CLIENT_EVENT_RETRACTED: + case N_DHCP4_CLIENT_EVENT_CANCELLED: + nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL); + break; diff --git a/debian/patches/n-dhcp4-allow-calling-listen-on-already-listening-connect.patch b/debian/patches/n-dhcp4-allow-calling-listen-on-already-listening-connect.patch new file mode 100644 index 00000000..d682210b --- /dev/null +++ b/debian/patches/n-dhcp4-allow-calling-listen-on-already-listening-connect.patch @@ -0,0 +1,29 @@ +From: Beniamino Galvani +Date: Tue, 7 Jan 2020 12:01:39 +0100 +Subject: n-dhcp4: allow calling listen() on already listening connection + +When the client enters the INIT state, it calls listen() on the +connection connection to create the packet socket. However, if the +client is coming from the REBOOTING state after a NAK, the connection +is already in the listening state; do nothing in such case. + +(cherry picked from commit 4bcdc3c1ebe3e2e8a967ff067ecb2a8cbfc2f6ab) +(cherry picked from commit 2e1d3ae572a753f0181760d9fa41558d33849b09) +--- + shared/n-dhcp4/src/n-dhcp4-c-connection.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/shared/n-dhcp4/src/n-dhcp4-c-connection.c b/shared/n-dhcp4/src/n-dhcp4-c-connection.c +index e51a3e3..f3ae44e 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-c-connection.c ++++ b/shared/n-dhcp4/src/n-dhcp4-c-connection.c +@@ -139,6 +139,9 @@ int n_dhcp4_c_connection_listen(NDhcp4CConnection *connection) { + _c_cleanup_(c_closep) int fd_packet = -1; + int r; + ++ if (connection->state == N_DHCP4_C_CONNECTION_STATE_PACKET) ++ return 0; ++ + c_assert(connection->state == N_DHCP4_C_CONNECTION_STATE_INIT || + connection->state == N_DHCP4_C_CONNECTION_STATE_DRAINING || + connection->state == N_DHCP4_C_CONNECTION_STATE_UDP); diff --git a/debian/patches/n-dhcp4-restart-the-transaction-after-a-NAK.patch b/debian/patches/n-dhcp4-restart-the-transaction-after-a-NAK.patch new file mode 100644 index 00000000..d245597f --- /dev/null +++ b/debian/patches/n-dhcp4-restart-the-transaction-after-a-NAK.patch @@ -0,0 +1,70 @@ +From: Beniamino Galvani +Date: Tue, 7 Jan 2020 12:02:55 +0100 +Subject: n-dhcp4: restart the transaction after a NAK + +It is not enough to set the INIT state after a NAK; a timeout +(ns_deferred) must be set so that it is added to the event fd. The +client retries immediately the first time, so that in the successful +case it gets an address quickly. To avoid flooding the network in case +of servers always replying with NAKs, next attempts are done with +intervals from 2 seconds to 5 minutes using exponential backoff. See +also systemd commit [1]. + +[1] https://github.com/systemd/systemd/commit/1d1a3e0afb85478cda43670b8ed92a6db6c83f3e + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/325 +(cherry picked from commit 218782a9a3c326f5c8cc3ea40dc0cd039060b188) +(cherry picked from commit ae5b9343d2e52917546f228b7a4d3c7fc4fa98ec) +--- + shared/n-dhcp4/src/n-dhcp4-c-probe.c | 10 ++++++---- + shared/n-dhcp4/src/n-dhcp4-private.h | 1 + + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c +index 4fb7d38..82a089e 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c ++++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c +@@ -946,7 +946,7 @@ static int n_dhcp4_client_probe_transition_ack(NDhcp4ClientProbe *probe, NDhcp4I + n_dhcp4_client_lease_unref(probe->current_lease); + probe->current_lease = n_dhcp4_client_lease_ref(lease); + probe->state = N_DHCP4_CLIENT_PROBE_STATE_BOUND; +- ++ probe->ns_nak_restart_delay = 0; + break; + + case N_DHCP4_CLIENT_PROBE_STATE_REQUESTING: +@@ -969,7 +969,7 @@ static int n_dhcp4_client_probe_transition_ack(NDhcp4ClientProbe *probe, NDhcp4I + node->event.granted.lease = n_dhcp4_client_lease_ref(lease); + probe->current_lease = n_dhcp4_client_lease_ref(lease); + probe->state = N_DHCP4_CLIENT_PROBE_STATE_GRANTED; +- ++ probe->ns_nak_restart_delay = 0; + break; + + case N_DHCP4_CLIENT_PROBE_STATE_INIT: +@@ -1004,9 +1004,11 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) { + return r; + + probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT; +- ++ probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay; ++ probe->ns_nak_restart_delay = c_clamp(probe->ns_nak_restart_delay * 2, ++ UINT64_C(1000000000 * 2), ++ UINT64_C(1000000000 * 300)); + break; +- + case N_DHCP4_CLIENT_PROBE_STATE_SELECTING: + case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT: + case N_DHCP4_CLIENT_PROBE_STATE_INIT: +diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h +index fcfb0f3..c092ae8 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-private.h ++++ b/shared/n-dhcp4/src/n-dhcp4-private.h +@@ -352,6 +352,7 @@ struct NDhcp4ClientProbe { + unsigned int state; /* current probe state */ + uint64_t ns_deferred; /* timeout for deferred action */ + uint64_t ns_reinit; ++ uint64_t ns_nak_restart_delay; /* restart delay after a nak */ + NDhcp4ClientLease *current_lease; /* current lease */ + + NDhcp4CConnection connection; /* client connection wrapper */ diff --git a/debian/patches/series b/debian/patches/series index 9a20acf2..1db304db 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,5 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +n-dhcp4-allow-calling-listen-on-already-listening-connect.patch +n-dhcp4-restart-the-transaction-after-a-NAK.patch +dhcp-nettools-handle-retracted-event-as-expired.patch -- cgit 1.3.0-6-gf8a5 From ca847639aab94434daed120c874e1100c3d75dcf Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Jan 2020 22:26:48 +0100 Subject: Release version 1.22.2-2 to unstable --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d24d0dc..9fbb67e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.22.2-2) unstable; urgency=medium + + * More nettools DHCP fixes (Closes: #947613) + + -- Michael Biebl Thu, 09 Jan 2020 22:26:29 +0100 + network-manager (1.22.2-1) unstable; urgency=medium * New upstream version 1.22.2 -- cgit 1.3.0-6-gf8a5