From 36cea17320339a31e62012d6efbfa4f78c7f44f0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 12 Dec 2017 15:54:03 +0100 Subject: New upstream version 1.10.2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 54fa99b5..a291d617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.10.2-1) UNRELEASED; urgency=medium + + * New upstream version 1.10.2 + + -- Michael Biebl Tue, 12 Dec 2017 15:54:00 +0100 + network-manager (1.10.0-1) unstable; urgency=medium * New upstream version 1.10.0 -- cgit 1.3.0-6-gf8a5 From a7f092bdddfd8c1a50228b952cf3f74890fe1c7a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 12 Dec 2017 16:00:02 +0100 Subject: Rebase patches --- ...Don-t-make-NetworkManager-D-Bus-activatable.patch | 4 ++-- ...up-Sleep-Monitor-if-not-booted-with-systemd.patch | 2 +- debian/patches/Fix-iscsiadm-path.patch | 2 +- .../Force-online-state-with-unmanaged-devices.patch | 20 ++++++++++---------- ...-empty-NMClient-and-NetworkManager-when-loa.patch | 8 ++++---- 5 files changed, 18 insertions(+), 18 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 cb3fe561..75430954 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 0cc4d7f..b1b63d4 100644 +index 941c1a2..b7c0a5f 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3687,11 +3687,6 @@ endif +@@ -3683,11 +3683,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 43712a3c..eb6fbd17 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 037db11..18282f1 100644 +index 7a37387..867e0d8 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 286e2099..c6ca5f72 100644 --- a/debian/patches/Fix-iscsiadm-path.patch +++ b/debian/patches/Fix-iscsiadm-path.patch @@ -12,7 +12,7 @@ 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 9b1f5cc..8cc1313 100644 +index ea4d152..09a4579 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) diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 62878813..d84f558f 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, 117 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 2766e86..a14c0aa 100644 +index 7f1b9a9..956d11f 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -21,10 +21,10 @@ index 2766e86..a14c0aa 100644 +#define IFUPDOWN_STATE_FILE "/run/network/ifstate" + - static gboolean add_device (NMManager *self, NMDevice *device, GError **error); + /*****************************************************************************/ - static NMActiveConnection *_new_active_connection (NMManager *self, -@@ -157,6 +159,10 @@ typedef struct { + typedef struct { +@@ -167,6 +169,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 2766e86..a14c0aa 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -870,6 +876,29 @@ find_best_device_state (NMManager *manager) +@@ -876,6 +882,29 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -65,7 +65,7 @@ index 2766e86..a14c0aa 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -908,6 +937,9 @@ nm_manager_update_state (NMManager *manager) +@@ -914,6 +943,9 @@ nm_manager_update_state (NMManager *manager) else new_state = find_best_device_state (manager); @@ -75,7 +75,7 @@ index 2766e86..a14c0aa 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5090,6 +5122,62 @@ impl_manager_check_connectivity (NMManager *self, +@@ -5174,6 +5206,62 @@ impl_manager_check_connectivity (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -138,7 +138,7 @@ index 2766e86..a14c0aa 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -5232,6 +5320,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -5318,6 +5406,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); @@ -148,7 +148,7 @@ index 2766e86..a14c0aa 100644 return TRUE; } -@@ -6228,6 +6319,22 @@ nm_manager_init (NMManager *self) +@@ -6313,6 +6404,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -171,7 +171,7 @@ index 2766e86..a14c0aa 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -6489,6 +6596,16 @@ dispose (GObject *object) +@@ -6595,6 +6702,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch index c7219064..c78f9a45 100644 --- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch +++ b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch @@ -54,10 +54,10 @@ After: create mode 100644 libnm/fake-typelib/typelibs.gresource.xml diff --git a/Makefile.am b/Makefile.am -index b1b63d4..4fb8f5a 100644 +index b7c0a5f..f4c8e86 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \ +@@ -852,6 +852,7 @@ nodist_libnminclude_HEADERS += \ noinst_LTLIBRARIES += libnm/libnm-utils.la libnm_libnm_utils_la_CPPFLAGS = \ @@ -65,7 +65,7 @@ index b1b63d4..4fb8f5a 100644 $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ -@@ -956,6 +957,23 @@ libnm/libnm.typelib: libnm/libnm.gir +@@ -950,6 +951,23 @@ libnm/libnm.typelib: libnm/libnm.gir $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ INTROSPECTION_GIRS += libnm/NM-1.0.gir @@ -90,7 +90,7 @@ index b1b63d4..4fb8f5a 100644 if HAVE_INTROSPECTION diff --git a/configure.ac b/configure.ac -index f8dcd13..f2e0cd2 100644 +index a4d7c24..01976bb 100644 --- a/configure.ac +++ b/configure.ac @@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V -- cgit 1.3.0-6-gf8a5 From e0f020bc0d810f5650b6547de0dd771996dec2c7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 12 Dec 2017 16:25:42 +0100 Subject: Update symbols file for libnm0 --- debian/libnm0.symbols | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) (limited to 'debian') diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 56082596..3da4fb3a 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_2@libnm_1_10_2 1.10.2 libnm_1_2_0@libnm_1_2_0 1.1.90 libnm_1_2_4@libnm_1_2_4 1.2.4 libnm_1_4_0@libnm_1_4_0 1.4.0 @@ -465,6 +466,8 @@ libnm.so.0 libnm0 #MINVER# nm_remote_connection_save@libnm_1_0_0 1.0.0 nm_remote_connection_save_async@libnm_1_0_0 1.0.0 nm_remote_connection_save_finish@libnm_1_0_0 1.0.0 + nm_remote_connection_update2@libnm_1_10_2 1.10.2 + nm_remote_connection_update2_finish@libnm_1_10_2 1.10.2 nm_secret_agent_capabilities_get_type@libnm_1_0_0 1.0.0 nm_secret_agent_error_get_type@libnm_1_0_0 1.0.0 nm_secret_agent_error_quark@libnm_1_0_0 1.0.0 @@ -874,12 +877,61 @@ 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_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 + nm_setting_tc_config_clear_tfilters@libnm_1_10_2 1.10.2 + nm_setting_tc_config_get_num_qdiscs@libnm_1_10_2 1.10.2 + nm_setting_tc_config_get_num_tfilters@libnm_1_10_2 1.10.2 + nm_setting_tc_config_get_qdisc@libnm_1_10_2 1.10.2 + nm_setting_tc_config_get_tfilter@libnm_1_10_2 1.10.2 + nm_setting_tc_config_get_type@libnm_1_10_2 1.10.2 + nm_setting_tc_config_new@libnm_1_10_2 1.10.2 + nm_setting_tc_config_remove_qdisc@libnm_1_10_2 1.10.2 + nm_setting_tc_config_remove_qdisc_by_value@libnm_1_10_2 1.10.2 + nm_setting_tc_config_remove_tfilter@libnm_1_10_2 1.10.2 + nm_setting_tc_config_remove_tfilter_by_value@libnm_1_10_2 1.10.2 + nm_setting_team_add_link_watcher@libnm_1_10_2 1.10.2 + nm_setting_team_add_runner_tx_hash@libnm_1_10_2 1.10.2 + nm_setting_team_clear_link_watchers@libnm_1_10_2 1.10.2 nm_setting_team_get_config@libnm_1_0_0 1.0.0 + nm_setting_team_get_link_watcher@libnm_1_10_2 1.10.2 + nm_setting_team_get_mcast_rejoin_count@libnm_1_10_2 1.10.2 + nm_setting_team_get_mcast_rejoin_interval@libnm_1_10_2 1.10.2 + nm_setting_team_get_notify_peers_count@libnm_1_10_2 1.10.2 + nm_setting_team_get_notify_peers_interval@libnm_1_10_2 1.10.2 + nm_setting_team_get_num_link_watchers@libnm_1_10_2 1.10.2 + nm_setting_team_get_num_runner_tx_hash@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_active@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_agg_select_policy@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_fast_rate@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_hwaddr_policy@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_min_ports@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_sys_prio@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_tx_balancer@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_tx_balancer_interval@libnm_1_10_2 1.10.2 + nm_setting_team_get_runner_tx_hash@libnm_1_10_2 1.10.2 nm_setting_team_get_type@libnm_1_0_0 1.0.0 nm_setting_team_new@libnm_1_0_0 1.0.0 + nm_setting_team_port_add_link_watcher@libnm_1_10_2 1.10.2 + nm_setting_team_port_clear_link_watchers@libnm_1_10_2 1.10.2 nm_setting_team_port_get_config@libnm_1_0_0 1.0.0 + nm_setting_team_port_get_lacp_key@libnm_1_10_2 1.10.2 + nm_setting_team_port_get_lacp_prio@libnm_1_10_2 1.10.2 + nm_setting_team_port_get_link_watcher@libnm_1_10_2 1.10.2 + nm_setting_team_port_get_num_link_watchers@libnm_1_10_2 1.10.2 + nm_setting_team_port_get_prio@libnm_1_10_2 1.10.2 + nm_setting_team_port_get_queue_id@libnm_1_10_2 1.10.2 + nm_setting_team_port_get_sticky@libnm_1_10_2 1.10.2 nm_setting_team_port_get_type@libnm_1_0_0 1.0.0 nm_setting_team_port_new@libnm_1_0_0 1.0.0 + nm_setting_team_port_remove_link_watcher@libnm_1_10_2 1.10.2 + nm_setting_team_port_remove_link_watcher_by_value@libnm_1_10_2 1.10.2 + nm_setting_team_remove_link_watcher@libnm_1_10_2 1.10.2 + nm_setting_team_remove_link_watcher_by_value@libnm_1_10_2 1.10.2 + nm_setting_team_remove_runner_tx_hash@libnm_1_10_2 1.10.2 + nm_setting_team_remove_runner_tx_hash_by_value@libnm_1_10_2 1.10.2 nm_setting_to_string@libnm_1_0_0 1.0.0 nm_setting_tun_get_group@libnm_1_2_0 1.1.90 nm_setting_tun_get_mode@libnm_1_2_0 1.1.90 @@ -1046,11 +1098,60 @@ libnm.so.0 libnm0 #MINVER# nm_setting_wireless_security_wps_method_get_type@libnm_1_10_0 1.9.90 nm_settings_error_get_type@libnm_1_0_0 1.0.0 nm_settings_error_quark@libnm_1_0_0 1.0.0 + nm_settings_update2_flags_get_type@libnm_1_10_2 1.10.2 nm_simple_connection_get_type@libnm_1_0_0 1.0.0 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_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 + nm_tc_action_get_attribute@libnm_1_10_2 1.10.2 + nm_tc_action_get_attribute_names@libnm_1_10_2 1.10.2 + nm_tc_action_get_kind@libnm_1_10_2 1.10.2 + nm_tc_action_get_type@libnm_1_10_2 1.10.2 + nm_tc_action_new@libnm_1_10_2 1.10.2 + nm_tc_action_ref@libnm_1_10_2 1.10.2 + nm_tc_action_set_attribute@libnm_1_10_2 1.10.2 + 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_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_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 + nm_tc_tfilter_equal@libnm_1_10_2 1.10.2 + nm_tc_tfilter_get_handle@libnm_1_10_2 1.10.2 + nm_tc_tfilter_get_kind@libnm_1_10_2 1.10.2 + nm_tc_tfilter_get_parent@libnm_1_10_2 1.10.2 + nm_tc_tfilter_get_type@libnm_1_10_2 1.10.2 + nm_tc_tfilter_new@libnm_1_10_2 1.10.2 + nm_tc_tfilter_ref@libnm_1_10_2 1.10.2 + nm_tc_tfilter_set_handle@libnm_1_10_2 1.10.2 + nm_tc_tfilter_unref@libnm_1_10_2 1.10.2 + nm_team_link_watcher_arp_ping_flags_get_type@libnm_1_10_2 1.10.2 + nm_team_link_watcher_dup@libnm_1_10_2 1.10.2 + nm_team_link_watcher_equal@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_delay_down@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_delay_up@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_flags@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_init_wait@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_interval@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_missed_max@libnm_1_10_2 1.10.2 + nm_team_link_watcher_get_name@libnm_1_10_2 1.10.2 + 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_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 + 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_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 @@ -1103,6 +1204,12 @@ libnm.so.0 libnm0 #MINVER# 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_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 + nm_utils_tc_qdisc_from_str@libnm_1_10_2 1.10.2 + nm_utils_tc_qdisc_to_str@libnm_1_10_2 1.10.2 + nm_utils_tc_tfilter_from_str@libnm_1_10_2 1.10.2 + nm_utils_tc_tfilter_to_str@libnm_1_10_2 1.10.2 nm_utils_uuid_generate@libnm_1_0_0 1.0.0 nm_utils_version@libnm_1_6_0 1.5.90 nm_utils_wep_key_valid@libnm_1_0_0 1.0.0 -- cgit 1.3.0-6-gf8a5 From d39cfd45b737ccd025a83d5fc699faf8e7b42698 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 12 Dec 2017 16:25:58 +0100 Subject: Bump Standards-Version 4.1.2 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 0913ff66..2b0cf8cc 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 10.3), valac (>= 0.17.1.24), dbus , python-dbus -Standards-Version: 4.1.1 +Standards-Version: 4.1.2 Vcs-Git: https://anonscm.debian.org/git/pkg-utopia/network-manager.git Vcs-Browser: https://anonscm.debian.org/git/pkg-utopia/network-manager.git Homepage: https://wiki.gnome.org/Projects/NetworkManager -- cgit 1.3.0-6-gf8a5 From 0d0e867343fc576e737b5f68dedfa065de4c5a02 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 12 Dec 2017 16:26:39 +0100 Subject: Release version 1.10.2-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 a291d617..a1aa9c7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -network-manager (1.10.2-1) UNRELEASED; urgency=medium +network-manager (1.10.2-1) unstable; urgency=medium * New upstream version 1.10.2 + * Rebase patches + * Update symbols file for libnm0 + * Bump Standards-Version 4.1.2 - -- Michael Biebl Tue, 12 Dec 2017 15:54:00 +0100 + -- Michael Biebl Tue, 12 Dec 2017 16:26:27 +0100 network-manager (1.10.0-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From e1deb8e738364e393f077880e059411968c2f5e2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Jan 2018 03:08:04 +0100 Subject: libnm-core/tc-config: remove deprecation guards from typedefs Closes: #887815 --- ...nfig-remove-deprecation-guards-from-typed.patch | 41 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch (limited to 'debian') diff --git a/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch b/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch new file mode 100644 index 00000000..16d5cc62 --- /dev/null +++ b/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch @@ -0,0 +1,41 @@ +From: Lubomir Rintel +Date: Mon, 18 Dec 2017 08:27:25 +0100 +Subject: libnm-core/tc-config: remove deprecation guards from typedefs + +They're triggered by the prototypes in header file inclusion, even +though no routines or variables that use the type are actually used. + +(cherry picked from commit 685cb5c88bf90b285a18a98a6bbeafa559938fee) +(cherry picked from commit 8d120a6fda1761430241367781c57d302ffc5fe3) +--- + libnm-core/nm-setting-tc-config.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h +index 736d5ad..8117d5e 100644 +--- a/libnm-core/nm-setting-tc-config.h ++++ b/libnm-core/nm-setting-tc-config.h +@@ -28,7 +28,6 @@ + + G_BEGIN_DECLS + +-NM_AVAILABLE_IN_1_10_2 + typedef struct NMTCQdisc NMTCQdisc; + + NM_AVAILABLE_IN_1_10_2 +@@ -61,7 +60,6 @@ void nm_tc_qdisc_set_handle (NMTCQdisc *qdisc, + NM_AVAILABLE_IN_1_10_2 + guint32 nm_tc_qdisc_get_parent (NMTCQdisc *qdisc); + +-NM_AVAILABLE_IN_1_10_2 + typedef struct NMTCAction NMTCAction; + + NM_AVAILABLE_IN_1_10_2 +@@ -96,7 +94,6 @@ void nm_tc_action_set_attribute (NMTCAction *action, + const char *name, + GVariant *value); + +-NM_AVAILABLE_IN_1_10_2 + typedef struct NMTCTfilter NMTCTfilter; + + NM_AVAILABLE_IN_1_10_2 diff --git a/debian/patches/series b/debian/patches/series index e44814db..fba0cbd9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ Fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch +libnm-core-tc-config-remove-deprecation-guards-from-typed.patch -- cgit 1.3.0-6-gf8a5 From ac717b686e40bc8c365e2f3eae7315f4ad239ae7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Jan 2018 03:18:55 +0100 Subject: Bump debhelper compat level to 11 --- debian/compat | 2 +- debian/control | 2 +- debian/network-manager.examples | 2 +- debian/rules | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index f599e28b..b4de3947 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 2b0cf8cc..76517185 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), automake (>= 1.12), dpkg-dev (>= 1.17.14), pkg-config, diff --git a/debian/network-manager.examples b/debian/network-manager.examples index a1fc8a10..9decc509 100644 --- a/debian/network-manager.examples +++ b/debian/network-manager.examples @@ -1 +1 @@ -debian/tmp/usr/share/doc/NetworkManager/examples/server.conf +usr/share/doc/NetworkManager/examples/server.conf diff --git a/debian/rules b/debian/rules index a224a16a..7583feb4 100755 --- a/debian/rules +++ b/debian/rules @@ -55,7 +55,6 @@ override_dh_auto_configure: override_dh_install: find debian/tmp -name '*.la' -print -delete - rm debian/tmp/usr/share/doc/NetworkManager/examples/server.conf dh_install override_dh_missing: -- cgit 1.3.0-6-gf8a5 From bb7c4951f725a9d206fda40ed2879ec5db8b4967 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Jan 2018 14:33:18 +0100 Subject: Release version 1.10.2-2 to unstable --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a1aa9c7d..36b4e953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.10.2-2) unstable; urgency=medium + + * libnm-core/tc-config: remove deprecation guards from typedefs + (Closes: #887815) + * Bump debhelper compat level to 11 + + -- Michael Biebl Sun, 21 Jan 2018 14:32:55 +0100 + network-manager (1.10.2-1) unstable; urgency=medium * New upstream version 1.10.2 -- cgit 1.3.0-6-gf8a5 From 501572d74779fdf0fc240e01eb82843e9417322c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Jan 2018 14:35:46 +0100 Subject: secret-agent: construct the dbus proxy for async agent with the correct bus name --- ...struct-the-dbus-proxy-for-async-agent-wit.patch | 37 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch (limited to 'debian') diff --git a/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch b/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch new file mode 100644 index 00000000..8e7be6ec --- /dev/null +++ b/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch @@ -0,0 +1,37 @@ +From: Lubomir Rintel +Date: Thu, 11 Jan 2018 11:11:10 +0100 +Subject: secret-agent: construct the dbus proxy for async agent with the + correct bus name + +The asynchronous secret agent initialization doesn't work at all due to a +rather silly typo. Oops. + +While at it, fix a whitespace error too. + +(cherry picked from commit 603daa5b256b8964e0eed8c78a49d445f7944734) +--- + libnm/nm-secret-agent-old.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c +index 76e4238..c9dbb4f 100644 +--- a/libnm/nm-secret-agent-old.c ++++ b/libnm/nm-secret-agent-old.c +@@ -1118,7 +1118,7 @@ init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data) + + if (priv->auto_register) { + nm_secret_agent_old_register_async (init_data->self, init_data->cancellable, +- init_async_registered, init_data); ++ init_async_registered, init_data); + } else + init_async_complete (init_data, NULL); + } +@@ -1139,7 +1139,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data) + nmdbus_agent_manager_proxy_new (priv->bus, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES + | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, +- NM_DBUS_INTERFACE_AGENT_MANAGER, ++ NM_DBUS_SERVICE, + NM_DBUS_PATH_AGENT_MANAGER, + init_data->cancellable, + init_async_got_proxy, init_data); diff --git a/debian/patches/series b/debian/patches/series index fba0cbd9..53a4bf8c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch libnm-core-tc-config-remove-deprecation-guards-from-typed.patch +secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch -- cgit 1.3.0-6-gf8a5 From aefcc4b86fc7ade5101c5247d8fb2a565453df2d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Jan 2018 16:47:39 +0100 Subject: Revert "Bump debhelper compat level to 11" There are currently too many issues with dh_installsystemd, so switch back to compat 10 using dh_systemd_enable and dh_systemd_start for the time being. This reverts commit ac717b686e40bc8c365e2f3eae7315f4ad239ae7. --- debian/compat | 2 +- debian/control | 2 +- debian/network-manager.examples | 2 +- debian/rules | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index b4de3947..f599e28b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +10 diff --git a/debian/control b/debian/control index 76517185..2b0cf8cc 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Utopia Maintenance Team , Sjoerd Simons , Aron Xu -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper (>= 10.3), automake (>= 1.12), dpkg-dev (>= 1.17.14), pkg-config, diff --git a/debian/network-manager.examples b/debian/network-manager.examples index 9decc509..a1fc8a10 100644 --- a/debian/network-manager.examples +++ b/debian/network-manager.examples @@ -1 +1 @@ -usr/share/doc/NetworkManager/examples/server.conf +debian/tmp/usr/share/doc/NetworkManager/examples/server.conf diff --git a/debian/rules b/debian/rules index 7583feb4..a224a16a 100755 --- a/debian/rules +++ b/debian/rules @@ -55,6 +55,7 @@ override_dh_auto_configure: override_dh_install: find debian/tmp -name '*.la' -print -delete + rm debian/tmp/usr/share/doc/NetworkManager/examples/server.conf dh_install override_dh_missing: -- cgit 1.3.0-6-gf8a5 From ca75059f238159a436f97a5883269e9d4c172441 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Jan 2018 19:51:04 +0100 Subject: Release version 1.10.2-3 to unstable --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 36b4e953..3c9badac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +network-manager (1.10.2-3) unstable; urgency=medium + + * secret-agent: construct the dbus proxy for async agent with the correct + bus name + * Revert "Bump debhelper compat level to 11" + There are currently too many issues with dh_installsystemd, so switch + back to compat 10 using dh_systemd_enable and dh_systemd_start for the + time being. + + -- Michael Biebl Sun, 21 Jan 2018 19:50:39 +0100 + network-manager (1.10.2-2) unstable; urgency=medium * libnm-core/tc-config: remove deprecation guards from typedefs -- cgit 1.3.0-6-gf8a5 From faa06d49913c58403f2de9a4d4ff742eeae6a763 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Jan 2018 23:59:05 +0100 Subject: Set Rules-Requires-Root to no --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 2b0cf8cc..309aa20e 100644 --- a/debian/control +++ b/debian/control @@ -47,6 +47,7 @@ Build-Depends: debhelper (>= 10.3), dbus , python-dbus Standards-Version: 4.1.2 +Rules-Requires-Root: no Vcs-Git: https://anonscm.debian.org/git/pkg-utopia/network-manager.git Vcs-Browser: https://anonscm.debian.org/git/pkg-utopia/network-manager.git Homepage: https://wiki.gnome.org/Projects/NetworkManager -- cgit 1.3.0-6-gf8a5 From 0e2fbae977ac89f451900f80a35ef01692a5aa84 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Jan 2018 00:00:20 +0100 Subject: platform: fix crash hashing NMPlatformTfilter and NMPlatformQdisc Closes: #888291 --- ...sh-hashing-NMPlatformTfilter-and-NMPlatfo.patch | 62 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 63 insertions(+) create mode 100644 debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch (limited to 'debian') diff --git a/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch b/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch new file mode 100644 index 00000000..ddf88f7b --- /dev/null +++ b/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch @@ -0,0 +1,62 @@ +From: Thomas Haller +Date: Tue, 12 Dec 2017 10:37:59 +0100 +Subject: platform: fix crash hashing NMPlatformTfilter and NMPlatformQdisc + +@kind might be NULL. There are 3 forms of the hash-update functions for +string: str(), str0(), and strarr(). + +- str0() is when the string might be NULL. +- str() does not allow the string to be NULL +- strarr() is like str(), except it adds a G_STATIC_ASSERT() + that the argument is a C array. + +The reason why a difference between str() and str0() exists, is +because str0() hashes NULL different from a "" or any other string. +This has an overhead, because it effectively must hash another bit +of information that tells whether a string was passed or not. + +The reason is, that hashing a tupple of two strings should always +yield a different hash value, even for "aa",""; "a","a"; "","aa", +where naive concatentation would yield identical hash values in all +three cases. + +Fixes: e75fc8279becce29e688551930d85e59e1280c89 +(cherry picked from commit 27e8fffdb833748dfeb6648b8768c4ef48822841) +--- + src/platform/nm-platform.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c +index 2ca379e..7067557 100644 +--- a/src/platform/nm-platform.c ++++ b/src/platform/nm-platform.c +@@ -5320,7 +5320,7 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len) + void + nm_platform_qdisc_hash_update (const NMPlatformQdisc *obj, NMHashState *h) + { +- nm_hash_update_str (h, obj->kind); ++ nm_hash_update_str0 (h, obj->kind); + nm_hash_update_vals (h, + obj->ifindex, + obj->addr_family, +@@ -5387,17 +5387,17 @@ nm_platform_tfilter_to_string (const NMPlatformTfilter *tfilter, char *buf, gsiz + void + nm_platform_tfilter_hash_update (const NMPlatformTfilter *obj, NMHashState *h) + { +- nm_hash_update_str (h, obj->kind); ++ nm_hash_update_str0 (h, obj->kind); + nm_hash_update_vals (h, + obj->ifindex, + obj->addr_family, + obj->handle, + obj->parent, + obj->info); +- nm_hash_update_str (h, obj->action.kind); + if (obj->action.kind) { ++ nm_hash_update_str (h, obj->action.kind); + if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) +- nm_hash_update_str (h, obj->action.simple.sdata); ++ nm_hash_update_strarr (h, obj->action.simple.sdata); + } + } + diff --git a/debian/patches/series b/debian/patches/series index 53a4bf8c..22431a55 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ Fix-iscsiadm-path.patch libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch libnm-core-tc-config-remove-deprecation-guards-from-typed.patch secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch +platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch -- cgit 1.3.0-6-gf8a5 From cd56a9c2ebadc7c03f6bd76c46ffb73d542a8a9e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Jan 2018 00:01:13 +0100 Subject: Bump Standards-Version to 4.1.3 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 309aa20e..1534f785 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 10.3), valac (>= 0.17.1.24), dbus , python-dbus -Standards-Version: 4.1.2 +Standards-Version: 4.1.3 Rules-Requires-Root: no Vcs-Git: https://anonscm.debian.org/git/pkg-utopia/network-manager.git Vcs-Browser: https://anonscm.debian.org/git/pkg-utopia/network-manager.git -- cgit 1.3.0-6-gf8a5 From 0f88d7155997c41fc13a235ee96137f9d065ec21 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Jan 2018 00:01:36 +0100 Subject: Release version 1.10.2-4 to unstable --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3c9badac..b8cadcd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (1.10.2-4) unstable; urgency=medium + + * Set Rules-Requires-Root to no + * platform: fix crash hashing NMPlatformTfilter and NMPlatformQdisc + (Closes: #888291) + * Bump Standards-Version to 4.1.3 + + -- Michael Biebl Thu, 25 Jan 2018 00:01:19 +0100 + network-manager (1.10.2-3) unstable; urgency=medium * secret-agent: construct the dbus proxy for async agent with the correct -- cgit 1.3.0-6-gf8a5 From 3d9525cb641ac53c6d36bf5312710c22ae4bd926 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Thu, 25 Jan 2018 10:34:07 +0100 Subject: Do not fail installation of network-manager-config-connectivity-* if network-manager fails to reload (see LP: #1742403) --- debian/changelog | 7 +++++++ debian/network-manager-config-connectivity-debian.postinst | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b8cadcd9..8ab3880c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.10.2-5) UNRELEASED; urgency=medium + + * Do not fail installation of network-manager-config-connectivity-* if + network-manager fails to reload (see LP: #1742403) + + -- Laurent Bigonville Thu, 25 Jan 2018 10:32:31 +0100 + network-manager (1.10.2-4) unstable; urgency=medium * Set Rules-Requires-Root to no diff --git a/debian/network-manager-config-connectivity-debian.postinst b/debian/network-manager-config-connectivity-debian.postinst index e8698667..eb087aa4 100644 --- a/debian/network-manager-config-connectivity-debian.postinst +++ b/debian/network-manager-config-connectivity-debian.postinst @@ -3,7 +3,7 @@ set -e if [ "$1" = configure ]; then - invoke-rc.d network-manager force-reload + invoke-rc.d network-manager force-reload || true fi #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 53a60362b47dda4b30f4fa23ed72c003373313c5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 7 Feb 2018 02:40:23 +0100 Subject: New upstream version 1.10.4 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8ab3880c..e7cbd554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -network-manager (1.10.2-5) UNRELEASED; urgency=medium +network-manager (1.10.4-1) UNRELEASED; urgency=medium + [ Laurent Bigonville ] * Do not fail installation of network-manager-config-connectivity-* if network-manager fails to reload (see LP: #1742403) - -- Laurent Bigonville Thu, 25 Jan 2018 10:32:31 +0100 + [ Michael Biebl ] + * New upstream version 1.10.4 + + -- Michael Biebl Wed, 07 Feb 2018 02:40:08 +0100 network-manager (1.10.2-4) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 349745617711dcebdbef916d24ba93449b193f40 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 7 Feb 2018 02:43:38 +0100 Subject: Rebase patches --- ...n-t-make-NetworkManager-D-Bus-activatable.patch | 4 +- ...Force-online-state-with-unmanaged-devices.patch | 16 +++--- ...nfig-remove-deprecation-guards-from-typed.patch | 41 -------------- ...mpty-NMClient-and-NetworkManager-when-loa.patch | 8 +-- ...sh-hashing-NMPlatformTfilter-and-NMPlatfo.patch | 62 ---------------------- ...struct-the-dbus-proxy-for-async-agent-wit.patch | 37 ------------- debian/patches/series | 3 -- 7 files changed, 14 insertions(+), 157 deletions(-) delete mode 100644 debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch delete mode 100644 debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch delete mode 100644 debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.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 75430954..694b05b5 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 941c1a2..b7c0a5f 100644 +index 639921d..2ddc7bc 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3683,11 +3683,6 @@ endif +@@ -3689,11 +3689,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 d84f558f..6ef9bf54 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, 117 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 7f1b9a9..956d11f 100644 +index 001fae5..38e8a8f 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -24,7 +24,7 @@ index 7f1b9a9..956d11f 100644 /*****************************************************************************/ typedef struct { -@@ -167,6 +169,10 @@ typedef struct { +@@ -169,6 +171,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 7f1b9a9..956d11f 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -876,6 +882,29 @@ find_best_device_state (NMManager *manager) +@@ -1122,6 +1128,29 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -65,7 +65,7 @@ index 7f1b9a9..956d11f 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -914,6 +943,9 @@ nm_manager_update_state (NMManager *manager) +@@ -1160,6 +1189,9 @@ nm_manager_update_state (NMManager *manager) else new_state = find_best_device_state (manager); @@ -75,7 +75,7 @@ index 7f1b9a9..956d11f 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5174,6 +5206,62 @@ impl_manager_check_connectivity (NMManager *self, +@@ -5419,6 +5451,62 @@ impl_manager_check_connectivity (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -138,7 +138,7 @@ index 7f1b9a9..956d11f 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -5318,6 +5406,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -5570,6 +5658,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); @@ -148,7 +148,7 @@ index 7f1b9a9..956d11f 100644 return TRUE; } -@@ -6313,6 +6404,22 @@ nm_manager_init (NMManager *self) +@@ -6565,6 +6656,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -171,7 +171,7 @@ index 7f1b9a9..956d11f 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -6595,6 +6702,16 @@ dispose (GObject *object) +@@ -6847,6 +6954,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch b/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch deleted file mode 100644 index 16d5cc62..00000000 --- a/debian/patches/libnm-core-tc-config-remove-deprecation-guards-from-typed.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Lubomir Rintel -Date: Mon, 18 Dec 2017 08:27:25 +0100 -Subject: libnm-core/tc-config: remove deprecation guards from typedefs - -They're triggered by the prototypes in header file inclusion, even -though no routines or variables that use the type are actually used. - -(cherry picked from commit 685cb5c88bf90b285a18a98a6bbeafa559938fee) -(cherry picked from commit 8d120a6fda1761430241367781c57d302ffc5fe3) ---- - libnm-core/nm-setting-tc-config.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h -index 736d5ad..8117d5e 100644 ---- a/libnm-core/nm-setting-tc-config.h -+++ b/libnm-core/nm-setting-tc-config.h -@@ -28,7 +28,6 @@ - - G_BEGIN_DECLS - --NM_AVAILABLE_IN_1_10_2 - typedef struct NMTCQdisc NMTCQdisc; - - NM_AVAILABLE_IN_1_10_2 -@@ -61,7 +60,6 @@ void nm_tc_qdisc_set_handle (NMTCQdisc *qdisc, - NM_AVAILABLE_IN_1_10_2 - guint32 nm_tc_qdisc_get_parent (NMTCQdisc *qdisc); - --NM_AVAILABLE_IN_1_10_2 - typedef struct NMTCAction NMTCAction; - - NM_AVAILABLE_IN_1_10_2 -@@ -96,7 +94,6 @@ void nm_tc_action_set_attribute (NMTCAction *action, - const char *name, - GVariant *value); - --NM_AVAILABLE_IN_1_10_2 - typedef struct NMTCTfilter NMTCTfilter; - - NM_AVAILABLE_IN_1_10_2 diff --git a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch index c78f9a45..e742ffe6 100644 --- a/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch +++ b/debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch @@ -54,10 +54,10 @@ After: create mode 100644 libnm/fake-typelib/typelibs.gresource.xml diff --git a/Makefile.am b/Makefile.am -index b7c0a5f..f4c8e86 100644 +index 2ddc7bc..a741c6e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -852,6 +852,7 @@ nodist_libnminclude_HEADERS += \ +@@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \ noinst_LTLIBRARIES += libnm/libnm-utils.la libnm_libnm_utils_la_CPPFLAGS = \ @@ -65,7 +65,7 @@ index b7c0a5f..f4c8e86 100644 $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ -@@ -950,6 +951,23 @@ libnm/libnm.typelib: libnm/libnm.gir +@@ -956,6 +957,23 @@ libnm/libnm.typelib: libnm/libnm.gir $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ INTROSPECTION_GIRS += libnm/NM-1.0.gir @@ -90,7 +90,7 @@ index b7c0a5f..f4c8e86 100644 if HAVE_INTROSPECTION diff --git a/configure.ac b/configure.ac -index a4d7c24..01976bb 100644 +index c1ce21e..11948ac 100644 --- a/configure.ac +++ b/configure.ac @@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V diff --git a/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch b/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch deleted file mode 100644 index ddf88f7b..00000000 --- a/debian/patches/platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Thomas Haller -Date: Tue, 12 Dec 2017 10:37:59 +0100 -Subject: platform: fix crash hashing NMPlatformTfilter and NMPlatformQdisc - -@kind might be NULL. There are 3 forms of the hash-update functions for -string: str(), str0(), and strarr(). - -- str0() is when the string might be NULL. -- str() does not allow the string to be NULL -- strarr() is like str(), except it adds a G_STATIC_ASSERT() - that the argument is a C array. - -The reason why a difference between str() and str0() exists, is -because str0() hashes NULL different from a "" or any other string. -This has an overhead, because it effectively must hash another bit -of information that tells whether a string was passed or not. - -The reason is, that hashing a tupple of two strings should always -yield a different hash value, even for "aa",""; "a","a"; "","aa", -where naive concatentation would yield identical hash values in all -three cases. - -Fixes: e75fc8279becce29e688551930d85e59e1280c89 -(cherry picked from commit 27e8fffdb833748dfeb6648b8768c4ef48822841) ---- - src/platform/nm-platform.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c -index 2ca379e..7067557 100644 ---- a/src/platform/nm-platform.c -+++ b/src/platform/nm-platform.c -@@ -5320,7 +5320,7 @@ nm_platform_qdisc_to_string (const NMPlatformQdisc *qdisc, char *buf, gsize len) - void - nm_platform_qdisc_hash_update (const NMPlatformQdisc *obj, NMHashState *h) - { -- nm_hash_update_str (h, obj->kind); -+ nm_hash_update_str0 (h, obj->kind); - nm_hash_update_vals (h, - obj->ifindex, - obj->addr_family, -@@ -5387,17 +5387,17 @@ nm_platform_tfilter_to_string (const NMPlatformTfilter *tfilter, char *buf, gsiz - void - nm_platform_tfilter_hash_update (const NMPlatformTfilter *obj, NMHashState *h) - { -- nm_hash_update_str (h, obj->kind); -+ nm_hash_update_str0 (h, obj->kind); - nm_hash_update_vals (h, - obj->ifindex, - obj->addr_family, - obj->handle, - obj->parent, - obj->info); -- nm_hash_update_str (h, obj->action.kind); - if (obj->action.kind) { -+ nm_hash_update_str (h, obj->action.kind); - if (nm_streq (obj->action.kind, NM_PLATFORM_ACTION_KIND_SIMPLE)) -- nm_hash_update_str (h, obj->action.simple.sdata); -+ nm_hash_update_strarr (h, obj->action.simple.sdata); - } - } - diff --git a/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch b/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch deleted file mode 100644 index 8e7be6ec..00000000 --- a/debian/patches/secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Lubomir Rintel -Date: Thu, 11 Jan 2018 11:11:10 +0100 -Subject: secret-agent: construct the dbus proxy for async agent with the - correct bus name - -The asynchronous secret agent initialization doesn't work at all due to a -rather silly typo. Oops. - -While at it, fix a whitespace error too. - -(cherry picked from commit 603daa5b256b8964e0eed8c78a49d445f7944734) ---- - libnm/nm-secret-agent-old.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c -index 76e4238..c9dbb4f 100644 ---- a/libnm/nm-secret-agent-old.c -+++ b/libnm/nm-secret-agent-old.c -@@ -1118,7 +1118,7 @@ init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data) - - if (priv->auto_register) { - nm_secret_agent_old_register_async (init_data->self, init_data->cancellable, -- init_async_registered, init_data); -+ init_async_registered, init_data); - } else - init_async_complete (init_data, NULL); - } -@@ -1139,7 +1139,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data) - nmdbus_agent_manager_proxy_new (priv->bus, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES - | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, -- NM_DBUS_INTERFACE_AGENT_MANAGER, -+ NM_DBUS_SERVICE, - NM_DBUS_PATH_AGENT_MANAGER, - init_data->cancellable, - init_async_got_proxy, init_data); diff --git a/debian/patches/series b/debian/patches/series index 22431a55..e44814db 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,3 @@ Fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch -libnm-core-tc-config-remove-deprecation-guards-from-typed.patch -secret-agent-construct-the-dbus-proxy-for-async-agent-wit.patch -platform-fix-crash-hashing-NMPlatformTfilter-and-NMPlatfo.patch -- cgit 1.3.0-6-gf8a5 From d0408a3e3b1cc6effec321d098008ef0c4acf91b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 7 Feb 2018 02:51:48 +0100 Subject: Release version 1.10.4-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 e7cbd554..d0182912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (1.10.4-1) UNRELEASED; urgency=medium +network-manager (1.10.4-1) unstable; urgency=medium [ Laurent Bigonville ] * Do not fail installation of network-manager-config-connectivity-* if @@ -6,8 +6,9 @@ network-manager (1.10.4-1) UNRELEASED; urgency=medium [ Michael Biebl ] * New upstream version 1.10.4 + * Rebase patches - -- Michael Biebl Wed, 07 Feb 2018 02:40:08 +0100 + -- Michael Biebl Wed, 07 Feb 2018 02:51:36 +0100 network-manager (1.10.2-4) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5