diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 | ||||
| -rw-r--r-- | debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 5 insertions, 37 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 40c5217a..1eb08e28 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 3696c78..abd71c4 100644 +index 6d3a5dd..f804918 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -50,6 +50,8 @@ @@ -73,7 +73,7 @@ index 3696c78..abd71c4 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -6536,6 +6566,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -6550,6 +6580,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 3696c78..abd71c4 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6709,6 +6795,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6723,6 +6809,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 3696c78..abd71c4 100644 return TRUE; } -@@ -7557,6 +7646,22 @@ nm_manager_init (NMManager *self) +@@ -7571,6 +7660,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 3696c78..abd71c4 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7839,6 +7944,16 @@ dispose (GObject *object) +@@ -7853,6 +7958,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch b/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch deleted file mode 100644 index 6f5360c2..00000000 --- a/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Thomas Haller <thaller@redhat.com> -Date: Tue, 14 Jan 2020 16:20:56 +0100 -Subject: n-dhcp4: fix integer context in - n_dhcp4_client_probe_transition_nak() on 32 bit - -Fixes: 218782a9a3c3 ('n-dhcp4: restart the transaction after a NAK') - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/339 -(cherry picked from commit de818bf610ba0fed2b275a19fe3e6f9cbfa1862b) -(cherry picked from commit 4665bb9fc52c626d92f5ca383509c389706f4781) ---- - shared/n-dhcp4/src/n-dhcp4-c-probe.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -index 5bed15b..f4962d6 100644 ---- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c -+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c -@@ -1005,9 +1005,9 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) { - - probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT; - probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay; -- probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2, -- UINT64_C(1000000000 * 2), -- UINT64_C(1000000000 * 300)); -+ probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u, -+ UINT64_C(2) * UINT64_C(1000000000), -+ UINT64_C(300) * UINT64_C(1000000000)); - break; - case N_DHCP4_CLIENT_PROBE_STATE_SELECTING: - case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT: diff --git a/debian/patches/series b/debian/patches/series index 34431f90..9a20acf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch |