diff options
7 files changed, 18 insertions, 62 deletions
diff --git a/debian/changelog b/debian/changelog index 6a6d5040..14d6e99e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (1.1.92-1) UNRELEASED; urgency=medium * New upstream release (1.2 beta3). + * Rebase patches. -- Michael Biebl <biebl@debian.org> Wed, 30 Mar 2016 13:15:48 +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 index 5e6a8ead..125eb67f 100644 --- a/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch +++ b/debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch @@ -13,7 +13,7 @@ Closes: #770871 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 79082c4..937f731 100644 +index e26321b..9e9bc13 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -25,6 +25,7 @@ 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 12915334..e76bff20 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 @@ -18,10 +18,10 @@ Closes: #742933 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0f270ce..46da9b8 100644 +index 578b077..e2301d8 100644 --- a/configure.ac +++ b/configure.ac -@@ -467,8 +467,9 @@ fi +@@ -470,8 +470,9 @@ fi case $with_suspend_resume in upower) ;; systemd) @@ -33,10 +33,10 @@ index 0f270ce..46da9b8 100644 ;; consolekit) diff --git a/src/Makefile.am b/src/Makefile.am -index eea646a..603811b 100644 +index aee7eae..cc23c8b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -475,6 +475,7 @@ AM_CPPFLAGS += \ +@@ -483,6 +483,7 @@ AM_CPPFLAGS += \ $(SELINUX_CFLAGS) \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ @@ -44,7 +44,7 @@ index eea646a..603811b 100644 $(SYSTEMD_JOURNAL_CFLAGS) \ $(SYSTEMD_NM_CFLAGS_PATHS) \ \ -@@ -508,6 +509,7 @@ libNetworkManager_la_LIBADD = \ +@@ -516,6 +517,7 @@ libNetworkManager_la_LIBADD = \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 1a072d18..5c578d9a 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, 120 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 7f414e8..8ce6c0b 100644 +index dc394a4..fea7c0d 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -57,6 +57,8 @@ @@ -35,7 +35,7 @@ index 7f414e8..8ce6c0b 100644 guint timestamp_update_id; gboolean startup; -@@ -683,6 +689,29 @@ find_best_device_state (NMManager *manager) +@@ -691,6 +697,29 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -63,9 +63,9 @@ index 7f414e8..8ce6c0b 100644 +} + static void - nm_manager_update_metered (NMManager *manager) + nm_manager_update_metered (NMManager *self) { -@@ -724,6 +753,9 @@ nm_manager_update_state (NMManager *manager) +@@ -731,6 +760,9 @@ nm_manager_update_state (NMManager *manager) nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); @@ -75,7 +75,7 @@ index 7f414e8..8ce6c0b 100644 if (new_state == NM_STATE_CONNECTED_SITE) { nm_connectivity_check_async (priv->connectivity, checked_connectivity, -@@ -4336,6 +4368,65 @@ impl_manager_check_connectivity (NMManager *self, +@@ -4403,6 +4435,65 @@ impl_manager_check_connectivity (NMManager *self, } static void @@ -141,7 +141,7 @@ index 7f414e8..8ce6c0b 100644 start_factory (NMDeviceFactory *factory, gpointer user_data) { nm_device_factory_start (factory); -@@ -4406,6 +4497,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -4473,6 +4564,9 @@ nm_manager_start (NMManager *self, GError **error) check_if_startup_complete (self); @@ -151,8 +151,8 @@ index 7f414e8..8ce6c0b 100644 return TRUE; } -@@ -5207,6 +5301,22 @@ nm_manager_init (NMManager *manager) - KERNEL_FIRMWARE_DIR); +@@ -5273,6 +5367,22 @@ nm_manager_init (NMManager *self) + KERNEL_FIRMWARE_DIR); } + /* Monitor the ifupdown state file */ @@ -163,7 +163,7 @@ index 7f414e8..8ce6c0b 100644 + if (priv->ifstate_monitor) { + g_signal_connect (priv->ifstate_monitor, "changed", + G_CALLBACK (ifstate_file_changed), -+ manager); ++ self); + nm_log_info (LOGD_CORE, "monitoring ifupdown state file '%s'.", + IFUPDOWN_STATE_FILE); + } else { @@ -172,9 +172,9 @@ index 7f414e8..8ce6c0b 100644 + } + /* Update timestamps in active connections */ - priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager); + priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -5449,6 +5559,16 @@ dispose (GObject *object) +@@ -5515,6 +5625,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/series b/debian/patches/series index b1724483..445a1b3d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,3 @@ Check-at-runtime-whether-to-start-ModemManager.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Don-t-block-network.target-on-NetworkManager-wait-on.patch Fix-iscsiadm-path.patch -tests-fix-bashism-in-run-test-dbus-session.sh.patch -wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch diff --git a/debian/patches/tests-fix-bashism-in-run-test-dbus-session.sh.patch b/debian/patches/tests-fix-bashism-in-run-test-dbus-session.sh.patch deleted file mode 100644 index c18251f1..00000000 --- a/debian/patches/tests-fix-bashism-in-run-test-dbus-session.sh.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Tue, 1 Mar 2016 19:43:44 +0100 -Subject: tests: fix bashism in run-test-dbus-session.sh - -https://bugzilla.gnome.org/show_bug.cgi?id=762940 ---- - tools/run-test-dbus-session.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/run-test-dbus-session.sh b/tools/run-test-dbus-session.sh -index 0235d65..c6a94fa 100755 ---- a/tools/run-test-dbus-session.sh -+++ b/tools/run-test-dbus-session.sh -@@ -1,6 +1,6 @@ - #!/bin/sh - --if ! which dbus-run-session &>/dev/null; then -+if ! which dbus-run-session >/dev/null 2>&1; then - eval `dbus-launch --sh-syntax` - trap "kill $DBUS_SESSION_BUS_PID" EXIT - "$@" diff --git a/debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch b/debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch deleted file mode 100644 index c54a64a1..00000000 --- a/debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Francesco Giudici <fgiudici@redhat.com> -Date: Fri, 11 Mar 2016 09:55:39 +0100 -Subject: wifi: hack for wext devices reporting IW_MODE_AUTO configuration - mode. - -https://bugzilla.gnome.org/show_bug.cgi?id=763388 ---- - src/platform/wifi/wifi-utils-wext.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c -index 029601e..bb015c1 100644 ---- a/src/platform/wifi/wifi-utils-wext.c -+++ b/src/platform/wifi/wifi-utils-wext.c -@@ -118,6 +118,7 @@ wifi_wext_get_mode (WifiData *data) - case IW_MODE_MASTER: - return NM_802_11_MODE_AP; - case IW_MODE_INFRA: -+ case IW_MODE_AUTO: /* hack for WEXT devices reporting IW_MODE_AUTO */ - return NM_802_11_MODE_INFRA; - default: - break; |