diff options
| author | Michael Biebl <biebl@debian.org> | 2018-03-13 01:32:05 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-03-13 01:32:05 +0100 |
| commit | b8a78d82e97ba751e85d62baa66bd8388377ddb0 (patch) | |
| tree | 3691b4e9edfb99193e01b926c29403d6820846ef | |
| parent | 2c9b813f306b66090e672c4f8425965e273f4969 (diff) | |
Rebase patches
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 14 | ||||
| -rw-r--r-- | debian/patches/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 6ef9bf54..508afede 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 001fae5..38e8a8f 100644 +index 8391dbf..e60b6c6 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -35,7 +35,7 @@ index 001fae5..38e8a8f 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1122,6 +1128,29 @@ find_best_device_state (NMManager *manager) +@@ -1124,6 +1130,29 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -65,7 +65,7 @@ index 001fae5..38e8a8f 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -1160,6 +1189,9 @@ nm_manager_update_state (NMManager *manager) +@@ -1162,6 +1191,9 @@ nm_manager_update_state (NMManager *manager) else new_state = find_best_device_state (manager); @@ -75,7 +75,7 @@ index 001fae5..38e8a8f 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5419,6 +5451,62 @@ impl_manager_check_connectivity (NMManager *self, +@@ -5421,6 +5453,62 @@ impl_manager_check_connectivity (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -138,7 +138,7 @@ index 001fae5..38e8a8f 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -5570,6 +5658,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -5572,6 +5660,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 001fae5..38e8a8f 100644 return TRUE; } -@@ -6565,6 +6656,22 @@ nm_manager_init (NMManager *self) +@@ -6567,6 +6658,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -171,7 +171,7 @@ index 001fae5..38e8a8f 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -6847,6 +6954,16 @@ dispose (GObject *object) +@@ -6849,6 +6956,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 e742ffe6..7e520d91 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 @@ -90,7 +90,7 @@ index 2ddc7bc..a741c6e 100644 if HAVE_INTROSPECTION diff --git a/configure.ac b/configure.ac -index c1ce21e..11948ac 100644 +index 8a066ad..6f561e2 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 |