diff options
5 files changed, 7 insertions, 85 deletions
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 b2912d8d..51d0a0b2 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 cdb5cfc..2c6db0f 100644 +index b1a2e69..b168008 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3889,11 +3889,6 @@ endif +@@ -3894,11 +3894,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 bfdb652d..094c39be 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 0fea13d..150d7de 100644 +index 289dcf8..1b657fe 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -73,7 +73,7 @@ index 0fea13d..150d7de 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5886,6 +5916,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -5872,6 +5902,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 0fea13d..150d7de 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6036,6 +6122,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6022,6 +6108,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 0fea13d..150d7de 100644 return TRUE; } -@@ -6899,6 +6988,22 @@ nm_manager_init (NMManager *self) +@@ -6885,6 +6974,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 0fea13d..150d7de 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7174,6 +7279,16 @@ dispose (GObject *object) +@@ -7160,6 +7265,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/Increase-timeout-in-test-nm-client-to-30s.patch b/debian/patches/Increase-timeout-in-test-nm-client-to-30s.patch deleted file mode 100644 index 5c6d99f4..00000000 --- a/debian/patches/Increase-timeout-in-test-nm-client-to-30s.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Thu, 5 Jul 2018 03:53:35 +0200 -Subject: Increase timeout in test-nm-client to 30s - -On slow architectures it can take longer then 3s for the test service to -start up. ---- - shared/nm-test-utils-impl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c -index 3add88c..9e7312c 100644 ---- a/shared/nm-test-utils-impl.c -+++ b/shared/nm-test-utils-impl.c -@@ -164,7 +164,7 @@ nmtstc_service_init (void) - g_source_set_callback (child_source, (GSourceFunc)(void (*) (void)) _service_init_wait_child_wait, &data, NULL); - g_source_attach (child_source, context); - -- had_timeout = !nmtst_main_loop_run (data.mainloop, 3000); -+ had_timeout = !nmtst_main_loop_run (data.mainloop, 30000); - - g_source_destroy (timeout_source); - g_source_destroy (child_source); diff --git a/debian/patches/manager-accept-non-null-device-for-VPN-activations.patch b/debian/patches/manager-accept-non-null-device-for-VPN-activations.patch deleted file mode 100644 index 4a60db6c..00000000 --- a/debian/patches/manager-accept-non-null-device-for-VPN-activations.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Fri, 6 Jul 2018 15:54:16 +0200 -Subject: manager: accept non-null device for VPN activations - -Commit 10753c36168a ("manager: merge VPN handling into -_new_active_connection()") added a check to fail the activation of -VPNs when a device is passed to ActivateConnection(), since the device -argument is ignored for VPNs. - -This broke activating VPNs from nm-applet as nm-applet sets both the -specific_object (parent-connection) and device arguments in the -activation request. - -Note that we already check in _new_active_connection() that when a -device is supplied, it matches the device of the parent -connection. Therefore, the check can be dropped. - -Reported-by: Michael Biebl <biebl@debian.org> -Fixes: 10753c36168a82cd658df8a7da800960fddd78ed - -https://github.com/NetworkManager/NetworkManager/pull/159 -(cherry picked from commit e205664ba8c25939f1678d1b078a67989c180046) ---- - src/nm-manager.c | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 150d7de..1b657fe 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4641,21 +4641,7 @@ validate_activation_request (NMManager *self, - } - } - -- if (is_vpn && device) { -- /* VPN's are treated specially. Maybe the should accept a device as well, -- * however, later on during activation, we don't handle the device. -- * -- * Maybe we should, and maybe it makes sense to specify a device -- * when activating a VPN. But for now, just error out. */ -- g_set_error_literal (error, -- NM_MANAGER_ERROR, -- NM_MANAGER_ERROR_UNKNOWN_DEVICE, -- "Cannot specify device when activating VPN"); -- return NULL; -- } -- -- nm_assert ( ( is_vpn && !device) -- || (!is_vpn && NM_IS_DEVICE (device))); -+ nm_assert (is_vpn || NM_IS_DEVICE (device)); - - *out_device = device; - *out_is_vpn = is_vpn; diff --git a/debian/patches/series b/debian/patches/series index 503d30bf..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 -Increase-timeout-in-test-nm-client-to-30s.patch -manager-accept-non-null-device-for-VPN-activations.patch |