diff options
Diffstat (limited to 'debian')
19 files changed, 55 insertions, 680 deletions
diff --git a/debian/changelog b/debian/changelog index 9a980b4e..844abd7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -network-manager (1.14.4-4ubuntu1) UNRELEASED; urgency=medium +network-manager (1.15.2-0ubuntu1) UNRELEASED; urgency=medium - * Resynchronized with Debian + * Update to the current serie, resynchronize with Debian + * debian/libnm0.symbols: + - updated for the new version + * debian/patches + - removed the changes that are included in the new version + * debian/rules: + - strip '-Wl,-Bsymbolic-functions' from LDFLAGS otherwise the + tests fails on 'cannot register existing type 'NMAgentManagerError'' - -- Sebastien Bacher <seb128@ubuntu.com> Fri, 25 Jan 2019 11:10:07 +0100 + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 25 Jan 2019 11:31:56 +0100 network-manager (1.14.4-4) unstable; urgency=medium diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index fd43fa93..bd003330 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -8,6 +8,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_12_0@libnm_1_12_0 1.11.3 libnm_1_12_2@libnm_1_12_2 1.12.2 libnm_1_14_0@libnm_1_14_0 1.13.90 + libnm_1_16_0@libnm_1_16_0 1.15.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 @@ -62,6 +63,8 @@ libnm.so.0 libnm0 #MINVER# nm_checkpoint_get_type@libnm_1_12_0 1.11.3 nm_client_activate_connection_async@libnm_1_0_0 1.0.0 nm_client_activate_connection_finish@libnm_1_0_0 1.0.0 + nm_client_add_and_activate_connection2@libnm_1_16_0 1.15.2 + nm_client_add_and_activate_connection2_finish@libnm_1_16_0 1.15.2 nm_client_add_and_activate_connection_async@libnm_1_0_0 1.0.0 nm_client_add_and_activate_connection_finish@libnm_1_0_0 1.0.0 nm_client_add_connection_async@libnm_1_0_0 1.0.0 @@ -254,6 +257,7 @@ libnm.so.0 libnm0 #MINVER# nm_device_get_autoconnect@libnm_1_0_0 1.0.0 nm_device_get_available_connections@libnm_1_0_0 1.0.0 nm_device_get_capabilities@libnm_1_0_0 1.0.0 + nm_device_get_connectivity@libnm_1_16_0 1.15.2 nm_device_get_description@libnm_1_0_0 1.0.0 nm_device_get_device_type@libnm_1_0_0 1.0.0 nm_device_get_dhcp4_config@libnm_1_0_0 1.0.0 @@ -1245,6 +1249,8 @@ libnm.so.0 libnm0 #MINVER# nm_team_link_watcher_get_source_host@libnm_1_10_2 1.10.2 nm_team_link_watcher_get_target_host@libnm_1_10_2 1.10.2 nm_team_link_watcher_get_type@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_vlanid@libnm_1_16_0 1.15.2 + nm_team_link_watcher_new_arp_ping2@libnm_1_16_0 1.15.2 nm_team_link_watcher_new_arp_ping@libnm_1_10_2 1.10.2 nm_team_link_watcher_new_ethtool@libnm_1_10_2 1.10.2 nm_team_link_watcher_new_nsna_ping@libnm_1_10_2 1.10.2 diff --git a/debian/patches/Disable-general-with-expect.patch b/debian/patches/Disable-general-with-expect.patch index 1440af27..7b5a0dfd 100644 --- a/debian/patches/Disable-general-with-expect.patch +++ b/debian/patches/Disable-general-with-expect.patch @@ -7,11 +7,11 @@ which tends to fail on ppc64el and arm64 Makefile.am | 1 - 1 file changed, 1 deletion(-) -Index: network-manager-1.14.4/Makefile.am +Index: network-manager-1.15.2/Makefile.am =================================================================== ---- network-manager-1.14.4.orig/Makefile.am -+++ network-manager-1.14.4/Makefile.am -@@ -3404,7 +3404,6 @@ src_tests_ldadd = \ +--- network-manager-1.15.2.orig/Makefile.am ++++ network-manager-1.15.2/Makefile.am +@@ -3622,7 +3622,6 @@ src_tests_ldadd = \ check_programs += \ src/tests/test-general \ diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch deleted file mode 100644 index 636865a4..00000000 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sun, 29 Mar 2015 22:57:50 +0200 -Subject: Don't make NetworkManager D-Bus activatable - -If the NetworkManager daemon has been stopped manually we don't want it -to be autostarted by a client request. ---- - Makefile.am | 5 ----- - data/NetworkManager.service.in | 1 - - 2 files changed, 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1e100f6..204f1a0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4110,11 +4110,6 @@ endif - data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in - $(AM_V_GEN) $(data_edit) $< >$@ - --data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in -- $(AM_V_GEN) $(data_edit) $< >$@ -- --service_DATA += data/org.freedesktop.NetworkManager.service -- - endif - - examples_DATA += data/server.conf -diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 2692935..ff90456 100644 ---- a/data/NetworkManager.service.in -+++ b/data/NetworkManager.service.in -@@ -24,7 +24,6 @@ ProtectHome=read-only - - [Install] - WantedBy=multi-user.target --Alias=dbus-org.freedesktop.NetworkManager.service - Also=NetworkManager-dispatcher.service - - # We want to enable NetworkManager-wait-online.service whenever this service diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index ae96f968..d8ac99c8 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -11,11 +11,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 src/nm-manager.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 7598995..1439c47 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -62,6 +62,8 @@ +Index: network-manager-1.15.2/src/nm-manager.c +=================================================================== +--- network-manager-1.15.2.orig/src/nm-manager.c ++++ network-manager-1.15.2/src/nm-manager.c +@@ -63,6 +63,8 @@ #include "nm-dispatcher.h" #include "NetworkManagerUtils.h" @@ -24,7 +24,7 @@ index 7598995..1439c47 100644 /*****************************************************************************/ typedef struct { -@@ -192,6 +194,10 @@ typedef struct { +@@ -195,6 +197,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 7598995..1439c47 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1417,6 +1423,27 @@ find_best_device_state (NMManager *manager) +@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manag return best_state; } @@ -63,7 +63,7 @@ index 7598995..1439c47 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1455,6 +1482,9 @@ nm_manager_update_state (NMManager *self) +@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self else new_state = find_best_device_state (self); @@ -73,11 +73,10 @@ index 7598995..1439c47 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6209,6 +6239,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); +@@ -6479,6 +6509,62 @@ impl_manager_check_connectivity (NMDBusO } -+static void + static void +check_ifstate_file (gpointer user_data) +{ + NMManager *self = NM_MANAGER (user_data); @@ -133,10 +132,11 @@ index 7598995..1439c47 100644 + } +} + - static void ++static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6377,6 +6463,9 @@ nm_manager_start (NMManager *self, GError **error) + nm_device_factory_start (factory); +@@ -6646,6 +6732,9 @@ nm_manager_start (NMManager *self, GErro 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 7598995..1439c47 100644 return TRUE; } -@@ -7231,6 +7320,22 @@ nm_manager_init (NMManager *self) +@@ -7504,6 +7593,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 7598995..1439c47 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7506,6 +7611,16 @@ dispose (GObject *object) +@@ -7779,6 +7884,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index 6820bca3..1ad1117f 100644 --- a/debian/patches/Update-dnsmasq-parameters.patch +++ b/debian/patches/Update-dnsmasq-parameters.patch @@ -10,11 +10,11 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv src/dns/nm-dns-manager.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -Index: network-manager-1.14.4/src/dns/nm-dns-dnsmasq.c +Index: network-manager-1.15.2/src/dns/nm-dns-dnsmasq.c =================================================================== ---- network-manager-1.14.4.orig/src/dns/nm-dns-dnsmasq.c -+++ network-manager-1.14.4/src/dns/nm-dns-dnsmasq.c -@@ -330,8 +330,8 @@ start_dnsmasq (NMDnsDnsmasq *self) +--- network-manager-1.15.2.orig/src/dns/nm-dns-dnsmasq.c ++++ network-manager-1.15.2/src/dns/nm-dns-dnsmasq.c +@@ -337,8 +337,8 @@ start_dnsmasq (NMDnsDnsmasq *self) argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[idx++] = "--bind-interfaces"; argv[idx++] = "--pid-file=" PIDFILE; @@ -25,13 +25,13 @@ Index: network-manager-1.14.4/src/dns/nm-dns-dnsmasq.c argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ -Index: network-manager-1.14.4/src/dns/nm-dns-manager.c +Index: network-manager-1.15.2/src/dns/nm-dns-manager.c =================================================================== ---- network-manager-1.14.4.orig/src/dns/nm-dns-manager.c -+++ network-manager-1.14.4/src/dns/nm-dns-manager.c -@@ -1428,12 +1428,12 @@ update_dns (NMDnsManager *self, - ; - } +--- network-manager-1.15.2.orig/src/dns/nm-dns-manager.c ++++ network-manager-1.15.2/src/dns/nm-dns-manager.c +@@ -1478,12 +1478,12 @@ update_dns (NMDnsManager *self, + NM_CAST_STRV_CC (nameservers), + NM_CAST_STRV_CC (options)); - /* If caching was successful, we only send 127.0.0.1 to /etc/resolv.conf + /* If caching was successful, we only send 127.0.1.1 to /etc/resolv.conf @@ -44,7 +44,7 @@ Index: network-manager-1.14.4/src/dns/nm-dns-manager.c if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { /* systemd-resolved uses a different link-local address */ -@@ -1758,7 +1758,7 @@ nm_dns_manager_stop (NMDnsManager *self) +@@ -1825,7 +1825,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/cli-fix-memory-leaks.patch b/debian/patches/cli-fix-memory-leaks.patch deleted file mode 100644 index 457a7f85..00000000 --- a/debian/patches/cli-fix-memory-leaks.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Wed, 31 Oct 2018 10:10:10 +0100 -Subject: cli: fix memory leaks - -(cherry picked from commit a985efaf934cedd37a69f94cd35990d7e2c43f0b) -(cherry picked from commit e22602096fe60fd73586bf041863b63aad84bbee) ---- - clients/cli/devices.c | 2 +- - clients/cli/utils.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/clients/cli/devices.c b/clients/cli/devices.c -index 38e24e7..b7ba50f 100644 ---- a/clients/cli/devices.c -+++ b/clients/cli/devices.c -@@ -2795,7 +2795,7 @@ show_access_point_info (NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out) - - aps = sort_access_points (nm_device_wifi_get_access_points (wifi)); - g_ptr_array_foreach (aps, fill_output_access_point, &info); -- g_ptr_array_free (aps, FALSE); -+ g_ptr_array_free (aps, TRUE); - } - - print_data_prepare_width (out->output_data); -diff --git a/clients/cli/utils.c b/clients/cli/utils.c -index e21c108..feb6722 100644 ---- a/clients/cli/utils.c -+++ b/clients/cli/utils.c -@@ -919,6 +919,8 @@ nmc_empty_output_fields (NmcOutputData *output_data) - /* Empty output_data array */ - if (output_data->output_data->len > 0) - g_ptr_array_remove_range (output_data->output_data, 0, output_data->output_data->len); -+ -+ g_ptr_array_unref (output_data->output_data); - } - - /*****************************************************************************/ diff --git a/debian/patches/cli-tests-fix-output-on-failure.patch b/debian/patches/cli-tests-fix-output-on-failure.patch deleted file mode 100644 index 4a213a92..00000000 --- a/debian/patches/cli-tests-fix-output-on-failure.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Wed, 31 Oct 2018 11:29:26 +0100 -Subject: cli/tests: fix output on failure - -(cherry picked from commit 5665f67bae25ee9f96e057c2a993b8cf69cbc127) -(cherry picked from commit d1afd1c4206d3720de7776ed93ae61c48a7cc71d) ---- - clients/tests/test-client.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py -index e8f1f7f..d92d499 100755 ---- a/clients/tests/test-client.py -+++ b/clients/tests/test-client.py -@@ -744,8 +744,8 @@ class TestNmcli(NmTestBase): - skip_test_for_l10n_diff.append(n['test_name']) - continue - print("\n\n\nThe file '%s' does not have the expected content:" % (filename)) -- print("ACTUAL OUTPUT:\n[[%s]]\n" % (results_expect[i])) -- print("EXPECT OUTPUT:\n[[%s]]\n" % (n['content'])) -+ print("ACTUAL OUTPUT:\n[[%s]]\n" % (n['content'])) -+ print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[i])) - print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1") - print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename())) - self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) diff --git a/debian/patches/cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch b/debian/patches/cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch deleted file mode 100644 index aaf4f28b..00000000 --- a/debian/patches/cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch +++ /dev/null @@ -1,219 +0,0 @@ -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Wed, 31 Oct 2018 10:00:22 +0100 -Subject: cli: wait for all wifi scans to finish before displaying the result - -Otherwise devices are displayed in a inconsistent order. - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/39 -(cherry picked from commit c0138cdb35b51bf268c361a2dc7f4c4f6f36ef52) -(cherry picked from commit c1bf574ea5b191bf081dbb31eee7f709e0b654a1) ---- - clients/cli/devices.c | 140 ++++++++++++++++++++++++++++---------------------- - 1 file changed, 78 insertions(+), 62 deletions(-) - -diff --git a/clients/cli/devices.c b/clients/cli/devices.c -index 029ca67..38e24e7 100644 ---- a/clients/cli/devices.c -+++ b/clients/cli/devices.c -@@ -2870,28 +2870,38 @@ wifi_print_aps (NMDeviceWifi *wifi, - - typedef struct { - NmCli *nmc; -- NMDeviceWifi *wifi; -- const NMMetaAbstractInfo *const*tmpl; -- -+ NMDevice **devices; -+ const NMMetaAbstractInfo *const *tmpl; - const char *bssid_user; -+ GArray *out_indices; -+} ScanInfo; -+ -+typedef struct { -+ ScanInfo *scan_info; -+ NMDeviceWifi *wifi; - gulong last_scan_id; - guint timeout_id; - GCancellable *scan_cancellable; -- GArray *out_indices; - } WifiListData; - - static void - wifi_list_finish (WifiListData *data) - { -- NmCli *nmc = data->nmc; -- -- wifi_print_aps (data->wifi, data->nmc, data->out_indices, -- data->tmpl, data->bssid_user); -+ ScanInfo *info = data->scan_info; -+ NmCli *nmc = info->nmc; -+ guint i; - -- if (--nmc->should_wait == 0) { -+ if (--info->nmc->should_wait == 0) { -+ for (i = 0; info->devices[i]; i++) { -+ wifi_print_aps (NM_DEVICE_WIFI (info->devices[i]), -+ info->nmc, -+ info->out_indices, -+ info->tmpl, -+ info->bssid_user); -+ } - if (nmc->return_value == NMC_RESULT_ERROR_NOT_FOUND) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), -- data->bssid_user); -+ data->scan_info->bssid_user); - } - g_main_loop_quit (loop); - } -@@ -2899,9 +2909,15 @@ wifi_list_finish (WifiListData *data) - g_signal_handler_disconnect (data->wifi, data->last_scan_id); - nm_clear_g_source (&data->timeout_id); - nm_clear_g_cancellable (&data->scan_cancellable); -- g_array_unref (data->out_indices); -- g_object_unref (data->wifi); - g_slice_free (WifiListData, data); -+ -+ if (info->nmc->should_wait == 0) { -+ for (i = 0; info->devices[i]; i++) -+ g_object_unref (info->devices[i]); -+ g_free (info->devices); -+ g_array_unref (info->out_indices); -+ g_free (info); -+ } - } - - static void -@@ -2945,49 +2961,6 @@ wifi_list_scan_timeout (gpointer user_data) - return G_SOURCE_REMOVE; - } - --static void --wifi_list_aps (NMDeviceWifi *wifi, -- NmCli *nmc, -- GArray *out_indices, -- const NMMetaAbstractInfo *const*tmpl, -- const char *bssid_user, -- gint64 rescan_cutoff) --{ -- gboolean needs_rescan; -- WifiListData *data; -- -- needs_rescan = rescan_cutoff < 0 || (rescan_cutoff > 0 && nm_device_wifi_get_last_scan (wifi) < rescan_cutoff); -- -- /* FIXME: nmcli should either -- * - don't request any new scan for any device and print the full AP list right -- * away. -- * - or, when requesting a scan on one or more devices, don't print the result -- * before all requests complete. -- * -- * Otherwise: -- * - the printed output is not self consistent. E.g. it will print the result -- * on one device at a certain time, while printing the result for another -- * device at a later point in time. -- * - the order in which we print the AP list per-device, is unstable. */ -- if (needs_rescan) { -- data = g_slice_new0 (WifiListData); -- data->nmc = nmc; -- data->wifi = g_object_ref (wifi); -- data->tmpl = tmpl; -- data->out_indices = g_array_ref (out_indices);; -- data->bssid_user = bssid_user; -- data->last_scan_id = g_signal_connect (wifi, "notify::" NM_DEVICE_WIFI_LAST_SCAN, -- G_CALLBACK (wifi_last_scan_updated), data); -- data->scan_cancellable = g_cancellable_new (); -- data->timeout_id = g_timeout_add_seconds (15, wifi_list_scan_timeout, data); -- nm_device_wifi_request_scan_async (wifi, data->scan_cancellable, wifi_list_rescan_cb, data); -- -- nmc->should_wait++; -- } else { -- wifi_print_aps (wifi, nmc, out_indices, tmpl, bssid_user); -- } --} -- - static void - complete_aps (NMDevice **devices, const char *ifname, - const char *bssid_prefix, const char *ssid_prefix) -@@ -3017,12 +2990,15 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) - const char *bssid_user = NULL; - const char *rescan = NULL; - gs_free NMDevice **devices = NULL; -- guint i; - const char *fields_str = NULL; - const NMMetaAbstractInfo *const*tmpl; - gs_unref_array GArray *out_indices = NULL; - int option; - guint64 rescan_cutoff; -+ NMDeviceWifi *wifi; -+ ScanInfo *scan_info = NULL; -+ WifiListData *data; -+ guint i, j; - - devices = nmc_get_devices_sorted (nmc->client); - -@@ -3110,7 +3086,8 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) - } - - if (NM_IS_DEVICE_WIFI (device)) { -- wifi_list_aps (NM_DEVICE_WIFI (device), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); -+ devices[0] = device; -+ devices[1] = NULL; - } else { - if ( nm_device_get_device_type (device) == NM_DEVICE_TYPE_GENERIC - && g_strcmp0 (nm_device_get_type_description (device), "wifi") == 0) { -@@ -3124,13 +3101,52 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) - } - return NMC_RESULT_ERROR_UNKNOWN; - } -+ } -+ -+ /* Filter out non-wifi devices */ -+ for (i = 0, j = 0; devices[i]; i++) { -+ if (NM_IS_DEVICE_WIFI (devices[i])) -+ devices[j++] = devices[i]; -+ } -+ devices[j] = NULL; -+ -+ /* Start a new scan for devices that need it */ -+ for (i = 0; devices[i]; i++) { -+ wifi = (NMDeviceWifi *) devices[i]; -+ g_object_ref (wifi); -+ -+ if ( rescan_cutoff == 0 -+ || (rescan_cutoff > 0 && nm_device_wifi_get_last_scan (wifi) >= rescan_cutoff)) -+ continue; -+ -+ if (!scan_info) { -+ scan_info = g_new0 (ScanInfo, 1); -+ scan_info->out_indices = g_array_ref (out_indices); -+ scan_info->tmpl = tmpl; -+ scan_info->bssid_user = bssid_user; -+ scan_info->nmc = nmc; -+ } -+ -+ nmc->should_wait++; -+ data = g_slice_new0 (WifiListData); -+ data->wifi = wifi; -+ data->scan_info = scan_info; -+ data->last_scan_id = g_signal_connect (wifi, "notify::" NM_DEVICE_WIFI_LAST_SCAN, -+ G_CALLBACK (wifi_last_scan_updated), data); -+ data->scan_cancellable = g_cancellable_new (); -+ data->timeout_id = g_timeout_add_seconds (15, wifi_list_scan_timeout, data); -+ nm_device_wifi_request_scan_async (wifi, data->scan_cancellable, wifi_list_rescan_cb, data); -+ } -+ -+ if (scan_info) { -+ scan_info->devices = g_steal_pointer (&devices); - } else { -+ /* Print results right away if no scan is pending */ - for (i = 0; devices[i]; i++) { -- NMDevice *dev = devices[i]; -- -- if (NM_IS_DEVICE_WIFI (dev)) { -- wifi_list_aps (NM_DEVICE_WIFI (dev), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); -- } -+ wifi_print_aps (NM_DEVICE_WIFI (devices[i]), -+ nmc, out_indices, -+ tmpl, bssid_user); -+ g_object_unref (devices[i]); - } - } - diff --git a/debian/patches/dhcp6-fix-buffer-size-checking.patch b/debian/patches/dhcp6-fix-buffer-size-checking.patch deleted file mode 100644 index 921573b8..00000000 --- a/debian/patches/dhcp6-fix-buffer-size-checking.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Thu, 27 Sep 2018 23:48:51 +0900 -Subject: dhcp6: fix buffer size checking - -(cherry picked from commit cb1bdeaf56852275e6b0dd1fba932bb174767f70) -(cherry picked from commit 91fb1673d5217aaf1461998fd2675630f5c265f9) ---- - src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -index 8444a75..0b261a2 100644 ---- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -@@ -818,8 +818,8 @@ static int client_parse_message( - uint8_t *optval; - be32_t iaid_lease; - -- if (len < offsetof(DHCP6Option, data) || -- len < offsetof(DHCP6Option, data) + be16toh(option->len)) -+ if (len < pos + offsetof(DHCP6Option, data) || -+ len < pos + offsetof(DHCP6Option, data) + be16toh(option->len)) - return -ENOBUFS; - - optcode = be16toh(option->code); diff --git a/debian/patches/dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch b/debian/patches/dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch deleted file mode 100644 index 3c5c4051..00000000 --- a/debian/patches/dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Lennart Poettering <lennart@poettering.net> -Date: Fri, 19 Oct 2018 12:12:33 +0200 -Subject: dhcp6: make sure we have enough space for the DHCP6 option header - -Fixes a vulnerability originally discovered by Felix Wilhelm from -Google. - -CVE-2018-15688 -LP: #1795921 -https://bugzilla.redhat.com/show_bug.cgi?id=1639067 - -(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892) -(cherry picked from commit 01ca2053bbea09f35b958c8cc7631e15469acb79) -(cherry picked from commit fc230dca139142f409d7bac99dbfabe9b004e2fb) ---- - src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c -index be5c222..2297044 100644 ---- a/src/systemd/src/libsystemd-network/dhcp6-option.c -+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c -@@ -105,7 +105,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) { - return -EINVAL; - } - -- if (*buflen < len) -+ if (*buflen < offsetof(DHCP6Option, data) + len) - return -ENOBUFS; - - ia_hdr = *buf; diff --git a/debian/patches/libnm-Check-self-still-NMManager-or-not.patch b/debian/patches/libnm-Check-self-still-NMManager-or-not.patch index 0dfbfebb..a4b13b10 100644 --- a/debian/patches/libnm-Check-self-still-NMManager-or-not.patch +++ b/debian/patches/libnm-Check-self-still-NMManager-or-not.patch @@ -7,11 +7,11 @@ Return if self is not NMManager or it will crash. libnm/nm-manager.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -Index: network-manager-1.12.2/libnm/nm-manager.c +Index: network-manager-1.15.2/libnm/nm-manager.c =================================================================== ---- network-manager-1.12.2.orig/libnm/nm-manager.c -+++ network-manager-1.12.2/libnm/nm-manager.c -@@ -924,7 +924,7 @@ find_active_connection_by_path (NMManage +--- network-manager-1.15.2.orig/libnm/nm-manager.c ++++ network-manager-1.15.2/libnm/nm-manager.c +@@ -960,7 +960,7 @@ find_active_connection_by_path (NMManage static void recheck_pending_activations (NMManager *self) { @@ -20,7 +20,7 @@ Index: network-manager-1.12.2/libnm/nm-manager.c CList *iter, *safe; NMActiveConnection *candidate; const GPtrArray *devices; -@@ -934,6 +934,10 @@ recheck_pending_activations (NMManager * +@@ -970,6 +970,10 @@ recheck_pending_activations (NMManager * object_manager = _nm_object_get_dbus_object_manager (NM_OBJECT (self)); diff --git a/debian/patches/sd-dhcp-lease-fix-memleaks.patch b/debian/patches/sd-dhcp-lease-fix-memleaks.patch deleted file mode 100644 index 4866a6f6..00000000 --- a/debian/patches/sd-dhcp-lease-fix-memleaks.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Thu, 27 Sep 2018 18:04:59 +0900 -Subject: sd-dhcp-lease: fix memleaks - -(cherry picked from commit e2975f854831d08a25b4f5eb329b6d04102e115f) -(cherry picked from commit 157094abd83f933fad142758a7d177cfa1a347f7) ---- - src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c -index d240259..cac07d3 100644 ---- a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c -+++ b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c -@@ -279,6 +279,8 @@ sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease) { - free(option); - } - -+ free(lease->root_path); -+ free(lease->timezone); - free(lease->hostname); - free(lease->domainname); - free(lease->dns); diff --git a/debian/patches/sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch b/debian/patches/sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch deleted file mode 100644 index f49c9476..00000000 --- a/debian/patches/sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Li Song <song.li@honeywell.com> -Date: Fri, 19 Oct 2018 13:41:51 -0400 -Subject: sd-dhcp: remove unreachable route after rebinding return NAK - -(cherry picked from commit cc3981b1272b9ce37e7d734a7b2f42e84acac535) -(cherry picked from commit 915c2f675a23b2ae16d292d1ac570706f76b384d) -(cherry picked from commit cb77290a696dce924e2a993690634986ac035490) ---- - src/systemd/src/libsystemd-network/sd-dhcp-client.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/systemd/src/libsystemd-network/sd-dhcp-client.c -index 42707f1..9158945 100644 ---- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c -+++ b/src/systemd/src/libsystemd-network/sd-dhcp-client.c -@@ -1688,6 +1688,8 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i - client->timeout_resend = - sd_event_source_unref(client->timeout_resend); - -+ client_notify(client, SD_DHCP_CLIENT_EVENT_EXPIRED); -+ - r = client_initialize(client); - if (r < 0) - goto error; diff --git a/debian/patches/sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch b/debian/patches/sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch deleted file mode 100644 index c04a95a9..00000000 --- a/debian/patches/sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Fri, 19 Oct 2018 03:44:56 +0900 -Subject: sd-dhcp6: fix argument and error handling of - dhcp6_option_parse_status() - -(cherry picked from commit 91c43f3978fa7c8341550b9ca279e460ba7e74e6) -(cherry picked from commit 373cbfc8c6e9591b3c8cc12d58c4b31ac35ab24f) -(cherry picked from commit 0e93fd895daa6f0f578ffa8fc4ed3e0ea85c62e8) ---- - src/systemd/src/libsystemd-network/dhcp6-option.c | 10 ++++++---- - src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 9 +++++---- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c -index ff1cbf1..cfddefc 100644 ---- a/src/systemd/src/libsystemd-network/dhcp6-option.c -+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c -@@ -465,13 +465,15 @@ int dhcp6_option_parse_ia(DHCP6Option *iaoption, DHCP6IA *ia) { - - case SD_DHCP6_OPTION_STATUS_CODE: - -- status = dhcp6_option_parse_status(option, optlen); -- if (status) { -+ status = dhcp6_option_parse_status(option, optlen + sizeof(DHCP6Option)); -+ if (status < 0) { -+ r = status; -+ goto error; -+ } -+ if (status > 0) { - log_dhcp6_client(client, "IA status %d", - status); - -- dhcp6_lease_free_ia(ia); -- - r = -EINVAL; - goto error; - } -diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -index 0b261a2..b694786 100644 ---- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c -@@ -870,13 +870,14 @@ static int client_parse_message( - break; - - case SD_DHCP6_OPTION_STATUS_CODE: -- status = dhcp6_option_parse_status(option, optlen); -- if (status) { -+ status = dhcp6_option_parse_status(option, optlen + sizeof(DHCP6Option)); -+ if (status < 0) -+ return status; -+ -+ if (status > 0) { - log_dhcp6_client(client, "%s Status %s", - dhcp6_message_type_to_string(message->type), - dhcp6_message_status_to_string(status)); -- dhcp6_lease_free_ia(&lease->ia); -- dhcp6_lease_free_ia(&lease->pd); - - return -EINVAL; - } diff --git a/debian/patches/sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch b/debian/patches/sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch deleted file mode 100644 index f8144605..00000000 --- a/debian/patches/sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch +++ /dev/null @@ -1,111 +0,0 @@ -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Fri, 19 Oct 2018 03:42:10 +0900 -Subject: sd-dhcp6: make dhcp6_option_parse_domainname() not store empty - domain - -This improves performance of fuzzer. -C.f. oss-fuzz#11019. - -(cherry picked from commit 3c72b6ed4252e7ff5f7704bfe44557ec197b47fa) -(cherry picked from commit 50403cccee28c7dcd54b138a0d3b3f69ea0204fe) -(cherry picked from commit f11f5abb1a8b96b553d2d156f8b5cf440695c04d) ---- - src/systemd/src/libsystemd-network/dhcp6-option.c | 66 ++++++++++------------- - 1 file changed, 29 insertions(+), 37 deletions(-) - -diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c -index cfddefc..be5c222 100644 ---- a/src/systemd/src/libsystemd-network/dhcp6-option.c -+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c -@@ -555,6 +555,7 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char * - bool first = true; - - for (;;) { -+ const char *label; - uint8_t c; - - c = optval[pos++]; -@@ -562,47 +563,41 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char * - if (c == 0) - /* End of name */ - break; -- else if (c <= 63) { -- const char *label; -- -- /* Literal label */ -- label = (const char *)&optval[pos]; -- pos += c; -- if (pos >= optlen) -- return -EMSGSIZE; -- -- if (!GREEDY_REALLOC(ret, allocated, n + !first + DNS_LABEL_ESCAPED_MAX)) { -- r = -ENOMEM; -- goto fail; -- } -- -- if (first) -- first = false; -- else -- ret[n++] = '.'; -- -- r = dns_label_escape(label, c, ret + n, DNS_LABEL_ESCAPED_MAX); -- if (r < 0) -- goto fail; -- -- n += r; -- continue; -- } else { -- r = -EBADMSG; -- goto fail; -- } -- } -+ if (c > 63) -+ return -EBADMSG; -+ -+ /* Literal label */ -+ label = (const char *)&optval[pos]; -+ pos += c; -+ if (pos >= optlen) -+ return -EMSGSIZE; -+ -+ if (!GREEDY_REALLOC(ret, allocated, n + !first + DNS_LABEL_ESCAPED_MAX)) -+ return -ENOMEM; -+ -+ if (first) -+ first = false; -+ else -+ ret[n++] = '.'; -+ -+ r = dns_label_escape(label, c, ret + n, DNS_LABEL_ESCAPED_MAX); -+ if (r < 0) -+ return r; - -- if (!GREEDY_REALLOC(ret, allocated, n + 1)) { -- r = -ENOMEM; -- goto fail; -+ n += r; - } - -+ if (n == 0) -+ continue; -+ -+ if (!GREEDY_REALLOC(ret, allocated, n + 1)) -+ return -ENOMEM; -+ - ret[n] = 0; - - r = strv_extend(&names, ret); - if (r < 0) -- goto fail; -+ return r; - - idx++; - } -@@ -610,7 +605,4 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char * - *str_arr = TAKE_PTR(names); - - return idx; -- --fail: -- return r; - } diff --git a/debian/patches/series b/debian/patches/series index 05ef7082..f3f8df16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,16 +1,5 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -Don-t-make-NetworkManager-D-Bus-activatable.patch -sd-dhcp-lease-fix-memleaks.patch -dhcp6-fix-buffer-size-checking.patch -sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch -sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch -sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch -dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch -cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch -cli-fix-memory-leaks.patch -cli-tests-fix-output-on-failure.patch -tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch Update-dnsmasq-parameters.patch diff --git a/debian/patches/tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch b/debian/patches/tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch deleted file mode 100644 index 31ec7ee6..00000000 --- a/debian/patches/tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Fri, 2 Nov 2018 13:49:25 +0100 -Subject: tests: simulate old LastScan wifi value in - test-networkmanager-service.py - -In this way clients will randomly find that the AP list is older than -30 seconds and they will issue a new scan. - -(cherry picked from commit 5ba301f4eb652a208a500a39d59dadf427a64590) -(cherry picked from commit 9b0735f6fd9d69b486d54a7ed99b595c111e54f7) ---- - tools/test-networkmanager-service.py | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py -index 8a37fb1..9aa44a9 100755 ---- a/tools/test-networkmanager-service.py -+++ b/tools/test-networkmanager-service.py -@@ -916,16 +916,8 @@ class WifiDevice(Device): - self.aps = [] - self.scan_cb_id = None - -- # Note: we would like to simulate how nmcli calls RequestScan() and we could -- # do so by using an older timestamp. However, that makes the client tests -- # racy, because if a bunch of nmcli instances run in parallel against this -- # service, earlier instances will issue a RequestScan(), while later instances -- # won't do that (because the LastScan timestamp is already updated). That means, -- # the later instances will print the scan result immediately, and in another sort -- # order. That should be fixed, by nmcli not starting to print anything, before -- # all RequestScan() requests complete, and thus, always print a consistent list -- # of results. -- ts = NM.utils_get_timestamp_msec() -+ # Use a randomly older timestamp to trigger RequestScan() from the client -+ ts = max(0, NM.utils_get_timestamp_msec() - Util.random_int(self.path, 20000, 40000)) - - props = { - PRP_WIFI_HW_ADDRESS: mac, diff --git a/debian/rules b/debian/rules index 7c066f7c..048b7818 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,10 @@ include /usr/share/dpkg/architecture.mk +# Without that the tests fail, cannot register existing type 'NMAgentManagerError' +LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') +export LDFLAGS + PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) %: |