From e3bc109cd0eb97346c448f591af518d85dbee21b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 17:43:28 +0200 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 436335ab9d3b324a5092ccf60588307f117083cf Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 17:46:05 +0200 Subject: New upstream version 1.13.90 (1.14 rc1) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 903c9dac..02f4b87c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.13.90-1) UNRELEASED; urgency=medium + + * New upstream version 1.13.90 (1.14 rc1) + + -- Michael Biebl Sat, 08 Sep 2018 17:45:30 +0200 + network-manager (1.12.2-3) unstable; urgency=medium [ Simon McVittie ] -- cgit 1.3.0-6-gf8a5 From 16ecc345e03cdf8bc979e8a1778c4edfe7e18928 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 17:51:56 +0200 Subject: Refresh patches --- ...n-t-make-NetworkManager-D-Bus-activatable.patch | 4 +-- ...-Sleep-Monitor-if-not-booted-with-systemd.patch | 2 +- debian/patches/Fix-iscsiadm-path.patch | 4 +-- ...Force-online-state-with-unmanaged-devices.patch | 14 +++++------ debian/patches/series | 2 -- ...test-don-t-assert-on-debug-level-messages.patch | 29 ---------------------- ...ile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch | 25 ------------------- 7 files changed, 12 insertions(+), 68 deletions(-) delete mode 100644 debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch delete mode 100644 debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.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 51d0a0b2..86e17a96 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 b1a2e69..b168008 100644 +index c161510..d08c032 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3894,11 +3894,6 @@ endif +@@ -3848,11 +3848,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ 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 e2516d62..5ab7a01d 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,7 +16,7 @@ Closes: #742933 1 file changed, 5 insertions(+) diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index a7e3a7c..9931f12 100644 +index 54d7577..a4bb43f 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c @@ -25,6 +25,7 @@ diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch index 7af98133..22ea2feb 100644 --- a/debian/patches/Fix-iscsiadm-path.patch +++ b/debian/patches/Fix-iscsiadm-path.patch @@ -12,10 +12,10 @@ binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink). 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c -index 77ce208..f84276d 100644 +index 69dd373..cf322d4 100644 --- a/src/settings/plugins/ibft/nms-ibft-plugin.c +++ b/src/settings/plugins/ibft/nms-ibft-plugin.c -@@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self) +@@ -70,7 +70,7 @@ read_connections (NMSIbftPlugin *self) GError *error = NULL; NMSIbftConnection *connection; diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 094c39be..ee3a30ac 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 289dcf8..1b657fe 100644 +index f8be6d3..9554a92 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -35,7 +35,7 @@ index 289dcf8..1b657fe 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1387,6 +1393,27 @@ find_best_device_state (NMManager *manager) +@@ -1417,6 +1423,27 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 289dcf8..1b657fe 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1425,6 +1452,9 @@ nm_manager_update_state (NMManager *self) +@@ -1455,6 +1482,9 @@ nm_manager_update_state (NMManager *self) else new_state = find_best_device_state (self); @@ -73,7 +73,7 @@ index 289dcf8..1b657fe 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5872,6 +5902,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6082,6 +6112,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 289dcf8..1b657fe 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6022,6 +6108,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6242,6 +6328,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 289dcf8..1b657fe 100644 return TRUE; } -@@ -6885,6 +6974,22 @@ nm_manager_init (NMManager *self) +@@ -7096,6 +7185,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 289dcf8..1b657fe 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7160,6 +7265,16 @@ dispose (GObject *object) +@@ -7371,6 +7476,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/series b/debian/patches/series index 7918af1b..0adf0cf1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,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 Fix-iscsiadm-path.patch -version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch -utils-test-don-t-assert-on-debug-level-messages.patch diff --git a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch deleted file mode 100644 index 0a1273a5..00000000 --- a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Lubomir Rintel -Date: Sat, 11 Aug 2018 11:08:42 +0200 -Subject: utils/test: don't assert on debug level messages - -They come and go in GLib core for all sorts of purposes. Don't let that -break our tests. - -(cherry picked from commit 3e8eef538987c909e87b871a6b8c74aee08661a3) -Origin: upstream, 1.12.4, commit:5810c46b118447567e52199ca139c7a5e9be6ab4 ---- - shared/nm-utils/nm-test-utils.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h -index 743893f..d29e9ae 100644 ---- a/shared/nm-utils/nm-test-utils.h -+++ b/shared/nm-utils/nm-test-utils.h -@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ - #endif - } else { - /* We were called not to set logging levels. This means, that the user -- * expects to assert against (all) messages. Any uncought message is fatal. */ -- g_log_set_always_fatal (G_LOG_LEVEL_MASK); -+ * expects to assert against (all) messages. -+ * Any uncaught message on >debug level is fatal. */ -+ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); - } - - if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) && diff --git a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch deleted file mode 100644 index 2783890f..00000000 --- a/debian/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Thomas Haller -Date: Tue, 31 Jul 2018 14:13:57 +0200 -Subject: version: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro - -Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd - -https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html -(cherry picked from commit 0a3755c1799d3a4dc1875d4c59c7c568a64c8456) ---- - libnm-core/nm-version.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h -index ee6dbc0..c240489 100644 ---- a/libnm-core/nm-version.h -+++ b/libnm-core/nm-version.h -@@ -161,7 +161,7 @@ - #endif - - #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2 --# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2) -+# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2) - #else - # define NM_AVAILABLE_IN_1_12_2 - #endif -- cgit 1.3.0-6-gf8a5 From 95cd7ff73322648d6cd5ccb13e8859df95a6f2c5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 18:14:26 +0200 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 3e7c9ed1..7ef1f63d 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -6,6 +6,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_10_2@libnm_1_10_2 1.10.2 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_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 @@ -147,6 +148,7 @@ libnm.so.0 libnm0 #MINVER# nm_connection_get_interface_name@libnm_1_0_0 1.0.0 nm_connection_get_path@libnm_1_0_0 1.0.0 nm_connection_get_setting@libnm_1_0_0 1.0.0 + nm_connection_get_setting_6lowpan@libnm_1_14_0 1.13.90 nm_connection_get_setting_802_1x@libnm_1_0_0 1.0.0 nm_connection_get_setting_adsl@libnm_1_0_0 1.0.0 nm_connection_get_setting_bluetooth@libnm_1_0_0 1.0.0 @@ -175,6 +177,7 @@ libnm.so.0 libnm0 #MINVER# nm_connection_get_setting_pppoe@libnm_1_0_0 1.0.0 nm_connection_get_setting_proxy@libnm_1_6_0 1.5.90 nm_connection_get_setting_serial@libnm_1_0_0 1.0.0 + nm_connection_get_setting_sriov@libnm_1_14_0 1.13.90 nm_connection_get_setting_tc_config@libnm_1_12_0 1.11.4 nm_connection_get_setting_team@libnm_1_0_0 1.0.0 nm_connection_get_setting_team_port@libnm_1_0_0 1.0.0 @@ -186,12 +189,14 @@ libnm.so.0 libnm0 #MINVER# nm_connection_get_setting_wired@libnm_1_0_0 1.0.0 nm_connection_get_setting_wireless@libnm_1_0_0 1.0.0 nm_connection_get_setting_wireless_security@libnm_1_0_0 1.0.0 + nm_connection_get_setting_wpan@libnm_1_14_0 1.13.90 nm_connection_get_settings@libnm_1_10_0 1.9.90 nm_connection_get_type@libnm_1_0_0 1.0.0 nm_connection_get_uuid@libnm_1_0_0 1.0.0 nm_connection_get_virtual_device_description@libnm_1_0_0 1.0.0 nm_connection_is_type@libnm_1_0_0 1.0.0 nm_connection_is_virtual@libnm_1_0_0 1.0.0 + nm_connection_multi_connect_get_type@libnm_1_14_0 1.13.90 nm_connection_need_secrets@libnm_1_0_0 1.0.0 nm_connection_normalize@libnm_1_0_0 1.0.0 nm_connection_remove_setting@libnm_1_0_0 1.0.0 @@ -206,6 +211,7 @@ libnm.so.0 libnm0 #MINVER# nm_connectivity_state_get_type@libnm_1_0_0 1.0.0 nm_crypto_error_get_type@libnm_1_0_0 1.0.0 nm_crypto_error_quark@libnm_1_0_0 1.0.0 + nm_device_6lowpan_get_type@libnm_1_14_0 1.13.90 nm_device_adsl_get_carrier@libnm_1_0_0 1.0.0 nm_device_adsl_get_type@libnm_1_0_0 1.0.0 nm_device_bond_get_carrier@libnm_1_0_0 1.0.0 @@ -401,6 +407,11 @@ libnm.so.0 libnm0 #MINVER# nm_device_wimax_get_rssi@libnm_1_0_0 1.0.0 nm_device_wimax_get_tx_power@libnm_1_0_0 1.0.0 nm_device_wimax_get_type@libnm_1_0_0 1.0.0 + nm_device_wireguard_get_fwmark@libnm_1_14_0 1.13.90 + nm_device_wireguard_get_listen_port@libnm_1_14_0 1.13.90 + nm_device_wireguard_get_public_key@libnm_1_14_0 1.13.90 + nm_device_wireguard_get_type@libnm_1_14_0 1.13.90 + nm_device_wpan_get_type@libnm_1_14_0 1.13.90 nm_dhcp_config_get_family@libnm_1_0_0 1.0.0 nm_dhcp_config_get_one_option@libnm_1_0_0 1.0.0 nm_dhcp_config_get_options@libnm_1_0_0 1.0.0 @@ -512,6 +523,7 @@ libnm.so.0 libnm0 #MINVER# nm_secret_agent_old_unregister@libnm_1_0_0 1.0.0 nm_secret_agent_old_unregister_async@libnm_1_0_0 1.0.0 nm_secret_agent_old_unregister_finish@libnm_1_0_0 1.0.0 + nm_setting_6lowpan_get_type@libnm_1_14_0 1.13.90 nm_setting_802_1x_add_altsubject_match@libnm_1_0_0 1.0.0 nm_setting_802_1x_add_eap_method@libnm_1_0_0 1.0.0 nm_setting_802_1x_add_phase2_altsubject_match@libnm_1_0_0 1.0.0 @@ -666,10 +678,12 @@ libnm.so.0 libnm0 #MINVER# nm_setting_connection_get_id@libnm_1_0_0 1.0.0 nm_setting_connection_get_interface_name@libnm_1_0_0 1.0.0 nm_setting_connection_get_lldp@libnm_1_2_0 1.1.90 + nm_setting_connection_get_llmnr@libnm_1_14_0 1.13.90 nm_setting_connection_get_master@libnm_1_0_0 1.0.0 nm_setting_connection_get_mdns@libnm_1_12_0 1.11.3 nm_setting_connection_get_metered@libnm_1_0_6 1.0.6 nm_setting_connection_get_metered@libnm_1_2_0 1.1.90 + nm_setting_connection_get_multi_connect@libnm_1_14_0 1.13.90 nm_setting_connection_get_num_permissions@libnm_1_0_0 1.0.0 nm_setting_connection_get_num_secondaries@libnm_1_0_0 1.0.0 nm_setting_connection_get_permission@libnm_1_0_0 1.0.0 @@ -683,6 +697,7 @@ libnm.so.0 libnm0 #MINVER# 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 + nm_setting_connection_llmnr_get_type@libnm_1_14_0 1.13.90 nm_setting_connection_mdns_get_type@libnm_1_12_0 1.11.3 nm_setting_connection_new@libnm_1_0_0 1.0.0 nm_setting_connection_permissions_user_allowed@libnm_1_0_0 1.0.0 @@ -720,6 +735,11 @@ libnm.so.0 libnm0 #MINVER# nm_setting_dummy_new@libnm_1_8_0 1.8.0 nm_setting_duplicate@libnm_1_0_0 1.0.0 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_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 nm_setting_generic_get_type@libnm_1_0_0 1.0.0 nm_setting_generic_new@libnm_1_0_0 1.0.0 nm_setting_get_dbus_property_type@libnm_1_0_0 1.0.0 @@ -842,6 +862,14 @@ libnm.so.0 libnm0 #MINVER# nm_setting_macvlan_get_type@libnm_1_2_0 1.1.90 nm_setting_macvlan_mode_get_type@libnm_1_2_0 1.1.90 nm_setting_macvlan_new@libnm_1_2_0 1.1.90 + nm_setting_match_add_interface_name@libnm_1_14_0 1.13.90 + nm_setting_match_clear_interface_names@libnm_1_14_0 1.13.90 + nm_setting_match_get_interface_name@libnm_1_14_0 1.13.90 + nm_setting_match_get_interface_names@libnm_1_14_0 1.13.90 + nm_setting_match_get_num_interface_names@libnm_1_14_0 1.13.90 + nm_setting_match_get_type@libnm_1_14_0 1.13.90 + nm_setting_match_remove_interface_name@libnm_1_14_0 1.13.90 + nm_setting_match_remove_interface_name_by_value@libnm_1_14_0 1.13.90 nm_setting_olpc_mesh_get_channel@libnm_1_0_0 1.0.0 nm_setting_olpc_mesh_get_dhcp_anycast_address@libnm_1_0_0 1.0.0 nm_setting_olpc_mesh_get_ssid@libnm_1_0_0 1.0.0 @@ -911,6 +939,16 @@ libnm.so.0 libnm0 #MINVER# nm_setting_serial_new@libnm_1_0_0 1.0.0 nm_setting_serial_parity_get_type@libnm_1_0_0 1.0.0 nm_setting_set_secret_flags@libnm_1_0_0 1.0.0 + nm_setting_sriov_add_vf@libnm_1_14_0 1.13.90 + nm_setting_sriov_clear_vfs@libnm_1_14_0 1.13.90 + nm_setting_sriov_get_autoprobe_drivers@libnm_1_14_0 1.13.90 + nm_setting_sriov_get_num_vfs@libnm_1_14_0 1.13.90 + nm_setting_sriov_get_total_vfs@libnm_1_14_0 1.13.90 + nm_setting_sriov_get_type@libnm_1_14_0 1.13.90 + nm_setting_sriov_get_vf@libnm_1_14_0 1.13.90 + nm_setting_sriov_new@libnm_1_14_0 1.13.90 + nm_setting_sriov_remove_vf@libnm_1_14_0 1.13.90 + nm_setting_sriov_remove_vf_by_index@libnm_1_14_0 1.13.90 nm_setting_tc_config_add_qdisc@libnm_1_10_2 1.10.2 nm_setting_tc_config_add_tfilter@libnm_1_10_2 1.10.2 nm_setting_tc_config_clear_qdiscs@libnm_1_10_2 1.10.2 @@ -1136,6 +1174,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_wireless_security_set_wep_key@libnm_1_0_0 1.0.0 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_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 @@ -1144,6 +1183,24 @@ libnm.so.0 libnm0 #MINVER# nm_simple_connection_new@libnm_1_0_0 1.0.0 nm_simple_connection_new_clone@libnm_1_0_0 1.0.0 nm_simple_connection_new_from_dbus@libnm_1_0_0 1.0.0 + nm_sriov_vf_add_vlan@libnm_1_14_0 1.13.90 + nm_sriov_vf_dup@libnm_1_14_0 1.13.90 + nm_sriov_vf_equal@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_attribute@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_attribute_names@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_index@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_type@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_vlan_ids@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_vlan_protocol@libnm_1_14_0 1.13.90 + nm_sriov_vf_get_vlan_qos@libnm_1_14_0 1.13.90 + nm_sriov_vf_new@libnm_1_14_0 1.13.90 + nm_sriov_vf_ref@libnm_1_14_0 1.13.90 + nm_sriov_vf_remove_vlan@libnm_1_14_0 1.13.90 + nm_sriov_vf_set_attribute@libnm_1_14_0 1.13.90 + nm_sriov_vf_set_vlan_protocol@libnm_1_14_0 1.13.90 + nm_sriov_vf_set_vlan_qos@libnm_1_14_0 1.13.90 + nm_sriov_vf_unref@libnm_1_14_0 1.13.90 + nm_sriov_vf_vlan_protocol_get_type@libnm_1_14_0 1.13.90 nm_state_get_type@libnm_1_0_0 1.0.0 nm_tc_action_dup@libnm_1_10_2 1.10.2 nm_tc_action_equal@libnm_1_10_2 1.10.2 @@ -1193,6 +1250,7 @@ libnm.so.0 libnm0 #MINVER# nm_team_link_watcher_new_nsna_ping@libnm_1_10_2 1.10.2 nm_team_link_watcher_ref@libnm_1_10_2 1.10.2 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_bin2hexstr@libnm_1_0_0 1.0.0 nm_utils_bond_mode_int_to_string@libnm_1_2_0 1.1.90 @@ -1245,6 +1303,8 @@ libnm.so.0 libnm0 #MINVER# nm_utils_same_ssid@libnm_1_0_0 1.0.0 nm_utils_security_type_get_type@libnm_1_0_0 1.0.0 nm_utils_security_valid@libnm_1_0_0 1.0.0 + nm_utils_sriov_vf_from_str@libnm_1_14_0 1.13.90 + nm_utils_sriov_vf_to_str@libnm_1_14_0 1.13.90 nm_utils_ssid_to_utf8@libnm_1_0_0 1.0.0 nm_utils_tc_action_from_str@libnm_1_10_2 1.10.2 nm_utils_tc_action_to_str@libnm_1_10_2 1.10.2 -- cgit 1.3.0-6-gf8a5 From 58e88fb5663b52af80c75cb9c605305eda84db9e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 18:14:42 +0200 Subject: Bump Standards-Version to 4.2.1 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 0827195f..a44a90a5 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Build-Depends: debhelper (>= 10.3), valac (>= 0.17.1.24), dbus , python-dbus -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager -- cgit 1.3.0-6-gf8a5 From ffe03e75298bcd15849e314c8233cb9b696d59a3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 18:23:42 +0200 Subject: Release version 1.13.90-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 02f4b87c..c3f1d283 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -network-manager (1.13.90-1) UNRELEASED; urgency=medium +network-manager (1.13.90-1) experimental; urgency=medium * New upstream version 1.13.90 (1.14 rc1) + * Refresh patches + * Update symbols file for libnm0 + * Bump Standards-Version to 4.2.1 - -- Michael Biebl Sat, 08 Sep 2018 17:45:30 +0200 + -- Michael Biebl Sat, 08 Sep 2018 18:23:20 +0200 network-manager (1.12.2-3) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 6907feafd9ed51b0b4f048bcb5db51885a735d15 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 15 Sep 2018 01:06:52 +0200 Subject: New upstream version 1.14.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c3f1d283..3b0cf59b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.14.0-1) UNRELEASED; urgency=medium + + * New upstream version 1.14.0 + + -- Michael Biebl Sat, 15 Sep 2018 01:06:50 +0200 + network-manager (1.13.90-1) experimental; urgency=medium * New upstream version 1.13.90 (1.14 rc1) -- cgit 1.3.0-6-gf8a5 From f1bf6a506913488b17511f6cbc9962a292134845 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 15 Sep 2018 01:07:14 +0200 Subject: Rebase patches --- debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 86e17a96..f39bb9a6 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 c161510..d08c032 100644 +index 5b0feef..a684821 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3848,11 +3848,6 @@ endif +@@ -3845,11 +3845,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ -- cgit 1.3.0-6-gf8a5 From 97fe6768ed6b3f04eec2563d5bad92d32dc9216c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 15 Sep 2018 10:30:35 +0200 Subject: Update symbols file for libnm0 The nm_connection_get_setting_{6lowpan,sriov,wpan} API had been introduced during the 1.14 development cycle but as it was duplicating existing functionality it was removed again. --- debian/libnm0.symbols | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 7ef1f63d..73491d69 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -148,7 +148,6 @@ libnm.so.0 libnm0 #MINVER# nm_connection_get_interface_name@libnm_1_0_0 1.0.0 nm_connection_get_path@libnm_1_0_0 1.0.0 nm_connection_get_setting@libnm_1_0_0 1.0.0 - nm_connection_get_setting_6lowpan@libnm_1_14_0 1.13.90 nm_connection_get_setting_802_1x@libnm_1_0_0 1.0.0 nm_connection_get_setting_adsl@libnm_1_0_0 1.0.0 nm_connection_get_setting_bluetooth@libnm_1_0_0 1.0.0 @@ -177,7 +176,6 @@ libnm.so.0 libnm0 #MINVER# nm_connection_get_setting_pppoe@libnm_1_0_0 1.0.0 nm_connection_get_setting_proxy@libnm_1_6_0 1.5.90 nm_connection_get_setting_serial@libnm_1_0_0 1.0.0 - nm_connection_get_setting_sriov@libnm_1_14_0 1.13.90 nm_connection_get_setting_tc_config@libnm_1_12_0 1.11.4 nm_connection_get_setting_team@libnm_1_0_0 1.0.0 nm_connection_get_setting_team_port@libnm_1_0_0 1.0.0 @@ -189,7 +187,6 @@ libnm.so.0 libnm0 #MINVER# nm_connection_get_setting_wired@libnm_1_0_0 1.0.0 nm_connection_get_setting_wireless@libnm_1_0_0 1.0.0 nm_connection_get_setting_wireless_security@libnm_1_0_0 1.0.0 - nm_connection_get_setting_wpan@libnm_1_14_0 1.13.90 nm_connection_get_settings@libnm_1_10_0 1.9.90 nm_connection_get_type@libnm_1_0_0 1.0.0 nm_connection_get_uuid@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From a9875ba07b343d25cb67d6e4354b9c44e7bdbc24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 15 Sep 2018 10:57:37 +0200 Subject: Release version 1.14.0-1 to experimental --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b0cf59b..36053319 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -network-manager (1.14.0-1) UNRELEASED; urgency=medium +network-manager (1.14.0-1) experimental; urgency=medium * New upstream version 1.14.0 + * Rebase patches + * Update symbols file for libnm0. + The nm_connection_get_setting_{6lowpan,sriov,wpan} API had been + introduced during the 1.14 development cycle but as it was duplicating + existing functionality it was removed again. - -- Michael Biebl Sat, 15 Sep 2018 01:06:50 +0200 + -- Michael Biebl Sat, 15 Sep 2018 10:57:07 +0200 network-manager (1.13.90-1) experimental; urgency=medium -- cgit 1.3.0-6-gf8a5 From 3ae487be3e7d273af58189d2a4cf94044c6b1de3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Oct 2018 16:51:11 +0200 Subject: Tighten inter-package dependencies Make sure network-manager and libnm0 are always upgraded in lockstep. Closes: #818165 --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index a44a90a5..45d1f3de 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,7 @@ Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, + libnm0 (= ${binary:Version}), lsb-base, wpasupplicant, dbus, -- cgit 1.3.0-6-gf8a5 From 142485af41b7cf7b0060cc682a56d3ff38cabbb6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Oct 2018 16:55:29 +0200 Subject: Release version 1.14.0-2 to experimental --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 36053319..a06b3fdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.14.0-2) experimental; urgency=medium + + * Tighten inter-package dependencies. + Make sure network-manager and libnm0 are always upgraded in lockstep. + (Closes: #818165) + + -- Michael Biebl Mon, 08 Oct 2018 16:55:10 +0200 + network-manager (1.14.0-1) experimental; urgency=medium * New upstream version 1.14.0 -- cgit 1.3.0-6-gf8a5 From 14055d61807dd217be44ee55ce4379dbeac34d9c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 20 Oct 2018 01:32:29 +0200 Subject: New upstream version 1.14.2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a06b3fdc..689a5484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.14.2-1) UNRELEASED; urgency=medium + + * New upstream version 1.14.2 + + -- Michael Biebl Sat, 20 Oct 2018 01:31:37 +0200 + network-manager (1.14.0-2) experimental; urgency=medium * Tighten inter-package dependencies. -- cgit 1.3.0-6-gf8a5 From 9b7e64484916662953240ee98a0a4e4cc00e4fa2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 20 Oct 2018 01:32:51 +0200 Subject: Rebase patches --- .../patches/Don-t-make-NetworkManager-D-Bus-activatable.patch | 4 ++-- debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (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 f39bb9a6..636865a4 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 5b0feef..a684821 100644 +index 1e100f6..204f1a0 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3845,11 +3845,6 @@ endif +@@ -4110,11 +4110,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 ee3a30ac..ae96f968 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 f8be6d3..9554a92 100644 +index 7598995..1439c47 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -73,7 +73,7 @@ index f8be6d3..9554a92 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6082,6 +6112,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6209,6 +6239,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index f8be6d3..9554a92 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6242,6 +6328,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6377,6 +6463,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 f8be6d3..9554a92 100644 return TRUE; } -@@ -7096,6 +7185,22 @@ nm_manager_init (NMManager *self) +@@ -7231,6 +7320,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index f8be6d3..9554a92 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7371,6 +7476,16 @@ dispose (GObject *object) +@@ -7506,6 +7611,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } -- cgit 1.3.0-6-gf8a5 From f7d781f65b15d6fce7a1f9069f7032faaef8452a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Oct 2018 02:38:49 +0200 Subject: Disable obsolete ibft settings plugin It has been replaced by an iBFT reader which parses /sys/firmware/ibft directly instead of iscsiadm output. --- debian/network-manager.install | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/network-manager.install b/debian/network-manager.install index 6edafaa0..bb751b47 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -5,8 +5,8 @@ usr/bin/nmtui* usr/lib/NetworkManager/nm-dhcp-helper usr/lib/NetworkManager/nm-iface-helper usr/lib/NetworkManager/nm-dispatcher +usr/lib/NetworkManager/nm-initrd-generator usr/lib/*/NetworkManager/*/libnm-settings-plugin-ifupdown.so -usr/lib/*/NetworkManager/*/libnm-settings-plugin-ibft.so usr/lib/*/NetworkManager/*/libnm-device-plugin-*.so usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so usr/lib/*/NetworkManager/*/libnm-wwan.so diff --git a/debian/rules b/debian/rules index 4387a89c..28e8eca5 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,6 @@ override_dh_auto_configure: --enable-polkit-agent \ --enable-ppp \ --enable-ifupdown \ - --enable-config-plugin-ibft \ --enable-introspection \ --enable-gtk-doc \ --enable-concheck \ @@ -51,6 +50,7 @@ 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 188e5504230be1fbccf9736eb7badcf8207f8f20 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Oct 2018 02:41:27 +0200 Subject: Drop debian/patches/Fix-iscsiadm-path.patch No longer needed. --- debian/patches/Fix-iscsiadm-path.patch | 26 -------------------------- debian/patches/series | 1 - 2 files changed, 27 deletions(-) delete mode 100644 debian/patches/Fix-iscsiadm-path.patch (limited to 'debian') diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch deleted file mode 100644 index 22ea2feb..00000000 --- a/debian/patches/Fix-iscsiadm-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Biebl -Date: Wed, 6 May 2015 18:17:51 +0200 -Subject: Fix iscsiadm path - -The open-scsi package in Debian installs the iscisadm binary as -/usr/bin/iscsiadm. - -This patch can be dropped post-stretch as open-iscsi now also ships the -binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink). ---- - src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c -index 69dd373..cf322d4 100644 ---- a/src/settings/plugins/ibft/nms-ibft-plugin.c -+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c -@@ -70,7 +70,7 @@ read_connections (NMSIbftPlugin *self) - GError *error = NULL; - NMSIbftConnection *connection; - -- if (!nms_ibft_reader_load_blocks ("/sbin/iscsiadm", &blocks, &error)) { -+ if (!nms_ibft_reader_load_blocks ("/usr/bin/iscsiadm", &blocks, &error)) { - nm_log_dbg (LOGD_SETTINGS, "ibft: failed to read iscsiadm records: %s", error->message); - g_error_free (error); - return; diff --git a/debian/patches/series b/debian/patches/series index 0adf0cf1..6da89bb7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +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 -Fix-iscsiadm-path.patch -- cgit 1.3.0-6-gf8a5 From 5554398639fa9e344bd12205a64874e6436b936e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Oct 2018 02:56:47 +0200 Subject: Release version 1.14.2-1 to experimental --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 689a5484..867a34a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -network-manager (1.14.2-1) UNRELEASED; urgency=medium +network-manager (1.14.2-1) experimental; urgency=medium * New upstream version 1.14.2 + * Rebase patches + * Disable obsolete ibft settings plugin. + It has been replaced by an iBFT reader which parses /sys/firmware/ibft + directly instead of iscsiadm output. + * Drop debian/patches/Fix-iscsiadm-path.patch. + No longer needed. - -- Michael Biebl Sat, 20 Oct 2018 01:31:37 +0200 + -- Michael Biebl Sun, 21 Oct 2018 02:56:25 +0200 network-manager (1.14.0-2) experimental; urgency=medium -- cgit 1.3.0-6-gf8a5 From 0890d3629756d10021d556768371c3441141aee1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Oct 2018 03:00:59 +0200 Subject: Upload 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 7b084125..170e7c8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.14.2-2) UNRELEASED; urgency=medium + + * Upload to unstable + + -- Michael Biebl Sun, 21 Oct 2018 03:00:53 +0200 + network-manager (1.14.2-1) experimental; urgency=medium * New upstream version 1.14.2 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 bf9fe831a32fc90b956ee777b629adaf6df49d65 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Oct 2018 16:10:07 +0200 Subject: Release version 1.14.2-2 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 170e7c8c..97ae82f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -network-manager (1.14.2-2) UNRELEASED; urgency=medium +network-manager (1.14.2-2) unstable; urgency=medium * Upload to unstable - -- Michael Biebl Sun, 21 Oct 2018 03:00:53 +0200 + -- Michael Biebl Sun, 21 Oct 2018 16:09:49 +0200 network-manager (1.14.2-1) experimental; urgency=medium -- cgit 1.3.0-6-gf8a5 From 0b95e1fcffef2fb46aa6babc7d094dbe71cca01d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Oct 2018 21:06:38 +0200 Subject: New upstream version 1.14.4 - Fix a crash in ifupdown (Debian) configuration plugin (Closes: #911621) --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 97ae82f6..bdcad40a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.14.4-1) UNRELEASED; urgency=medium + + * New upstream version 1.14.4 + - Fix a crash in ifupdown (Debian) configuration plugin (Closes: #911621) + + -- Michael Biebl Wed, 24 Oct 2018 21:05:50 +0200 + network-manager (1.14.2-2) unstable; urgency=medium * Upload to unstable -- cgit 1.3.0-6-gf8a5 From 2034b7ef86afd9d007e5812aa1fb2a2a717ba635 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 23 Oct 2018 12:33:50 +0200 Subject: Switch to debhelper compat level 12 and dh_installsystemd --- debian/compat | 2 +- debian/control | 2 +- debian/network-manager.links | 1 + debian/rules | 8 +++----- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 debian/network-manager.links (limited to 'debian') diff --git a/debian/compat b/debian/compat index f599e28b..48082f72 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/debian/control b/debian/control index 45d1f3de..27fa8d2b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Utopia Maintenance Team , Sjoerd Simons , Aron Xu -Build-Depends: debhelper (>= 10.3), +Build-Depends: debhelper (>= 11.4~), automake (>= 1.12), dpkg-dev (>= 1.17.14), pkg-config, diff --git a/debian/network-manager.links b/debian/network-manager.links new file mode 100644 index 00000000..d32ad80e --- /dev/null +++ b/debian/network-manager.links @@ -0,0 +1 @@ +lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service diff --git a/debian/rules b/debian/rules index 28e8eca5..023d1884 100755 --- a/debian/rules +++ b/debian/rules @@ -65,11 +65,9 @@ override_dh_missing: override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ -override_dh_systemd_start: - dh_link -pnetwork-manager \ - lib/systemd/system/NetworkManager.service \ - lib/systemd/system/network-manager.service - dh_systemd_start -pnetwork-manager --no-also NetworkManager.service +override_dh_installsystemd: + dh_installsystemd -pnetwork-manager --no-start NetworkManager-dispatcher.service NetworkManager-wait-online.service + dh_installsystemd -pnetwork-manager --no-also NetworkManager.service override_dh_ppp: dh_ppp --breaks -- cgit 1.3.0-6-gf8a5 From bfc526337713e7c12cad10ec9b71664b4e5f421f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Oct 2018 23:40:28 +0200 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 73491d69..fd43fa93 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -3,6 +3,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_0_4@libnm_1_0_4 1.0.4 libnm_1_0_6@libnm_1_0_6 1.0.6 libnm_1_10_0@libnm_1_10_0 1.9.90 + libnm_1_10_14@libnm_1_10_14 1.14.4 libnm_1_10_2@libnm_1_10_2 1.10.2 libnm_1_12_0@libnm_1_12_0 1.11.3 libnm_1_12_2@libnm_1_12_2 1.12.2 @@ -677,6 +678,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_connection_get_lldp@libnm_1_2_0 1.1.90 nm_setting_connection_get_llmnr@libnm_1_14_0 1.13.90 nm_setting_connection_get_master@libnm_1_0_0 1.0.0 + nm_setting_connection_get_mdns@libnm_1_10_14 1.14.4 nm_setting_connection_get_mdns@libnm_1_12_0 1.11.3 nm_setting_connection_get_metered@libnm_1_0_6 1.0.6 nm_setting_connection_get_metered@libnm_1_2_0 1.1.90 @@ -695,6 +697,7 @@ libnm.so.0 libnm0 #MINVER# 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 nm_setting_connection_llmnr_get_type@libnm_1_14_0 1.13.90 + nm_setting_connection_mdns_get_type@libnm_1_10_14 1.14.4 nm_setting_connection_mdns_get_type@libnm_1_12_0 1.11.3 nm_setting_connection_new@libnm_1_0_0 1.0.0 nm_setting_connection_permissions_user_allowed@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From ac2219da617a9f07430e77b514e0fe0cc8f0c52c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Oct 2018 00:14:00 +0200 Subject: Ignore client/tests failures check-local-clients-tests-test-client appears to be flaky and prone to fail on slower architectures. Ignore failures of this test until this has been properly investigated. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/39 --- debian/patches/Ignore-client-tests-failures.patch | 26 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/Ignore-client-tests-failures.patch (limited to 'debian') diff --git a/debian/patches/Ignore-client-tests-failures.patch b/debian/patches/Ignore-client-tests-failures.patch new file mode 100644 index 00000000..a56af7d7 --- /dev/null +++ b/debian/patches/Ignore-client-tests-failures.patch @@ -0,0 +1,26 @@ +From: Michael Biebl +Date: Thu, 25 Oct 2018 00:09:31 +0200 +Subject: Ignore client/tests failures + +check-local-clients-tests-test-client appears to be flaky and prone to +fail on slower architectures. Ignore failures of this test until this +has been properly investigated. + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/39 +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 204f1a0..9181ad1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4056,7 +4056,7 @@ check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-clie + "$(PYTHON)" \ + $(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \ + cat "$(builddir)/clients/tests/test-client.log"; \ +- test "$$r" == ok ++ true + + check_local += check-local-clients-tests-test-client + diff --git a/debian/patches/series b/debian/patches/series index 6da89bb7..28affbad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 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 +Ignore-client-tests-failures.patch -- cgit 1.3.0-6-gf8a5 From 515256fec1eaa50d86f5452a5a1295156f574585 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Oct 2018 00:31:00 +0200 Subject: Release version 1.14.4-1 to unstable --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bdcad40a..f69b6fd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -network-manager (1.14.4-1) UNRELEASED; urgency=medium +network-manager (1.14.4-1) unstable; urgency=medium * New upstream version 1.14.4 - Fix a crash in ifupdown (Debian) configuration plugin (Closes: #911621) + * Switch to debhelper compat level 12 and dh_installsystemd + * Update symbols file for libnm0 + * Ignore client/tests failures. + check-local-clients-tests-test-client appears to be flaky and prone to + fail on slower architectures. Ignore failures of this test until this + has been properly investigated. - -- Michael Biebl Wed, 24 Oct 2018 21:05:50 +0200 + -- Michael Biebl Thu, 25 Oct 2018 00:30:39 +0200 network-manager (1.14.2-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From ab56dba6bdf72e037037b3dae44113f51194c342 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 30 Oct 2018 09:28:38 +0100 Subject: dhcp6: Make sure we have enough space for the DHCP6 option header Fixes out-of-bounds heap write in systemd-networkd dhcpv6 option handling which also affects the "internal" DHCP plugin of NetworkManager. CVE-2018-15688 LP: #1795921 --- .../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 | 6 ++ 7 files changed, 280 insertions(+) create mode 100644 debian/patches/dhcp6-fix-buffer-size-checking.patch create mode 100644 debian/patches/dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch create mode 100644 debian/patches/sd-dhcp-lease-fix-memleaks.patch create mode 100644 debian/patches/sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch create mode 100644 debian/patches/sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch create mode 100644 debian/patches/sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch (limited to 'debian') diff --git a/debian/patches/dhcp6-fix-buffer-size-checking.patch b/debian/patches/dhcp6-fix-buffer-size-checking.patch new file mode 100644 index 00000000..921573b8 --- /dev/null +++ b/debian/patches/dhcp6-fix-buffer-size-checking.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 00000000..3c5c4051 --- /dev/null +++ b/debian/patches/dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-option.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 00000000..4866a6f6 --- /dev/null +++ b/debian/patches/sd-dhcp-lease-fix-memleaks.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 00000000..f49c9476 --- /dev/null +++ b/debian/patches/sd-dhcp-remove-unreachable-route-after-rebinding-return-N.patch @@ -0,0 +1,24 @@ +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 new file mode 100644 index 00000000..c04a95a9 --- /dev/null +++ b/debian/patches/sd-dhcp6-fix-argument-and-error-handling-of-dhcp6_option_.patch @@ -0,0 +1,60 @@ +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 new file mode 100644 index 00000000..f8144605 --- /dev/null +++ b/debian/patches/sd-dhcp6-make-dhcp6_option_parse_domainname-not-store-emp.patch @@ -0,0 +1,111 @@ +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 28affbad..5be1814f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,9 @@ 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 Ignore-client-tests-failures.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 -- cgit 1.3.0-6-gf8a5 From 3cdef184c37fa2c152f8542c6107f8a623735a1c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 30 Oct 2018 09:34:58 +0100 Subject: Release version 1.14.4-2 to unstable urgency=high for the security fixes. --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f69b6fd6..11ebacf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (1.14.4-2) unstable; urgency=high + + * dhcp6: Make sure we have enough space for the DHCP6 option header. + Fixes out-of-bounds heap write in systemd-networkd dhcpv6 option handling + which also affects the "internal" DHCP plugin of NetworkManager. + (CVE-2018-15688, LP: #1795921) + + -- Michael Biebl Tue, 30 Oct 2018 09:34:25 +0100 + network-manager (1.14.4-1) unstable; urgency=medium * New upstream version 1.14.4 -- cgit 1.3.0-6-gf8a5 From 61ea65bd230e95b1d7a8a35064e7b1abf9c8c8db Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Nov 2018 16:02:16 +0100 Subject: cli: wait for all wifi scans to finish before displaying the result Otherwise devices are displayed in an inconsistent order. Replaces debian/patches/Ignore-client-tests-failures.patch. --- debian/patches/Ignore-client-tests-failures.patch | 26 --- 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 +++++++++++++++++++++ debian/patches/series | 5 +- ...ld-LastScan-wifi-value-in-test-networkman.patch | 37 ++++ 6 files changed, 322 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/Ignore-client-tests-failures.patch create mode 100644 debian/patches/cli-fix-memory-leaks.patch create mode 100644 debian/patches/cli-tests-fix-output-on-failure.patch create mode 100644 debian/patches/cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch create mode 100644 debian/patches/tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch (limited to 'debian') diff --git a/debian/patches/Ignore-client-tests-failures.patch b/debian/patches/Ignore-client-tests-failures.patch deleted file mode 100644 index a56af7d7..00000000 --- a/debian/patches/Ignore-client-tests-failures.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Biebl -Date: Thu, 25 Oct 2018 00:09:31 +0200 -Subject: Ignore client/tests failures - -check-local-clients-tests-test-client appears to be flaky and prone to -fail on slower architectures. Ignore failures of this test until this -has been properly investigated. - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/39 ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 204f1a0..9181ad1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4056,7 +4056,7 @@ check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-clie - "$(PYTHON)" \ - $(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \ - cat "$(builddir)/clients/tests/test-client.log"; \ -- test "$$r" == ok -+ true - - check_local += check-local-clients-tests-test-client - diff --git a/debian/patches/cli-fix-memory-leaks.patch b/debian/patches/cli-fix-memory-leaks.patch new file mode 100644 index 00000000..457a7f85 --- /dev/null +++ b/debian/patches/cli-fix-memory-leaks.patch @@ -0,0 +1,37 @@ +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 new file mode 100644 index 00000000..4a213a92 --- /dev/null +++ b/debian/patches/cli-tests-fix-output-on-failure.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 00000000..aaf4f28b --- /dev/null +++ b/debian/patches/cli-wait-for-all-wifi-scans-to-finish-before-displaying-t.patch @@ -0,0 +1,219 @@ +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/series b/debian/patches/series index 5be1814f..a5646381 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,13 @@ 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 -Ignore-client-tests-failures.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 new file mode 100644 index 00000000..31ec7ee6 --- /dev/null +++ b/debian/patches/tests-simulate-old-LastScan-wifi-value-in-test-networkman.patch @@ -0,0 +1,37 @@ +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 efc618fca3ff150f8188ad1d3a87049dd42a5727 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Nov 2018 16:06:01 +0100 Subject: Release version 1.14.4-3 to unstable --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 11ebacf2..cbf982d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.14.4-3) unstable; urgency=medium + + * cli: wait for all wifi scans to finish before displaying the result. + Otherwise devices are displayed in an inconsistent order. + Replaces debian/patches/Ignore-client-tests-failures.patch. + + -- Michael Biebl Mon, 05 Nov 2018 16:05:51 +0100 + network-manager (1.14.4-2) unstable; urgency=high * dhcp6: Make sure we have enough space for the DHCP6 option header. -- cgit 1.3.0-6-gf8a5 From 677cd79028d990e76cd3b9505c4a4b59b934dbf6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Nov 2018 01:22:09 +0100 Subject: Move D-Bus policy files to /usr/share/dbus-1/system.d/ This is supported since dbus 1.9.18. --- debian/network-manager.install | 4 ++-- debian/rules | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/network-manager.install b/debian/network-manager.install index bb751b47..0f1e82ae 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -14,10 +14,10 @@ usr/lib/pppd/*/*.so usr/share/locale/ usr/share/man/ usr/share/dbus-1/system-services/ +usr/share/dbus-1/system.d/org.freedesktop.NetworkManager.conf +usr/share/dbus-1/system.d/nm-dispatcher.conf usr/share/polkit-1/ usr/share/bash-completion/ -etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf -etc/dbus-1/system.d/nm-dispatcher.conf etc/NetworkManager/dispatcher.d/ lib/udev/rules.d/*.rules lib/systemd/system/NetworkManager.service diff --git a/debian/rules b/debian/rules index 023d1884..dc1f974d 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,7 @@ override_dh_auto_configure: --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-udev-dir=/lib/udev \ + --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ --with-crypto=gnutls \ --with-session-tracking=systemd \ --with-suspend-resume=systemd \ -- cgit 1.3.0-6-gf8a5 From 179df1a8ab7df0663d8178883373c31b59cfbf06 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Nov 2018 01:35:15 +0100 Subject: Remove obsolete D-Bus policy conffiles on upgrades --- debian/network-manager.maintscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript index c6b7a809..02266a64 100644 --- a/debian/network-manager.maintscript +++ b/debian/network-manager.maintscript @@ -1,2 +1,4 @@ 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~ -- cgit 1.3.0-6-gf8a5 From 1b878e595ff7be634a4800ca6cc506046e49548e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Nov 2018 01:36:30 +0100 Subject: Release version 1.14.4-4 to unstable --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cbf982d5..3e505a8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.14.4-4) unstable; urgency=medium + + * Move D-Bus policy files to /usr/share/dbus-1/system.d/ + * Remove obsolete D-Bus policy conffiles on upgrades + + -- Michael Biebl Tue, 27 Nov 2018 01:35:50 +0100 + network-manager (1.14.4-3) unstable; urgency=medium * cli: wait for all wifi scans to finish before displaying the result. -- cgit 1.3.0-6-gf8a5