From ceace293c75337bab6fd076104c99ea19ffb58ba Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Jul 2015 20:03:52 +0200 Subject: Refresh patches. --- debian/changelog | 1 + ...-network.target-on-NetworkManager-wait-on.patch | 2 +- ...n-t-make-NetworkManager-D-Bus-activatable.patch | 2 +- ...-Sleep-Monitor-if-not-booted-with-systemd.patch | 10 +++--- ...Force-online-state-with-unmanaged-devices.patch | 36 +++++++++++----------- ...-virtual-ethernet-interfaces-as-unmanaged.patch | 8 ++--- debian/patches/Use-symlinks-for-nmtui.patch | 4 +-- ...x-falling-back-in-the-resolv.conf-methods.patch | 30 ------------------ debian/patches/fix-arping-path.patch | 4 +-- debian/patches/series | 1 - 10 files changed, 34 insertions(+), 64 deletions(-) delete mode 100644 debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch diff --git a/debian/changelog b/debian/changelog index ef0fdb222..b3c83042b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (1.0.4-1) UNRELEASED; urgency=medium * New upstream release. + * Refresh patches. -- Michael Biebl Tue, 14 Jul 2015 19:40:02 +0200 diff --git a/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch b/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch index 1ddb666db..4a1591ce5 100644 --- a/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch +++ b/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch @@ -19,7 +19,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=746039 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am -index a7c8070..60443bf 100644 +index 3f628be..ddaafee 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,10 +18,6 @@ endif 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 ce0283677..4379a993c 100644 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch @@ -10,7 +10,7 @@ to be autostarted by a client request. 2 files changed, 8 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am -index e91361a..a7c8070 100644 +index 64ff337..3f628be 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -19,13 +19,6 @@ endif 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 5da036721..7840dc741 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 68dff7a..f6c79ea 100644 +index 381b621..13cf1b3 100644 --- a/configure.ac +++ b/configure.ac -@@ -373,8 +373,9 @@ fi +@@ -384,8 +384,9 @@ fi case $with_suspend_resume in upower) ;; systemd) @@ -33,10 +33,10 @@ index 68dff7a..f6c79ea 100644 *) AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) diff --git a/src/Makefile.am b/src/Makefile.am -index a24ac6c..6339cb7 100644 +index 7339058..7614cad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -412,6 +412,7 @@ AM_CPPFLAGS += \ +@@ -421,6 +421,7 @@ AM_CPPFLAGS += \ $(LIBNDP_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ @@ -44,7 +44,7 @@ index a24ac6c..6339cb7 100644 $(SYSTEMD_DHCP_CFLAGS) \ \ -DBINDIR=\"$(bindir)\" \ -@@ -450,6 +451,7 @@ libNetworkManager_la_LIBADD = \ +@@ -459,6 +460,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 27f668b12..10cea87a5 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, 122 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 0fa88d1..0a39dfb 100644 +index 080cdb8..03a866e 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -64,6 +64,8 @@ +@@ -62,6 +62,8 @@ #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd" #define NM_AUTOIP_DBUS_IFACE "org.freedesktop.nm_avahi_autoipd" @@ -24,7 +24,7 @@ index 0fa88d1..0a39dfb 100644 static gboolean impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err); -@@ -198,6 +200,11 @@ typedef struct { +@@ -191,6 +193,11 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -36,7 +36,7 @@ index 0fa88d1..0a39dfb 100644 guint timestamp_update_id; gboolean startup; -@@ -621,6 +628,29 @@ find_best_device_state (NMManager *manager) +@@ -657,6 +664,29 @@ find_best_device_state (NMManager *manager) return best_state; } @@ -66,7 +66,7 @@ index 0fa88d1..0a39dfb 100644 static void nm_manager_update_state (NMManager *manager) { -@@ -638,6 +668,9 @@ nm_manager_update_state (NMManager *manager) +@@ -674,6 +704,9 @@ nm_manager_update_state (NMManager *manager) nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); @@ -76,11 +76,10 @@ index 0fa88d1..0a39dfb 100644 if (new_state == NM_STATE_CONNECTED_SITE) { nm_connectivity_check_async (priv->connectivity, checked_connectivity, -@@ -4172,6 +4205,65 @@ impl_manager_check_connectivity (NMManager *manager, - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); +@@ -4123,6 +4156,65 @@ impl_manager_check_connectivity (NMManager *manager, } -+static void + static void +check_ifstate_file (gpointer user_data) +{ + NMManager *self = NM_MANAGER (user_data); @@ -94,7 +93,7 @@ index 0fa88d1..0a39dfb 100644 + nm_log_warn (LOGD_CORE, "Error: failed to open %s", IFUPDOWN_STATE_FILE); + return; + } -+ ++ + while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) + != G_IO_STATUS_EOF && !online) { + g_strstrip (line); @@ -103,7 +102,7 @@ index 0fa88d1..0a39dfb 100644 + } + g_free (line); + } -+ ++ + g_io_channel_shutdown (channel, FALSE, NULL); + g_io_channel_unref (channel); + @@ -139,10 +138,11 @@ index 0fa88d1..0a39dfb 100644 + } +} + - void - nm_manager_start (NMManager *self) ++static void + start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -4220,6 +4312,9 @@ nm_manager_start (NMManager *self) + nm_device_factory_start (factory); +@@ -4174,6 +4266,9 @@ nm_manager_start (NMManager *self) system_create_virtual_devices (self); check_if_startup_complete (self); @@ -152,7 +152,7 @@ index 0fa88d1..0a39dfb 100644 } void -@@ -4916,6 +5011,22 @@ nm_manager_init (NMManager *manager) +@@ -4877,6 +4972,22 @@ nm_manager_init (NMManager *manager) KERNEL_FIRMWARE_DIR); } @@ -175,7 +175,7 @@ index 0fa88d1..0a39dfb 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager); } -@@ -5113,6 +5224,17 @@ dispose (GObject *object) +@@ -5086,6 +5197,17 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } @@ -190,6 +190,6 @@ index 0fa88d1..0a39dfb 100644 + g_object_unref (priv->ifstate_monitor); + } + - for (iter = priv->factories; iter; iter = iter->next) { - NMDeviceFactory *factory = iter->data; - + nm_device_factory_manager_for_each_factory (_deinit_device_factory, manager); + + if (priv->timestamp_update_id) { diff --git a/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch b/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch index fbfd7eff3..96cab841d 100644 --- a/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch +++ b/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch @@ -9,11 +9,11 @@ any virtual ethernet interfaces and mark them as unmanaged. 1 file changed, 41 insertions(+) diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c -index ac408d3..116d4d3 100644 +index af2cb8f..2980df3 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c -@@ -250,6 +250,45 @@ out: - g_object_unref (client); +@@ -239,6 +239,45 @@ out: + g_object_unref (dev); } +static void @@ -58,7 +58,7 @@ index ac408d3..116d4d3 100644 static GObject* constructor (GType type, guint n_construct_params, -@@ -272,6 +311,8 @@ constructor (GType type, +@@ -261,6 +300,8 @@ constructor (GType type, /* s390 stuff */ _update_s390_subchannels (NM_DEVICE_ETHERNET (object)); diff --git a/debian/patches/Use-symlinks-for-nmtui.patch b/debian/patches/Use-symlinks-for-nmtui.patch index aacb4700a..f05667b71 100644 --- a/debian/patches/Use-symlinks-for-nmtui.patch +++ b/debian/patches/Use-symlinks-for-nmtui.patch @@ -22,10 +22,10 @@ index ad9335d..09f2700 100644 uninstall-hook: diff --git a/configure.ac b/configure.ac -index f6c79ea..ffcca3d 100644 +index 13cf1b3..dc68ccd 100644 --- a/configure.ac +++ b/configure.ac -@@ -45,6 +45,8 @@ AM_PROG_CC_C_O +@@ -33,6 +33,8 @@ AM_PROG_CC_C_O # C++ only required if --enable-qt=yes AC_PROG_CXX diff --git a/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch b/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch deleted file mode 100644 index b354c1892..000000000 --- a/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 6 May 2015 20:49:57 +0200 -Subject: dns: Fix falling back in the resolv.conf methods - ---- - src/dns-manager/nm-dns-manager.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 2f8ceab..eade2a0 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -782,13 +782,16 @@ update_dns (NMDnsManager *self, - - #ifdef NETCONFIG_PATH - if (success == FALSE) { -+ g_clear_error (error); - success = dispatch_netconfig (searches, nameservers, - nis_domain, nis_servers, error); - } - #endif - -- if (success == FALSE) -+ if (success == FALSE) { -+ g_clear_error (error); - success = update_resolv_conf (searches, nameservers, error); -+ } - - /* signal that resolv.conf was changed */ - if (success) diff --git a/debian/patches/fix-arping-path.patch b/debian/patches/fix-arping-path.patch index d23762f3c..4addfb404 100644 --- a/debian/patches/fix-arping-path.patch +++ b/debian/patches/fix-arping-path.patch @@ -15,10 +15,10 @@ Closes: #755039 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 4752628..25b17b3 100644 +index c5d4c20..d77640c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -5137,7 +5137,7 @@ send_arps (NMDevice *self, const char *mode_arg) +@@ -5562,7 +5562,7 @@ send_arps (NMDevice *self, const char *mode_arg) if (num == 0) return; diff --git a/debian/patches/series b/debian/patches/series index dd5e2c73e..1a072f1d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,3 @@ build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Don-t-block-network.target-on-NetworkManager-wait-on.patch Fix-iscsiadm-path.patch -dns-Fix-falling-back-in-the-resolv.conf-methods.patch -- cgit v1.2.3