From 12aead6b161a3312673ac62686af0350061c0666 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 4 Jan 2019 23:30:05 +0100 Subject: Use debhelper-compat (= 12) Build-Depends and drop debian/compat --- debian/compat | 1 - debian/control | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/compat (limited to 'debian') diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 27fa8d2b..fc282213 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Utopia Maintenance Team , Sjoerd Simons , Aron Xu -Build-Depends: debhelper (>= 11.4~), +Build-Depends: debhelper-compat (= 12), automake (>= 1.12), dpkg-dev (>= 1.17.14), pkg-config, -- cgit 1.3.0-6-gf8a5 From 841d38f99b5e3444494902a7817fed0e8d1ab662 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:02:48 +0100 Subject: New upstream version 1.14.6 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3e505a8e..25589d9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.14.6-1) UNRELEASED; urgency=medium + + * New upstream version 1.14.6 + * Use debhelper-compat (= 12) Build-Depends and drop debian/compat + + -- Michael Biebl Tue, 26 Feb 2019 19:02:37 +0100 + network-manager (1.14.4-4) unstable; urgency=medium * Move D-Bus policy files to /usr/share/dbus-1/system.d/ -- cgit 1.3.0-6-gf8a5 From 9739acb138159aa4df6d6fde42e71ae35f9f4be3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:03:46 +0100 Subject: Rebase patches --- ...n-t-make-NetworkManager-D-Bus-activatable.patch | 4 +- ...Force-online-state-with-unmanaged-devices.patch | 10 +- debian/patches/cli-fix-memory-leaks.patch | 37 ---- .../patches/cli-tests-fix-output-on-failure.patch | 25 --- ...-wifi-scans-to-finish-before-displaying-t.patch | 219 --------------------- .../patches/dhcp6-fix-buffer-size-checking.patch | 25 --- ...we-have-enough-space-for-the-DHCP6-option.patch | 31 --- debian/patches/sd-dhcp-lease-fix-memleaks.patch | 23 --- ...nreachable-route-after-rebinding-return-N.patch | 24 --- ...ument-and-error-handling-of-dhcp6_option_.patch | 60 ------ ...cp6_option_parse_domainname-not-store-emp.patch | 111 ----------- debian/patches/series | 10 - ...ld-LastScan-wifi-value-in-test-networkman.patch | 37 ---- 13 files changed, 7 insertions(+), 609 deletions(-) delete mode 100644 debian/patches/cli-fix-memory-leaks.patch delete mode 100644 debian/patches/cli-tests-fix-output-on-failure.patch delete mode 100644 debian/patches/cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch delete mode 100644 debian/patches/dhcp6-fix-buffer-size-checking.patch delete mode 100644 debian/patches/dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch delete mode 100644 debian/patches/sd-dhcp-lease-fix-memleaks.patch delete mode 100644 debian/patches/sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch delete mode 100644 debian/patches/sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch delete mode 100644 debian/patches/sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch delete mode 100644 debian/patches/tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch (limited to 'debian') diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch index 636865a4..99543a19 100644 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch @@ -10,10 +10,10 @@ to be autostarted by a client request. 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 1e100f6..204f1a0 100644 +index e1b442e..8428816 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -4110,11 +4110,6 @@ endif +@@ -4105,11 +4105,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index ae96f968..80d3158a 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 7598995..1439c47 100644 +index 3ddc3b9..ada30d9 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -73,7 +73,7 @@ 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, +@@ -6217,6 +6247,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 7598995..1439c47 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6377,6 +6463,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6385,6 +6471,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 7598995..1439c47 100644 return TRUE; } -@@ -7231,6 +7320,22 @@ nm_manager_init (NMManager *self) +@@ -7239,6 +7328,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) +@@ -7514,6 +7619,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } 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 -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 -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 -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 -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 -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/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 -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 -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 -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 -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 a5646381..6da89bb7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,13 +1,3 @@ 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 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 -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, -- cgit 1.3.0-6-gf8a5 From e60e21acf2c84538f9cd75be952dd53ecd4eda2e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:16:52 +0100 Subject: Do not manage Docker bridge interfaces Closes: #875127 --- .../Do-not-manage-Docker-bridge-interfaces.patch | 24 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 25 insertions(+) create mode 100644 debian/patches/Do-not-manage-Docker-bridge-interfaces.patch (limited to 'debian') diff --git a/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch b/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch new file mode 100644 index 00000000..9525cc2a --- /dev/null +++ b/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch @@ -0,0 +1,24 @@ +From: Andrei Dziahel +Date: Mon, 17 Sep 2018 10:03:15 +0000 +Subject: Do not manage Docker bridge interfaces + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/15 +(cherry picked from commit 0ce73275506e8d3156b8d3cd9ca7a1105c5dc4fb) +--- + data/85-nm-unmanaged.rules | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules +index edc4ddb..20f4d29 100644 +--- a/data/85-nm-unmanaged.rules ++++ b/data/85-nm-unmanaged.rules +@@ -26,6 +26,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1" + # in another net namespace and managed by libvirt, Docker or the like. + ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1" + ++# Docker bridge. Managed by docker daemon. ++ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*", ENV{NM_UNMANAGED}="1" ++ + # USB gadget device. Unmanage by default, since whatever created it + # might want to set it up itself (e.g. activate an ipv4.method=shared + # connection). diff --git a/debian/patches/series b/debian/patches/series index 6da89bb7..fdf5b213 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +Do-not-manage-Docker-bridge-interfaces.patch 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 -- cgit 1.3.0-6-gf8a5 From c9f65a7cc31dd2412fd730523b05c2099172ca70 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:33:50 +0100 Subject: Bump Standards-Version to 4.3.0 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index fc282213..f42b6bf5 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Build-Depends: debhelper-compat (= 12), valac (>= 0.17.1.24), dbus , python-dbus -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 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 23ee58e8207cc232f91bec1ea7117026b84498e2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:34:08 +0100 Subject: Release version 1.14.6-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 25589d9e..849260e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -network-manager (1.14.6-1) UNRELEASED; urgency=medium +network-manager (1.14.6-1) unstable; urgency=medium * New upstream version 1.14.6 * Use debhelper-compat (= 12) Build-Depends and drop debian/compat + * Rebase patches + * Do not manage Docker bridge interfaces (Closes: #875127) + * Bump Standards-Version to 4.3.0 - -- Michael Biebl Tue, 26 Feb 2019 19:02:37 +0100 + -- Michael Biebl Tue, 26 Feb 2019 19:33:53 +0100 network-manager (1.14.4-4) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From d9a08837575148bbfb1a45a9230681ad8e6d3497 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 21:22:22 +0100 Subject: supplicant: fix setting pmf when the supplicant doesn't advertise support --- debian/patches/series | 1 + ...etting-pmf-when-the-supplicant-doesn-t-ad.patch | 74 ++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch (limited to 'debian') diff --git a/debian/patches/series b/debian/patches/series index fdf5b213..b21e8a16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ Do-not-manage-Docker-bridge-interfaces.patch +supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch 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 diff --git a/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch b/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch new file mode 100644 index 00000000..38930c48 --- /dev/null +++ b/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch @@ -0,0 +1,74 @@ +From: Beniamino Galvani +Date: Mon, 25 Feb 2019 08:38:22 +0100 +Subject: supplicant: fix setting pmf when the supplicant doesn't advertise + support + +wpa_supplicant only advertises pmf support since commit [1], which is +after 2.6. When using a version without that commit (for example, +plain 2.6), we would unconditionally set the global Pmf property to 1 +(optional) and then skip setting the per-network property. The result +was that pmf was enabled without the possibility to disable it by +user. The correct behavior is instead to disable pmf on such versions. + +[1] https://w1.fi/cgit/hostap/commit/?id=3cdb4ac074f76accf24a51d143db545afad2c90b + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/129 +(cherry picked from commit 560a35dd433cd6bf2268aaf757fda798f35712fe) +(cherry picked from commit b837561bb6fc09d4134ac8c5c6dc5ac1885ebf62) +(cherry picked from commit 353743b99520ba481d08b52b31af16dcfc80d39f) +--- + src/supplicant/nm-supplicant-interface.c | 33 +++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c +index 0af9ebd..b2a89ce 100644 +--- a/src/supplicant/nm-supplicant-interface.c ++++ b/src/supplicant/nm-supplicant-interface.c +@@ -568,9 +568,8 @@ iface_set_pmf_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) + + self = NM_SUPPLICANT_INTERFACE (user_data); + +- /* This can fail if the supplicant doesn't support PMF */ + if (error) +- _LOGD ("failed to set Pmf=1: %s", error->message); ++ _LOGW ("failed to set Pmf=1: %s", error->message); + + iface_check_ready (self); + } +@@ -1175,19 +1174,23 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ + NULL, + NULL); + +- /* Initialize global PMF setting to 'optional' */ +- priv->ready_count = 1; +- g_dbus_proxy_call (priv->iface_proxy, +- DBUS_INTERFACE_PROPERTIES ".Set", +- g_variant_new ("(ssv)", +- WPAS_DBUS_IFACE_INTERFACE, +- "Pmf", +- g_variant_new_string ("1")), +- G_DBUS_CALL_FLAGS_NONE, +- -1, +- priv->init_cancellable, +- (GAsyncReadyCallback) iface_set_pmf_cb, +- self); ++ priv->ready_count = 0; ++ ++ if (priv->pmf_support == NM_SUPPLICANT_FEATURE_YES) { ++ /* Initialize global PMF setting to 'optional' */ ++ priv->ready_count++; ++ g_dbus_proxy_call (priv->iface_proxy, ++ DBUS_INTERFACE_PROPERTIES ".Set", ++ g_variant_new ("(ssv)", ++ WPAS_DBUS_IFACE_INTERFACE, ++ "Pmf", ++ g_variant_new_string ("1")), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ priv->init_cancellable, ++ (GAsyncReadyCallback) iface_set_pmf_cb, ++ self); ++ } + + /* Check whether NetworkReply and AP mode are supported */ + priv->ready_count++; -- cgit 1.3.0-6-gf8a5 From 61ab6036007ca162bd3a54615c9db2f8e2af2267 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 21:23:31 +0100 Subject: Release version 1.14.6-2 to unstable --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 849260e4..7cb171e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.14.6-2) unstable; urgency=medium + + * supplicant: fix setting pmf when the supplicant doesn't advertise support + + -- Michael Biebl Tue, 26 Feb 2019 21:23:14 +0100 + network-manager (1.14.6-1) unstable; urgency=medium * New upstream version 1.14.6 -- cgit 1.3.0-6-gf8a5 From f97666c6bd29a3228443acd6401a407a19ec8d25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:24:10 +0100 Subject: Switch debian-branch to experimental Gbp-Dch: Ignore --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf index 478d845c..ffa7b970 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = master +debian-branch = experimental -- cgit 1.3.0-6-gf8a5 From 913234b2b0309b924e247c30800ad2846bab0e1d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:44:24 +0100 Subject: New upstream version 1.16.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7cb171e5..799458b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.16.0-1) UNRELEASED; urgency=medium + + * New upstream version 1.16.0 + + -- Michael Biebl Tue, 26 Mar 2019 23:44:12 +0100 + network-manager (1.14.6-2) unstable; urgency=medium * supplicant: fix setting pmf when the supplicant doesn't advertise support -- cgit 1.3.0-6-gf8a5 From 903aeeff4227bf5f227459da5a09cd9fb9784d2a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:32:57 +0100 Subject: Rebase patches --- .../Do-not-manage-Docker-bridge-interfaces.patch | 24 ------- ...n-t-make-NetworkManager-D-Bus-activatable.patch | 39 ------------ ...-Sleep-Monitor-if-not-booted-with-systemd.patch | 8 +-- ...Force-online-state-with-unmanaged-devices.patch | 18 +++--- debian/patches/series | 3 - ...etting-pmf-when-the-supplicant-doesn-t-ad.patch | 74 ---------------------- 6 files changed, 13 insertions(+), 153 deletions(-) delete mode 100644 debian/patches/Do-not-manage-Docker-bridge-interfaces.patch delete mode 100644 debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch delete mode 100644 debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch (limited to 'debian') diff --git a/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch b/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch deleted file mode 100644 index 9525cc2a..00000000 --- a/debian/patches/Do-not-manage-Docker-bridge-interfaces.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Andrei Dziahel -Date: Mon, 17 Sep 2018 10:03:15 +0000 -Subject: Do not manage Docker bridge interfaces - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/15 -(cherry picked from commit 0ce73275506e8d3156b8d3cd9ca7a1105c5dc4fb) ---- - data/85-nm-unmanaged.rules | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules -index edc4ddb..20f4d29 100644 ---- a/data/85-nm-unmanaged.rules -+++ b/data/85-nm-unmanaged.rules -@@ -26,6 +26,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1" - # in another net namespace and managed by libvirt, Docker or the like. - ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1" - -+# Docker bridge. Managed by docker daemon. -+ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*", ENV{NM_UNMANAGED}="1" -+ - # USB gadget device. Unmanage by default, since whatever created it - # might want to set it up itself (e.g. activate an ipv4.method=shared - # connection). 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 99543a19..00000000 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Michael Biebl -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 e1b442e..8428816 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4105,11 +4105,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/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 5ab7a01d..7d869e6f 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,18 +16,18 @@ Closes: #742933 1 file changed, 5 insertions(+) diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index 54d7577..a4bb43f 100644 +index 7e0ebe6..aa694d5 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c -@@ -25,6 +25,7 @@ - #include +@@ -23,6 +23,7 @@ + #include #include +#include #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -@@ -344,6 +345,10 @@ on_proxy_acquired (GObject *object, +@@ -342,6 +343,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 80d3158a..dc3c2ba7 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 3ddc3b9..ada30d9 100644 +index 0bf6a75..46ced5b 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -62,6 +62,8 @@ +@@ -61,6 +61,8 @@ #include "nm-dispatcher.h" #include "NetworkManagerUtils.h" @@ -24,7 +24,7 @@ index 3ddc3b9..ada30d9 100644 /*****************************************************************************/ typedef struct { -@@ -192,6 +194,10 @@ typedef struct { +@@ -193,6 +195,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 3ddc3b9..ada30d9 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1417,6 +1423,27 @@ find_best_device_state (NMManager *manager) +@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 3ddc3b9..ada30d9 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1455,6 +1482,9 @@ nm_manager_update_state (NMManager *self) +@@ -1476,6 +1503,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index 3ddc3b9..ada30d9 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6217,6 +6247,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6481,6 +6511,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 3ddc3b9..ada30d9 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6385,6 +6471,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6649,6 +6735,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 3ddc3b9..ada30d9 100644 return TRUE; } -@@ -7239,6 +7328,22 @@ nm_manager_init (NMManager *self) +@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 3ddc3b9..ada30d9 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7514,6 +7619,16 @@ dispose (GObject *object) +@@ -7783,6 +7888,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/series b/debian/patches/series index b21e8a16..9a20acf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ -Do-not-manage-Docker-bridge-interfaces.patch -supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch 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 diff --git a/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch b/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch deleted file mode 100644 index 38930c48..00000000 --- a/debian/patches/supplicant-fix-setting-pmf-when-the-supplicant-doesn-t-ad.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Beniamino Galvani -Date: Mon, 25 Feb 2019 08:38:22 +0100 -Subject: supplicant: fix setting pmf when the supplicant doesn't advertise - support - -wpa_supplicant only advertises pmf support since commit [1], which is -after 2.6. When using a version without that commit (for example, -plain 2.6), we would unconditionally set the global Pmf property to 1 -(optional) and then skip setting the per-network property. The result -was that pmf was enabled without the possibility to disable it by -user. The correct behavior is instead to disable pmf on such versions. - -[1] https://w1.fi/cgit/hostap/commit/?id=3cdb4ac074f76accf24a51d143db545afad2c90b - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/129 -(cherry picked from commit 560a35dd433cd6bf2268aaf757fda798f35712fe) -(cherry picked from commit b837561bb6fc09d4134ac8c5c6dc5ac1885ebf62) -(cherry picked from commit 353743b99520ba481d08b52b31af16dcfc80d39f) ---- - src/supplicant/nm-supplicant-interface.c | 33 +++++++++++++++++--------------- - 1 file changed, 18 insertions(+), 15 deletions(-) - -diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c -index 0af9ebd..b2a89ce 100644 ---- a/src/supplicant/nm-supplicant-interface.c -+++ b/src/supplicant/nm-supplicant-interface.c -@@ -568,9 +568,8 @@ iface_set_pmf_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) - - self = NM_SUPPLICANT_INTERFACE (user_data); - -- /* This can fail if the supplicant doesn't support PMF */ - if (error) -- _LOGD ("failed to set Pmf=1: %s", error->message); -+ _LOGW ("failed to set Pmf=1: %s", error->message); - - iface_check_ready (self); - } -@@ -1175,19 +1174,23 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ - NULL, - NULL); - -- /* Initialize global PMF setting to 'optional' */ -- priv->ready_count = 1; -- g_dbus_proxy_call (priv->iface_proxy, -- DBUS_INTERFACE_PROPERTIES ".Set", -- g_variant_new ("(ssv)", -- WPAS_DBUS_IFACE_INTERFACE, -- "Pmf", -- g_variant_new_string ("1")), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- priv->init_cancellable, -- (GAsyncReadyCallback) iface_set_pmf_cb, -- self); -+ priv->ready_count = 0; -+ -+ if (priv->pmf_support == NM_SUPPLICANT_FEATURE_YES) { -+ /* Initialize global PMF setting to 'optional' */ -+ priv->ready_count++; -+ g_dbus_proxy_call (priv->iface_proxy, -+ DBUS_INTERFACE_PROPERTIES ".Set", -+ g_variant_new ("(ssv)", -+ WPAS_DBUS_IFACE_INTERFACE, -+ "Pmf", -+ g_variant_new_string ("1")), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ priv->init_cancellable, -+ (GAsyncReadyCallback) iface_set_pmf_cb, -+ self); -+ } - - /* Check whether NetworkReply and AP mode are supported */ - priv->ready_count++; -- cgit 1.3.0-6-gf8a5 From 55431a47be2a87988ac129c8fba6d69179b52ca5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:58:20 +0100 Subject: Update symbols file for linm0 --- debian/libnm0.symbols | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index fd43fa93..85dcd4d4 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.16.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 @@ -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.16.0 + nm_client_add_and_activate_connection2_finish@libnm_1_16_0 1.16.0 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.16.0 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 @@ -388,6 +392,13 @@ libnm.so.0 libnm0 #MINVER# nm_device_wifi_get_mode@libnm_1_0_0 1.0.0 nm_device_wifi_get_permanent_hw_address@libnm_1_0_0 1.0.0 nm_device_wifi_get_type@libnm_1_0_0 1.0.0 + nm_device_wifi_p2p_get_hw_address@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_get_peers@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_get_type@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_start_find@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_start_find_finish@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_stop_find@libnm_1_16_0 1.16.0 + nm_device_wifi_p2p_stop_find_finish@libnm_1_16_0 1.16.0 nm_device_wifi_request_scan@libnm_1_0_0 1.0.0 nm_device_wifi_request_scan_async@libnm_1_0_0 1.0.0 nm_device_wifi_request_scan_finish@libnm_1_0_0 1.0.0 @@ -1071,6 +1082,11 @@ libnm.so.0 libnm0 #MINVER# nm_setting_vxlan_get_ttl@libnm_1_2_0 1.1.90 nm_setting_vxlan_get_type@libnm_1_2_0 1.1.90 nm_setting_vxlan_new@libnm_1_2_0 1.1.90 + nm_setting_wifi_p2p_get_peer@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_get_type@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_get_wfd_ies@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_get_wps_method@libnm_1_16_0 1.16.0 + nm_setting_wifi_p2p_new@libnm_1_16_0 1.16.0 nm_setting_wimax_get_mac_address@libnm_1_0_0 1.0.0 nm_setting_wimax_get_network_name@libnm_1_0_0 1.0.0 nm_setting_wimax_get_type@libnm_1_0_0 1.0.0 @@ -1106,6 +1122,21 @@ libnm.so.0 libnm0 #MINVER# nm_setting_wired_remove_s390_option@libnm_1_0_0 1.0.0 nm_setting_wired_wake_on_lan_get_type@libnm_1_0_6 1.0.6 nm_setting_wired_wake_on_lan_get_type@libnm_1_2_0 1.1.90 + nm_setting_wireguard_append_peer@libnm_1_16_0 1.16.0 + nm_setting_wireguard_clear_peers@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_fwmark@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_listen_port@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_mtu@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peer@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peer_by_public_key@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peer_routes@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_peers_len@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_private_key@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_private_key_flags@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_type@libnm_1_16_0 1.16.0 + nm_setting_wireguard_new@libnm_1_16_0 1.16.0 + nm_setting_wireguard_remove_peer@libnm_1_16_0 1.16.0 + nm_setting_wireguard_set_peer@libnm_1_16_0 1.16.0 nm_setting_wireless_add_mac_blacklist_item@libnm_1_0_0 1.0.0 nm_setting_wireless_add_seen_bssid@libnm_1_0_0 1.0.0 nm_setting_wireless_ap_security_compatible@libnm_1_0_0 1.0.0 @@ -1245,6 +1276,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.16.0 + nm_team_link_watcher_new_arp_ping2@libnm_1_16_0 1.16.0 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 @@ -1252,6 +1285,7 @@ libnm.so.0 libnm0 #MINVER# nm_team_link_watcher_unref@libnm_1_10_2 1.10.2 nm_ternary_get_type@libnm_1_14_0 1.13.90 nm_utils_ap_mode_security_valid@libnm_1_0_0 1.0.0 + nm_utils_base64secret_decode@libnm_1_16_0 1.16.0 nm_utils_bin2hexstr@libnm_1_0_0 1.0.0 nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.1.90 nm_utils_bond_mode_string_to_int@libnm_1_2_0 1.1.90 @@ -1400,6 +1434,19 @@ libnm.so.0 libnm0 #MINVER# nm_vpn_service_plugin_shutdown@libnm_1_12_0 1.11.3 nm_vpn_service_state_get_type@libnm_1_0_0 1.0.0 nm_wep_key_type_get_type@libnm_1_0_0 1.0.0 + nm_wifi_p2p_peer_connection_valid@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_filter_connections@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_flags@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_hw_address@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_last_seen@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_manufacturer@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_model@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_model_number@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_name@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_serial@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_strength@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_type@libnm_1_16_0 1.16.0 + nm_wifi_p2p_peer_get_wfd_ies@libnm_1_16_0 1.16.0 nm_wimax_nsp_connection_valid@libnm_1_0_0 1.0.0 nm_wimax_nsp_filter_connections@libnm_1_0_0 1.0.0 nm_wimax_nsp_get_name@libnm_1_0_0 1.0.0 @@ -1407,3 +1454,27 @@ libnm.so.0 libnm0 #MINVER# nm_wimax_nsp_get_signal_quality@libnm_1_0_0 1.0.0 nm_wimax_nsp_get_type@libnm_1_0_0 1.0.0 nm_wimax_nsp_network_type_get_type@libnm_1_0_0 1.0.0 + nm_wireguard_peer_append_allowed_ip@libnm_1_16_0 1.16.0 + nm_wireguard_peer_clear_allowed_ips@libnm_1_16_0 1.16.0 + nm_wireguard_peer_cmp@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_allowed_ip@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_allowed_ips_len@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_endpoint@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_persistent_keepalive@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_preshared_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_preshared_key_flags@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_public_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_get_type@libnm_1_16_0 1.16.0 + nm_wireguard_peer_is_sealed@libnm_1_16_0 1.16.0 + nm_wireguard_peer_is_valid@libnm_1_16_0 1.16.0 + nm_wireguard_peer_new@libnm_1_16_0 1.16.0 + nm_wireguard_peer_new_clone@libnm_1_16_0 1.16.0 + nm_wireguard_peer_ref@libnm_1_16_0 1.16.0 + nm_wireguard_peer_remove_allowed_ip@libnm_1_16_0 1.16.0 + nm_wireguard_peer_seal@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_endpoint@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_persistent_keepalive@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_preshared_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_preshared_key_flags@libnm_1_16_0 1.16.0 + nm_wireguard_peer_set_public_key@libnm_1_16_0 1.16.0 + nm_wireguard_peer_unref@libnm_1_16_0 1.16.0 -- cgit 1.3.0-6-gf8a5 From b44a2a5120eabc3e2618cb98b4ff14f33988dd84 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 27 Mar 2019 00:12:40 +0100 Subject: Drop migration code from pre-stretch --- debian/network-manager.maintscript | 1 - debian/network-manager.preinst | 43 -------------------------------------- 2 files changed, 44 deletions(-) delete mode 100644 debian/network-manager.preinst (limited to 'debian') diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript index 02266a64..673456df 100644 --- a/debian/network-manager.maintscript +++ b/debian/network-manager.maintscript @@ -1,4 +1,3 @@ -rm_conffile /etc/dbus-1/system.d/nm-avahi-autoipd.conf 1.1.90-2~ mv_conffile /etc/NetworkManager/dispatcher.d/01ifupdown /etc/NetworkManager/dispatcher.d/01-ifupdown 1.8.0-5~ rm_conffile /etc/dbus-1/system.d/nm-dispatcher.conf 1.14.4-4~ rm_conffile /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 1.14.4-4~ diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst deleted file mode 100644 index 929d3e1c..00000000 --- a/debian/network-manager.preinst +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -set -e - -# This script can be called in the following ways: -# -# Before the package is installed: -# install -# -# Before removed package is upgraded: -# install -# -# Before the package is upgraded: -# upgrade -# -# -# If postrm fails during upgrade or fails on failed upgrade: -# abort-upgrade - -case "$1" in - install|upgrade) - if dpkg --compare-versions "$2" lt-nl "1.0.0-4"; then - if [ -L /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ]; then - rm -f /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - fi - fi - - # Purge the state so the service gets properly enabled on upgrades - if dpkg --compare-versions "$2" lt-nl "1.2.2-2"; then - deb-systemd-helper purge NetworkManager-wait-online.service - fi - ;; - - abort-upgrade) - ;; - - *) - echo "$0 called with unknown argument \`$1'" 1>&2 - exit 1 - ;; -esac - -#DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 9ed9bd23fc041b72f9f40c9ba636b83a442bb8df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 27 Mar 2019 00:14:14 +0100 Subject: Release version 1.16.0-1 to experimental --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 799458b8..dbb74e80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -network-manager (1.16.0-1) UNRELEASED; urgency=medium +network-manager (1.16.0-1) experimental; urgency=medium * New upstream version 1.16.0 + * Rebase patches + * Update symbols file for linm0 + * Drop migration code from pre-stretch - -- Michael Biebl Tue, 26 Mar 2019 23:44:12 +0100 + -- Michael Biebl Wed, 27 Mar 2019 00:13:49 +0100 network-manager (1.14.6-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From c6087ff02e7c2bf31dd8376665bb6c0a01974311 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 Apr 2019 10:45:44 +0200 Subject: Drop dependency on lsb-base It is only needed when booting with sysvinit and initscripts, but initscripts already Depends on lsb-base (see #864999). --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f42b6bf5..10233b3e 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,6 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libnm0 (= ${binary:Version}), - lsb-base, wpasupplicant, dbus, udev, -- cgit 1.3.0-6-gf8a5 From c321cd446a437ef3ef4e64169c4eca4d01b95d92 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 Apr 2019 10:58:05 +0200 Subject: Drop dpkg-dev (>= 1.17.14) Build-Depends No longer needed as even the version in oldstable is new enough. --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 10233b3e..eef01493 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Uploaders: Michael Biebl , Aron Xu Build-Depends: debhelper-compat (= 12), automake (>= 1.12), - dpkg-dev (>= 1.17.14), pkg-config, intltool, libglib2.0-dev (>= 2.32), -- cgit 1.3.0-6-gf8a5 From 6cbf8459e4602877369dbf20c6597708725758c6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 Apr 2019 11:09:23 +0200 Subject: Release version 1.16.0-2 to experimental --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dbb74e80..a18fd7df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (1.16.0-2) experimental; urgency=medium + + * Drop dependency on lsb-base. + It is only needed when booting with sysvinit and initscripts, but + initscripts already Depends on lsb-base (see #864999). + * Drop dpkg-dev (>= 1.17.14) Build-Depends. + No longer needed as even the version in oldstable is new enough. + + -- Michael Biebl Thu, 11 Apr 2019 11:07:57 +0200 + network-manager (1.16.0-1) experimental; urgency=medium * New upstream version 1.16.0 -- cgit 1.3.0-6-gf8a5 From 37a1a6f27003011882d575fc6b47c2dd41d9b46d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:11:02 +0200 Subject: New upstream version 1.18.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a18fd7df..bde85c6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.18.0-1) UNRELEASED; urgency=medium + + * New upstream version 1.18.0 + + -- Michael Biebl Sun, 21 Apr 2019 21:10:59 +0200 + network-manager (1.16.0-2) experimental; urgency=medium * Drop dependency on lsb-base. -- cgit 1.3.0-6-gf8a5 From 635386d222a63f74c09d0d0639cf27723e94b3ef Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:23:11 +0200 Subject: Rebase patches --- .../Force-online-state-with-unmanaged-devices.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 dc3c2ba7..7b9e28c2 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 0bf6a75..46ced5b 100644 +index 40e068a..bd197fe 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -61,6 +61,8 @@ @@ -35,7 +35,7 @@ index 0bf6a75..46ced5b 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1430,6 +1436,27 @@ find_best_device_state (NMManager *manager) +@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 0bf6a75..46ced5b 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1476,6 +1503,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,7 +73,7 @@ index 0bf6a75..46ced5b 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6481,6 +6511,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6498,6 +6528,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 0bf6a75..46ced5b 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6649,6 +6735,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6666,6 +6752,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 0bf6a75..46ced5b 100644 return TRUE; } -@@ -7508,6 +7597,22 @@ nm_manager_init (NMManager *self) +@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 0bf6a75..46ced5b 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7783,6 +7888,16 @@ dispose (GObject *object) +@@ -7800,6 +7905,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From 4c70cd9a45a005fd7f66e45561286ea7dece0492 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:24:21 +0200 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 85dcd4d4..81055a11 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -9,6 +9,7 @@ libnm.so.0 libnm0 #MINVER# 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.16.0 + libnm_1_18_0@libnm_1_18_0 1.18.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 @@ -55,6 +56,21 @@ libnm.so.0 libnm0 #MINVER# nm_agent_manager_error_get_type@libnm_1_0_0 1.0.0 nm_agent_manager_error_quark@libnm_1_0_0 1.0.0 nm_bluetooth_capabilities_get_type@libnm_1_0_0 1.0.0 + nm_bridge_vlan_cmp@libnm_1_18_0 1.18.0 + nm_bridge_vlan_from_str@libnm_1_18_0 1.18.0 + nm_bridge_vlan_get_type@libnm_1_18_0 1.18.0 + nm_bridge_vlan_get_vid_range@libnm_1_18_0 1.18.0 + nm_bridge_vlan_is_pvid@libnm_1_18_0 1.18.0 + nm_bridge_vlan_is_sealed@libnm_1_18_0 1.18.0 + nm_bridge_vlan_is_untagged@libnm_1_18_0 1.18.0 + nm_bridge_vlan_new@libnm_1_18_0 1.18.0 + nm_bridge_vlan_new_clone@libnm_1_18_0 1.18.0 + nm_bridge_vlan_ref@libnm_1_18_0 1.18.0 + nm_bridge_vlan_seal@libnm_1_18_0 1.18.0 + nm_bridge_vlan_set_pvid@libnm_1_18_0 1.18.0 + nm_bridge_vlan_set_untagged@libnm_1_18_0 1.18.0 + nm_bridge_vlan_to_str@libnm_1_18_0 1.18.0 + nm_bridge_vlan_unref@libnm_1_18_0 1.18.0 nm_capability_get_type@libnm_1_6_0 1.5.90 nm_checkpoint_create_flags_get_type@libnm_1_12_0 1.11.3 nm_checkpoint_get_created@libnm_1_12_0 1.11.3 @@ -482,12 +498,57 @@ libnm.so.0 libnm0 #MINVER# nm_ip_route_set_next_hop_binary@libnm_1_0_0 1.0.0 nm_ip_route_set_prefix@libnm_1_0_0 1.0.0 nm_ip_route_unref@libnm_1_0_0 1.0.0 + nm_ip_routing_rule_as_string_flags_get_type@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_cmp@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_from_string@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_action@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_addr_family@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_destination_port_end@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_destination_port_start@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_from@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_from_len@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_fwmark@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_fwmask@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_iifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_invert@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_ipproto@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_oifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_priority@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_source_port_end@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_source_port_start@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_table@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_to@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_to_len@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_tos@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_type@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_is_sealed@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_new@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_new_clone@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_ref@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_seal@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_action@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_destination_port@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_from@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_fwmark@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_iifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_invert@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_ipproto@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_oifname@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_priority@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_source_port@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_table@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_to@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_tos@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_to_string@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_unref@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_validate@libnm_1_18_0 1.18.0 nm_ip_tunnel_flags_get_type@libnm_1_12_0 1.11.3 nm_ip_tunnel_mode_get_type@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_names@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_string_value@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_type@libnm_1_2_0 1.1.90 nm_lldp_neighbor_get_attr_uint_value@libnm_1_2_0 1.1.90 + nm_lldp_neighbor_get_attr_value@libnm_1_18_0 1.18.0 nm_lldp_neighbor_get_type@libnm_1_2_0 1.1.90 nm_lldp_neighbor_new@libnm_1_2_0 1.1.90 nm_lldp_neighbor_ref@libnm_1_2_0 1.1.90 @@ -647,6 +708,8 @@ libnm.so.0 libnm0 #MINVER# nm_setting_bond_new@libnm_1_0_0 1.0.0 nm_setting_bond_remove_option@libnm_1_0_0 1.0.0 nm_setting_bond_validate_option@libnm_1_0_0 1.0.0 + nm_setting_bridge_add_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_clear_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_get_ageing_time@libnm_1_0_0 1.0.0 nm_setting_bridge_get_forward_delay@libnm_1_0_0 1.0.0 nm_setting_bridge_get_group_forward_mask@libnm_1_10_0 1.9.90 @@ -654,15 +717,27 @@ libnm.so.0 libnm0 #MINVER# nm_setting_bridge_get_mac_address@libnm_1_0_0 1.0.0 nm_setting_bridge_get_max_age@libnm_1_0_0 1.0.0 nm_setting_bridge_get_multicast_snooping@libnm_1_2_0 1.1.90 + nm_setting_bridge_get_num_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_get_priority@libnm_1_0_0 1.0.0 nm_setting_bridge_get_stp@libnm_1_0_0 1.0.0 nm_setting_bridge_get_type@libnm_1_0_0 1.0.0 + nm_setting_bridge_get_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_get_vlan_default_pvid@libnm_1_18_0 1.18.0 + nm_setting_bridge_get_vlan_filtering@libnm_1_18_0 1.18.0 nm_setting_bridge_new@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_add_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_port_clear_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_port_get_hairpin_mode@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_get_num_vlans@libnm_1_18_0 1.18.0 nm_setting_bridge_port_get_path_cost@libnm_1_0_0 1.0.0 nm_setting_bridge_port_get_priority@libnm_1_0_0 1.0.0 nm_setting_bridge_port_get_type@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_get_vlan@libnm_1_18_0 1.18.0 nm_setting_bridge_port_new@libnm_1_0_0 1.0.0 + nm_setting_bridge_port_remove_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_port_remove_vlan_by_vid@libnm_1_18_0 1.18.0 + nm_setting_bridge_remove_vlan@libnm_1_18_0 1.18.0 + nm_setting_bridge_remove_vlan_by_vid@libnm_1_18_0 1.18.0 nm_setting_cdma_get_mtu@libnm_1_8_0 1.8.0 nm_setting_cdma_get_number@libnm_1_0_0 1.0.0 nm_setting_cdma_get_password@libnm_1_0_0 1.0.0 @@ -797,11 +872,13 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_add_dns_option@libnm_1_2_0 1.1.90 nm_setting_ip_config_add_dns_search@libnm_1_0_0 1.0.0 nm_setting_ip_config_add_route@libnm_1_0_0 1.0.0 + nm_setting_ip_config_add_routing_rule@libnm_1_18_0 1.18.0 nm_setting_ip_config_clear_addresses@libnm_1_0_0 1.0.0 nm_setting_ip_config_clear_dns@libnm_1_0_0 1.0.0 nm_setting_ip_config_clear_dns_options@libnm_1_2_0 1.1.90 nm_setting_ip_config_clear_dns_searches@libnm_1_0_0 1.0.0 nm_setting_ip_config_clear_routes@libnm_1_0_0 1.0.0 + nm_setting_ip_config_clear_routing_rules@libnm_1_18_0 1.18.0 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 @@ -823,9 +900,11 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_get_num_dns_options@libnm_1_2_0 1.1.90 nm_setting_ip_config_get_num_dns_searches@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_num_routes@libnm_1_0_0 1.0.0 + nm_setting_ip_config_get_num_routing_rules@libnm_1_18_0 1.18.0 nm_setting_ip_config_get_route@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_route_metric@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_route_table@libnm_1_10_0 1.9.90 + nm_setting_ip_config_get_routing_rule@libnm_1_18_0 1.18.0 nm_setting_ip_config_get_type@libnm_1_0_0 1.0.0 nm_setting_ip_config_has_dns_options@libnm_1_2_0 1.1.90 nm_setting_ip_config_remove_address@libnm_1_0_0 1.0.0 @@ -838,6 +917,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_remove_dns_search_by_value@libnm_1_0_0 1.0.0 nm_setting_ip_config_remove_route@libnm_1_0_0 1.0.0 nm_setting_ip_config_remove_route_by_value@libnm_1_0_0 1.0.0 + nm_setting_ip_config_remove_routing_rule@libnm_1_18_0 1.18.0 nm_setting_ip_tunnel_get_flags@libnm_1_12_0 1.11.3 nm_setting_ip_tunnel_get_input_key@libnm_1_2_0 1.1.90 nm_setting_ip_tunnel_get_local@libnm_1_2_0 1.1.90 @@ -1245,12 +1325,15 @@ libnm.so.0 libnm0 #MINVER# nm_tc_action_unref@libnm_1_10_2 1.10.2 nm_tc_qdisc_dup@libnm_1_10_2 1.10.2 nm_tc_qdisc_equal@libnm_1_10_2 1.10.2 + nm_tc_qdisc_get_attribute@libnm_1_18_0 1.18.0 + nm_tc_qdisc_get_attribute_names@libnm_1_18_0 1.18.0 nm_tc_qdisc_get_handle@libnm_1_10_2 1.10.2 nm_tc_qdisc_get_kind@libnm_1_10_2 1.10.2 nm_tc_qdisc_get_parent@libnm_1_10_2 1.10.2 nm_tc_qdisc_get_type@libnm_1_10_2 1.10.2 nm_tc_qdisc_new@libnm_1_10_2 1.10.2 nm_tc_qdisc_ref@libnm_1_10_2 1.10.2 + nm_tc_qdisc_set_attribute@libnm_1_18_0 1.18.0 nm_tc_qdisc_set_handle@libnm_1_10_2 1.10.2 nm_tc_qdisc_unref@libnm_1_10_2 1.10.2 nm_tc_tfilter_dup@libnm_1_10_2 1.10.2 -- cgit 1.3.0-6-gf8a5 From a234b9547dd91da69531099ffb09b84f2988c641 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 22:29:11 +0200 Subject: Release version 1.18.0-1 to experimental --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bde85c6e..b98846a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (1.18.0-1) UNRELEASED; urgency=medium +network-manager (1.18.0-1) experimental; urgency=medium * New upstream version 1.18.0 + * Rebase patches + * Update symbols file for libnm0 - -- Michael Biebl Sun, 21 Apr 2019 21:10:59 +0200 + -- Michael Biebl Sun, 21 Apr 2019 22:28:56 +0200 network-manager (1.16.0-2) experimental; urgency=medium -- cgit 1.3.0-6-gf8a5 From 1ad5e7de3db5851984bd192cbe1e0752da8fa67c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 May 2019 13:05:15 +0200 Subject: Fix package description after avahi-autoipd removal Remove leftover avahi-autopid bits from package description. Fixes commit d701201bfd5b2d7a6bb1cc81660ae55fd4f4e36b. Gbp-Dch: Short Thanks: Sebastien Bacher --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index eef01493..861acf40 100644 --- a/debian/control +++ b/debian/control @@ -79,7 +79,6 @@ Description: network management framework (daemon and userspace tools) * ppp: Required for establishing dial-up connections (e.g. via GSM). * dnsmasq-base/iptables: Required for creating Ad-hoc connections and connection sharing. - address configuration. * libteam-utils: Network Team driver allows multiple network interfaces to be teamed together and act like a single one. This process is called "ethernet bonding", "channel teaming" or "link aggregation". -- cgit 1.3.0-6-gf8a5 From 327d70304eb6b87f87b3af0539ac3755cabd9b5a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 May 2019 22:12:19 +0200 Subject: Drop obsolete lintian overrides --- debian/gir1.2-networkmanager-1.0.lintian-overrides | 1 - debian/libnm-glib-dev.lintian-overrides | 1 - 2 files changed, 2 deletions(-) delete mode 100644 debian/gir1.2-networkmanager-1.0.lintian-overrides delete mode 100644 debian/libnm-glib-dev.lintian-overrides (limited to 'debian') diff --git a/debian/gir1.2-networkmanager-1.0.lintian-overrides b/debian/gir1.2-networkmanager-1.0.lintian-overrides deleted file mode 100644 index 6ce232a0..00000000 --- a/debian/gir1.2-networkmanager-1.0.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -gir1.2-networkmanager-1.0: typelib-package-name-does-not-match usr/lib/*/girepository-1.0/NMClient-1.0.typelib gir1.2-nmclient-1.0 diff --git a/debian/libnm-glib-dev.lintian-overrides b/debian/libnm-glib-dev.lintian-overrides deleted file mode 100644 index 9b0da5b7..00000000 --- a/debian/libnm-glib-dev.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libnm-glib-dev: gir-missing-typelib-dependency usr/share/gir-1.0/NMClient-1.0.gir gir1.2-nmclient-1.0 -- cgit 1.3.0-6-gf8a5 From 7c58a8d7c1c6cf08de5a686897dc2f11c5ee5b11 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 May 2019 22:27:32 +0200 Subject: Release version 1.18.0-2 to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b98846a5..be0ba078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.18.0-2) experimental; urgency=medium + + * Fix package description after avahi-autoipd removal + * Drop obsolete lintian overrides + + -- Michael Biebl Tue, 28 May 2019 22:27:17 +0200 + network-manager (1.18.0-1) experimental; urgency=medium * New upstream version 1.18.0 -- cgit 1.3.0-6-gf8a5 From 13cfe714153013158bdf3e74ab58ab713a04223c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 Jul 2019 00:36:45 +0200 Subject: Release version 1.18.0-3 to unstable --- debian/changelog | 6 ++++++ debian/gbp.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index be0ba078..ababf6b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.18.0-3) unstable; urgency=medium + + * Upload to unstable + + -- Michael Biebl Thu, 11 Jul 2019 00:36:17 +0200 + network-manager (1.18.0-2) experimental; urgency=medium * Fix package description after avahi-autoipd removal diff --git a/debian/gbp.conf b/debian/gbp.conf index ffa7b970..478d845c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = experimental +debian-branch = master -- cgit 1.3.0-6-gf8a5 From 5feb8d470751dd0d9db86a216c24e10e0637f3fc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 10:54:43 +0200 Subject: New upstream version 1.19.90 (1.20 rc1) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ababf6b5..230fd393 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.19.90-1) UNRELEASED; urgency=medium + + * New upstream version 1.19.90 (1.20 rc1) + + -- Michael Biebl Wed, 31 Jul 2019 10:54:08 +0200 + network-manager (1.18.0-3) unstable; urgency=medium * Upload to unstable -- cgit 1.3.0-6-gf8a5 From 67ec2b28462b0652ec2c823dcb884b4b19a4467b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 10:57:21 +0200 Subject: Drop obsolete configure flags --- debian/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index dc1f974d..9b5d2eb2 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,6 @@ override_dh_auto_configure: --with-libaudit \ --with-iwd \ --without-dhcpcanon \ - --without-libnm-glib \ --enable-polkit \ --enable-polkit-agent \ --enable-ppp \ @@ -51,7 +50,6 @@ override_dh_auto_configure: --enable-json-validation \ --enable-bluez5-dun \ --enable-vala \ - --disable-config-plugin-ibft \ --disable-more-warnings \ --disable-modify-system \ --disable-ovs -- cgit 1.3.0-6-gf8a5 From 2d5e778879dac56cbe55af31422972334d3d5819 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 13:23:34 +0200 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 7d869e6f..7252cb85 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 7e0ebe6..aa694d5 100644 +index c97f6f7..5ea0a64 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include #include @@ -27,7 +27,7 @@ index 7e0ebe6..aa694d5 100644 #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -@@ -342,6 +343,10 @@ on_proxy_acquired (GObject *object, +@@ -341,6 +342,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 7b9e28c2..fec62572 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 40e068a..bd197fe 100644 +index 6ea5350..b1308a0 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -61,6 +61,8 @@ +@@ -60,6 +60,8 @@ #include "nm-dispatcher.h" #include "NetworkManagerUtils.h" @@ -24,7 +24,7 @@ index 40e068a..bd197fe 100644 /*****************************************************************************/ typedef struct { -@@ -193,6 +195,10 @@ typedef struct { +@@ -198,6 +200,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 40e068a..bd197fe 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1432,6 +1438,27 @@ find_best_device_state (NMManager *manager) +@@ -1436,6 +1442,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 40e068a..bd197fe 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1478,6 +1505,9 @@ nm_manager_update_state (NMManager *self) +@@ -1482,6 +1509,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index 40e068a..bd197fe 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6498,6 +6528,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6452,6 +6482,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 40e068a..bd197fe 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6666,6 +6752,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6625,6 +6711,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 40e068a..bd197fe 100644 return TRUE; } -@@ -7525,6 +7614,22 @@ nm_manager_init (NMManager *self) +@@ -7473,6 +7562,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 40e068a..bd197fe 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7800,6 +7905,16 @@ dispose (GObject *object) +@@ -7755,6 +7860,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From 0baefffb8db7a76624fc08b11bf0eab6da40a092 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 13:24:23 +0200 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 81055a11..f587facd 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -8,8 +8,10 @@ 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_14_8@libnm_1_14_8 1.19.90 libnm_1_16_0@libnm_1_16_0 1.16.0 libnm_1_18_0@libnm_1_18_0 1.18.0 + libnm_1_20_0@libnm_1_20_0 1.19.90 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 @@ -83,6 +85,8 @@ libnm.so.0 libnm0 #MINVER# nm_client_add_and_activate_connection2_finish@libnm_1_16_0 1.16.0 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_connection2@libnm_1_20_0 1.19.90 + nm_client_add_connection2_finish@libnm_1_20_0 1.19.90 nm_client_add_connection_async@libnm_1_0_0 1.0.0 nm_client_add_connection_finish@libnm_1_0_0 1.0.0 nm_client_check_connectivity@libnm_1_0_0 1.0.0 @@ -98,6 +102,7 @@ libnm.so.0 libnm0 #MINVER# nm_client_checkpoint_rollback_finish@libnm_1_12_0 1.11.3 nm_client_connectivity_check_get_available@libnm_1_10_0 1.9.90 nm_client_connectivity_check_get_enabled@libnm_1_10_0 1.9.90 + nm_client_connectivity_check_get_uri@libnm_1_20_0 1.19.90 nm_client_connectivity_check_set_enabled@libnm_1_10_0 1.9.90 nm_client_deactivate_connection@libnm_1_0_0 1.0.0 nm_client_deactivate_connection_async@libnm_1_0_0 1.0.0 @@ -341,8 +346,11 @@ libnm.so.0 libnm0 #MINVER# nm_device_macvlan_get_tap@libnm_1_2_0 1.1.90 nm_device_macvlan_get_type@libnm_1_2_0 1.1.90 nm_device_modem_capabilities_get_type@libnm_1_0_0 1.0.0 + nm_device_modem_get_apn@libnm_1_20_0 1.19.90 nm_device_modem_get_current_capabilities@libnm_1_0_0 1.0.0 + nm_device_modem_get_device_id@libnm_1_20_0 1.19.90 nm_device_modem_get_modem_capabilities@libnm_1_0_0 1.0.0 + nm_device_modem_get_operator_code@libnm_1_20_0 1.19.90 nm_device_modem_get_type@libnm_1_0_0 1.0.0 nm_device_olpc_mesh_get_active_channel@libnm_1_0_0 1.0.0 nm_device_olpc_mesh_get_companion@libnm_1_0_0 1.0.0 @@ -448,6 +456,7 @@ libnm.so.0 libnm0 #MINVER# nm_dns_entry_get_type@libnm_1_6_0 1.5.90 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_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 @@ -516,6 +525,7 @@ libnm.so.0 libnm0 #MINVER# nm_ip_routing_rule_get_priority@libnm_1_18_0 1.18.0 nm_ip_routing_rule_get_source_port_end@libnm_1_18_0 1.18.0 nm_ip_routing_rule_get_source_port_start@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_get_suppress_prefixlength@libnm_1_20_0 1.19.90 nm_ip_routing_rule_get_table@libnm_1_18_0 1.18.0 nm_ip_routing_rule_get_to@libnm_1_18_0 1.18.0 nm_ip_routing_rule_get_to_len@libnm_1_18_0 1.18.0 @@ -536,6 +546,7 @@ libnm.so.0 libnm0 #MINVER# nm_ip_routing_rule_set_oifname@libnm_1_18_0 1.18.0 nm_ip_routing_rule_set_priority@libnm_1_18_0 1.18.0 nm_ip_routing_rule_set_source_port@libnm_1_18_0 1.18.0 + nm_ip_routing_rule_set_suppress_prefixlength@libnm_1_20_0 1.19.90 nm_ip_routing_rule_set_table@libnm_1_18_0 1.18.0 nm_ip_routing_rule_set_to@libnm_1_18_0 1.18.0 nm_ip_routing_rule_set_tos@libnm_1_18_0 1.18.0 @@ -779,6 +790,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_device_timeout@libnm_1_20_0 1.19.90 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 nm_setting_connection_lldp_get_type@libnm_1_2_0 1.1.90 @@ -823,6 +835,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_enumerate_values@libnm_1_0_0 1.0.0 nm_setting_ethtool_clear_features@libnm_1_14_0 1.13.90 nm_setting_ethtool_get_feature@libnm_1_14_0 1.13.90 + nm_setting_ethtool_get_optnames@libnm_1_20_0 1.19.90 nm_setting_ethtool_get_type@libnm_1_14_0 1.13.90 nm_setting_ethtool_new@libnm_1_14_0 1.13.90 nm_setting_ethtool_set_feature@libnm_1_14_0 1.13.90 @@ -972,6 +985,9 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ovs_bridge_get_stp_enable@libnm_1_10_0 1.9.90 nm_setting_ovs_bridge_get_type@libnm_1_10_0 1.9.90 nm_setting_ovs_bridge_new@libnm_1_10_0 1.9.90 + nm_setting_ovs_dpdk_get_devargs@libnm_1_20_0 1.19.90 + nm_setting_ovs_dpdk_get_type@libnm_1_20_0 1.19.90 + nm_setting_ovs_dpdk_new@libnm_1_20_0 1.19.90 nm_setting_ovs_interface_get_interface_type@libnm_1_10_0 1.9.90 nm_setting_ovs_interface_get_type@libnm_1_10_0 1.9.90 nm_setting_ovs_interface_new@libnm_1_10_0 1.9.90 @@ -1205,6 +1221,8 @@ libnm.so.0 libnm0 #MINVER# nm_setting_wireguard_append_peer@libnm_1_16_0 1.16.0 nm_setting_wireguard_clear_peers@libnm_1_16_0 1.16.0 nm_setting_wireguard_get_fwmark@libnm_1_16_0 1.16.0 + nm_setting_wireguard_get_ip4_auto_default_route@libnm_1_20_0 1.19.90 + nm_setting_wireguard_get_ip6_auto_default_route@libnm_1_20_0 1.19.90 nm_setting_wireguard_get_listen_port@libnm_1_16_0 1.16.0 nm_setting_wireguard_get_mtu@libnm_1_16_0 1.16.0 nm_setting_wireguard_get_peer@libnm_1_16_0 1.16.0 @@ -1286,6 +1304,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_wireless_security_wps_method_get_type@libnm_1_10_0 1.9.90 nm_setting_wireless_wake_on_wlan_get_type@libnm_1_12_0 1.11.90 nm_setting_wpan_get_type@libnm_1_14_0 1.13.90 + nm_settings_add_connection2_flags_get_type@libnm_1_20_0 1.19.90 nm_settings_connection_flags_get_type@libnm_1_12_0 1.11.3 nm_settings_error_get_type@libnm_1_0_0 1.0.0 nm_settings_error_quark@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From 0004ffa09680a9c4905aaa7bf458c1b036a9a051 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 13:36:19 +0200 Subject: Release version 1.19.90-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 230fd393..4c3a87ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -network-manager (1.19.90-1) UNRELEASED; urgency=medium +network-manager (1.19.90-1) unstable; urgency=medium * New upstream version 1.19.90 (1.20 rc1) + * Drop obsolete configure flags + * Rebase patches + * Update symbols file for libnm0 - -- Michael Biebl Wed, 31 Jul 2019 10:54:08 +0200 + -- Michael Biebl Wed, 31 Jul 2019 13:35:47 +0200 network-manager (1.18.0-3) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 380ef291b0a660655ee06381c5dca33a5d0eb2ad Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 1 Aug 2019 10:35:16 +0200 Subject: Demote isc-dhcp-client to Suggests The DHCP client now defaults to "internal". This default can be overridden at run time by setting the main.dhcp option in the configuration file. The old default was "dhclient" and required isc-dhcp-client. Closes: #933545 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 861acf40..6b119f5f 100644 --- a/debian/control +++ b/debian/control @@ -62,8 +62,8 @@ Recommends: ppp, iptables, modemmanager, crda, - isc-dhcp-client, -Suggests: libteam-utils +Suggests: libteam-utils, + isc-dhcp-client, Breaks: ${misc:Breaks} Description: network management framework (daemon and userspace tools) NetworkManager is a system network service that manages your network devices -- cgit 1.3.0-6-gf8a5 From 3192a21b21d4a9d276a7f2ef4e4b0fcf3165d9eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 1 Aug 2019 10:42:55 +0200 Subject: Release version 1.19.90-2 to unstable --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c3a87ba..e3e9b52a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (1.19.90-2) unstable; urgency=medium + + * Demote isc-dhcp-client to Suggests. + The DHCP client now defaults to "internal". This default can be + overridden at run time by setting the main.dhcp option in the + configuration file. The old default was "dhclient" and required + isc-dhcp-client. (Closes: #933545) + + -- Michael Biebl Thu, 01 Aug 2019 10:42:16 +0200 + network-manager (1.19.90-1) unstable; urgency=medium * New upstream version 1.19.90 (1.20 rc1) -- cgit 1.3.0-6-gf8a5 From 52a2333bc155dd071d687f17732b0f0d66a24d24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 6 Aug 2019 22:47:56 +0200 Subject: New upstream version 1.20.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e3e9b52a..0e687b34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.20.0-1) UNRELEASED; urgency=medium + + * New upstream version 1.20.0 + + -- Michael Biebl Tue, 06 Aug 2019 22:47:53 +0200 + network-manager (1.19.90-2) unstable; urgency=medium * Demote isc-dhcp-client to Suggests. -- cgit 1.3.0-6-gf8a5 From ac800c7f1a85a9984c2602ec3f9151dffb000570 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 6 Aug 2019 22:48:13 +0200 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 fec62572..5ea83b6e 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 6ea5350..b1308a0 100644 +index 64cdb9a..b08af29 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -60,6 +60,8 @@ @@ -73,7 +73,7 @@ index 6ea5350..b1308a0 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6452,6 +6482,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6486,6 +6516,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 6ea5350..b1308a0 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6625,6 +6711,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6659,6 +6745,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 6ea5350..b1308a0 100644 return TRUE; } -@@ -7473,6 +7562,22 @@ nm_manager_init (NMManager *self) +@@ -7507,6 +7596,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 6ea5350..b1308a0 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7755,6 +7860,16 @@ dispose (GObject *object) +@@ -7789,6 +7894,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From 488dda3930545969f5644b57cfca81e21df031c3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 6 Aug 2019 22:56:11 +0200 Subject: Release version 1.20.0-1 to unstable --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0e687b34..36704124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -network-manager (1.20.0-1) UNRELEASED; urgency=medium +network-manager (1.20.0-1) unstable; urgency=medium * New upstream version 1.20.0 + * Rebase patches - -- Michael Biebl Tue, 06 Aug 2019 22:47:53 +0200 + -- Michael Biebl Tue, 06 Aug 2019 22:55:57 +0200 network-manager (1.19.90-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5