diff options
Diffstat (limited to 'debian')
7 files changed, 11 insertions, 180 deletions
diff --git a/debian/changelog b/debian/changelog index 0524f507..cb7016b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (1.4.0-1) UNRELEASED; urgency=medium * New upstream release. + * Rebase patches. -- Michael Biebl <biebl@debian.org> Fri, 26 Aug 2016 02:19:45 +0200 diff --git a/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch b/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch deleted file mode 100644 index 125eb67f..00000000 --- a/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Didier Raboud <odyx@debian.org> -Date: Mon, 2 Feb 2015 16:06:32 +0100 -Subject: Check at runtime whether to start ModemManager - -This makes NetworkManager use runtime detection to manage the -ModemManager lifecycle when not run by systemd. Under systemd, we expect -the ModemManager service to be started by systemd, under non-systemd, we -use the dbus activation feature to start ModemManager. - -Closes: #770871 ---- - src/devices/wwan/nm-modem-manager.c | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c -index e26321b..9e9bc13 100644 ---- a/src/devices/wwan/nm-modem-manager.c -+++ b/src/devices/wwan/nm-modem-manager.c -@@ -25,6 +25,7 @@ - #include <string.h> - - #include <libmm-glib.h> -+#include <systemd/sd-daemon.h> - - #include "nm-modem-manager.h" - #include "nm-dbus-compat.h" -@@ -199,10 +200,9 @@ modem_manager_name_owner_changed (MMManager *modem_manager, - if (!name_owner) { - nm_log_info (LOGD_MB, "ModemManager disappeared from bus"); - --#if !HAVE_SYSTEMD - /* If not managed by systemd, schedule relaunch */ -- schedule_modem_manager_relaunch (self, 0); --#endif -+ if (!sd_booted()) -+ schedule_modem_manager_relaunch (self, 0); - - return; - } -@@ -223,8 +223,6 @@ modem_manager_name_owner_changed (MMManager *modem_manager, - */ - } - --#if !HAVE_SYSTEMD -- - static void - modem_manager_poke_cb (GDBusConnection *connection, - GAsyncResult *res, -@@ -273,8 +271,6 @@ modem_manager_poke (NMModemManager *self) - g_object_ref (self)); /* user_data */ - } - --#endif /* HAVE_SYSTEMD */ -- - static void - modem_manager_check_name_owner (NMModemManager *self) - { -@@ -288,10 +284,9 @@ modem_manager_check_name_owner (NMModemManager *self) - return; - } - --#if !HAVE_SYSTEMD - /* If the lifecycle is not managed by systemd, poke */ -- modem_manager_poke (self); --#endif -+ if (!sd_booted()) -+ modem_manager_poke (self); - } - - static void 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 f190e327..de7bb743 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 @@ -12,46 +12,9 @@ systemd. Closes: #742933 --- - configure.ac | 3 ++- - src/Makefile.am | 2 ++ src/nm-sleep-monitor.c | 5 +++++ - 3 files changed, 9 insertions(+), 1 deletion(-) + 1 file changed, 5 insertions(+) -diff --git a/configure.ac b/configure.ac -index 4c56e14..a47f09e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -474,8 +474,9 @@ fi - case $with_suspend_resume in - upower) ;; - systemd) -+ # Link against libsystemd-daemon for sd_booted() - PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],, -- [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])]) -+ [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183 libsystemd-daemon])]) - AC_DEFINE([SUSPEND_RESUME_SYSTEMD], 1, [Define to 1 to use systemd suspend api]) - ;; - consolekit) -diff --git a/src/Makefile.am b/src/Makefile.am -index 48af5a0..b4fc16d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -474,6 +474,7 @@ AM_CPPFLAGS += \ - $(SELINUX_CFLAGS) \ - $(LIBAUDIT_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ -+ $(SYSTEMD_INHIBIT_CFLAGS) \ - $(SYSTEMD_JOURNAL_CFLAGS) \ - $(SYSTEMD_NM_CFLAGS_PATHS) \ - \ -@@ -507,6 +508,7 @@ libNetworkManager_la_LIBADD = \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ -+ $(SYSTEMD_INHIBIT_LIBS) \ - $(SYSTEMD_JOURNAL_LIBS) \ - $(LIBNDP_LIBS) \ - $(LIBDL) \ diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c index 13ce1be..561e503 100644 --- a/src/nm-sleep-monitor.c diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 66cce389..628ccd77 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,10 +12,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 120 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 8277f6b..9ab54b3 100644 +index 5794bb9..d70d5ad 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -58,6 +58,8 @@ +@@ -60,6 +60,8 @@ #include "nmdbus-manager.h" #include "nmdbus-device.h" @@ -24,7 +24,7 @@ index 8277f6b..9ab54b3 100644 static gboolean add_device (NMManager *self, NMDevice *device, GError **error); static NMActiveConnection *_new_active_connection (NMManager *self, -@@ -139,6 +141,10 @@ typedef struct { +@@ -143,6 +145,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 8277f6b..9ab54b3 100644 guint timestamp_update_id; gboolean startup; -@@ -787,6 +793,29 @@ find_best_device_state (NMManager *manager) +@@ -810,6 +816,29 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -65,7 +65,7 @@ index 8277f6b..9ab54b3 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -827,6 +856,9 @@ nm_manager_update_state (NMManager *manager) +@@ -850,6 +879,9 @@ nm_manager_update_state (NMManager *manager) nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); @@ -75,7 +75,7 @@ index 8277f6b..9ab54b3 100644 if (new_state == NM_STATE_CONNECTED_SITE) { nm_connectivity_check_async (priv->connectivity, checked_connectivity, -@@ -4632,6 +4664,65 @@ impl_manager_check_connectivity (NMManager *self, +@@ -4587,6 +4619,65 @@ impl_manager_check_connectivity (NMManager *self, } static void @@ -141,7 +141,7 @@ index 8277f6b..9ab54b3 100644 start_factory (NMDeviceFactory *factory, gpointer user_data) { nm_device_factory_start (factory); -@@ -4702,6 +4793,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -4657,6 +4748,9 @@ nm_manager_start (NMManager *self, GError **error) check_if_startup_complete (self); @@ -151,7 +151,7 @@ index 8277f6b..9ab54b3 100644 return TRUE; } -@@ -5503,6 +5597,22 @@ nm_manager_init (NMManager *self) +@@ -5625,6 +5719,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -174,7 +174,7 @@ index 8277f6b..9ab54b3 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -5748,6 +5858,16 @@ dispose (GObject *object) +@@ -5859,6 +5969,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/series b/debian/patches/series index 4cc519bd..140a0339 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,6 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch fix-arping-path.patch -Check-at-runtime-whether-to-start-ModemManager.patch Don-t-make-NetworkManager-D-Bus-activatable.patch systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch Fix-iscsiadm-path.patch -wifi-clear-WiFi-requested_scan-if-suppl-exits.patch -wifi-clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch diff --git a/debian/patches/wifi-clear-WiFi-requested_scan-if-suppl-exits.patch b/debian/patches/wifi-clear-WiFi-requested_scan-if-suppl-exits.patch deleted file mode 100644 index 974c24fd..00000000 --- a/debian/patches/wifi-clear-WiFi-requested_scan-if-suppl-exits.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Tony Espy <espy@canonical.com> -Date: Thu, 16 Jun 2016 15:07:33 -0400 -Subject: wifi: clear WiFi requested_scan if suppl exits - -It's possible for wpa_supplicant to exit with an -outstanding requested_scan pending. This can lead -to a stall condition where scanning no longer occurs. - -https://mail.gnome.org/archives/networkmanager-list/2016-June/msg00117.html ---- - src/devices/wifi/nm-device-wifi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c -index 82b12a1..cce2f26 100644 ---- a/src/devices/wifi/nm-device-wifi.c -+++ b/src/devices/wifi/nm-device-wifi.c -@@ -246,6 +246,11 @@ supplicant_interface_release (NMDeviceWifi *self) - - priv = NM_DEVICE_WIFI_GET_PRIVATE (self); - -+ if (priv->requested_scan) { -+ priv->requested_scan = FALSE; -+ nm_device_remove_pending_action (NM_DEVICE (self), "scan", TRUE); -+ } -+ - nm_clear_g_source (&priv->pending_scan_id); - - /* Reset the scan interval to be pretty frequent when disconnected */ diff --git a/debian/patches/wifi-clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch b/debian/patches/wifi-clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch deleted file mode 100644 index 2882f85f..00000000 --- a/debian/patches/wifi-clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Tony Espy <espy@canonical.com> -Date: Thu, 16 Jun 2016 15:07:32 -0400 -Subject: wifi: clear WiFi requested_scan if suppl goes INACTIVE - -It's possible for wpa_supplicant to transition to INACTIVE -state with an outstanding requested_scan pending. This can -lead to a stall condition where scanning no longer occurs. - -[thaller@redhat.com: added break statement to avoid fall-through] - -https://mail.gnome.org/archives/networkmanager-list/2016-June/msg00116.html ---- - src/devices/wifi/nm-device-wifi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c -index cce2f26..17f5b14 100644 ---- a/src/devices/wifi/nm-device-wifi.c -+++ b/src/devices/wifi/nm-device-wifi.c -@@ -1956,6 +1956,11 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface, - else - _LOGI (LOGD_DEVICE | LOGD_WIFI, "supplicant interface keeps failing, giving up"); - break; -+ case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE: -+ priv->requested_scan = FALSE; -+ nm_clear_g_source (&priv->pending_scan_id); -+ request_wireless_scan (self, NULL); -+ break; - default: - break; - } |