diff options
Diffstat (limited to 'debian')
19 files changed, 84 insertions, 686 deletions
diff --git a/debian/changelog b/debian/changelog index 71ab741a..2cff2f05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (1.0.0-1) UNRELEASED; urgency=medium * New upstream release. + * Rebase patches. -- Michael Biebl <biebl@debian.org> Thu, 22 Jan 2015 00:30:26 +0100 diff --git a/debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch b/debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch index fd9cf261..546d20e1 100644 --- a/debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch +++ b/debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch @@ -20,7 +20,7 @@ for network.target. 1 file changed, 2 deletions(-) diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 84a9c95..2fb510f 100644 +index b2e61ff..1883b40 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -1,7 +1,5 @@ diff --git a/debian/patches/0002-Force-online-state-with-unmanaged-devices.patch b/debian/patches/0002-Force-online-state-with-unmanaged-devices.patch index 461944b7..23fdaf9c 100644 --- a/debian/patches/0002-Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/0002-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, 121 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 09a1985..9aff2a4 100644 +index 7e81afa..1fac0d7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -74,6 +74,8 @@ +@@ -64,6 +64,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 09a1985..9aff2a4 100644 static gboolean impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err); -@@ -209,6 +211,11 @@ typedef struct { +@@ -198,6 +200,11 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -36,7 +36,7 @@ index 09a1985..9aff2a4 100644 guint timestamp_update_id; gboolean startup; -@@ -648,6 +655,29 @@ find_best_device_state (NMManager *manager, gboolean *want_connectivity_check) +@@ -625,6 +632,29 @@ find_best_device_state (NMManager *manager, gboolean *want_connectivity_check) return best_state; } @@ -66,7 +66,7 @@ index 09a1985..9aff2a4 100644 static void nm_manager_update_state (NMManager *manager) { -@@ -663,6 +693,8 @@ nm_manager_update_state (NMManager *manager) +@@ -640,6 +670,8 @@ nm_manager_update_state (NMManager *manager) new_state = NM_STATE_ASLEEP; else new_state = find_best_device_state (manager, &want_connectivity_check); @@ -75,7 +75,7 @@ index 09a1985..9aff2a4 100644 if (new_state == NM_STATE_CONNECTING && want_connectivity_check) { nm_connectivity_check_async (priv->connectivity, -@@ -4071,6 +4103,65 @@ impl_manager_check_connectivity (NMManager *manager, +@@ -4131,6 +4163,65 @@ impl_manager_check_connectivity (NMManager *manager, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -141,7 +141,7 @@ index 09a1985..9aff2a4 100644 void nm_manager_start (NMManager *self) { -@@ -4114,6 +4205,9 @@ nm_manager_start (NMManager *self) +@@ -4179,6 +4270,9 @@ nm_manager_start (NMManager *self) system_create_virtual_devices (self); check_if_startup_complete (self); @@ -150,8 +150,8 @@ index 09a1985..9aff2a4 100644 + check_ifstate_file (self); } - static gboolean -@@ -4793,6 +4887,22 @@ nm_manager_init (NMManager *manager) + void +@@ -4873,6 +4967,22 @@ nm_manager_init (NMManager *manager) KERNEL_FIRMWARE_DIR); } @@ -174,7 +174,7 @@ index 09a1985..9aff2a4 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager); } -@@ -4984,6 +5094,17 @@ dispose (GObject *object) +@@ -5069,6 +5179,17 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch index fd566af0..f8bc42f6 100644 --- a/debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ b/debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch @@ -18,44 +18,45 @@ Closes: #742933 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 94b0758..a77d55a 100644 +index b6bf38e..c21cb9d 100644 --- a/configure.ac +++ b/configure.ac -@@ -351,7 +351,8 @@ fi +@@ -373,8 +373,9 @@ fi case $with_suspend_resume in upower) ;; systemd) -- PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183]) + # Link against libsystemd-daemon for sd_booted() -+ PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183 libsystemd-daemon]) + 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_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) diff --git a/src/Makefile.am b/src/Makefile.am -index 2929e18..85f761b 100644 +index 808e59e..84ece6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -322,6 +322,7 @@ AM_CPPFLAGS += \ +@@ -411,6 +411,7 @@ AM_CPPFLAGS += \ + $(LIBNDP_CFLAGS) \ $(LIBSOUP_CFLAGS) \ - $(POLKIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ + $(SYSTEMD_INHIBIT_CFLAGS) \ + $(SYSTEMD_DHCP_CFLAGS) \ \ -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ -@@ -364,6 +365,7 @@ libNetworkManager_la_LIBADD = \ +@@ -449,6 +450,7 @@ libNetworkManager_la_LIBADD = \ + $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ - $(POLKIT_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ + $(SYSTEMD_INHIBIT_LIBS) \ + $(LIBNDP_LIBS) \ $(LIBDL) \ $(LIBM) - diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c -index 55134c4..9bbcd4c 100644 +index c0bc65e..0c97335 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c -@@ -26,6 +26,7 @@ +@@ -25,6 +25,7 @@ #include <glib/gi18n.h> #include <gio/gio.h> #include <gio/gunixfdlist.h> @@ -63,7 +64,7 @@ index 55134c4..9bbcd4c 100644 #include "nm-logging.h" #include "nm-dbus-manager.h" -@@ -164,6 +165,10 @@ sleep_setup (NMSleepMonitor *self) +@@ -193,6 +194,10 @@ on_proxy_acquired (GObject *object, static void nm_sleep_monitor_init (NMSleepMonitor *self) { @@ -72,5 +73,5 @@ index 55134c4..9bbcd4c 100644 + return; + } self->inhibit_fd = -1; - sleep_setup (self); - take_inhibitor (self); + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | diff --git a/debian/patches/0004-Use-symlinks-for-nmtui.patch b/debian/patches/0004-Use-symlinks-for-nmtui.patch index bdb55fdb..f9d58275 100644 --- a/debian/patches/0004-Use-symlinks-for-nmtui.patch +++ b/debian/patches/0004-Use-symlinks-for-nmtui.patch @@ -4,15 +4,28 @@ Subject: Use symlinks for nmtui Make /usr/bin/nmtui-* symbolic links to /usr/bin/nmtui. --- - configure.ac | 2 ++ - tui/Makefile.am | 2 +- + clients/tui/Makefile.am | 2 +- + configure.ac | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) +diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am +index ad9335d..09f2700 100644 +--- a/clients/tui/Makefile.am ++++ b/clients/tui/Makefile.am +@@ -24,7 +24,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname + + install-exec-hook: + for link in $(links); do \ +- ln -f $(DESTDIR)$(bindir)/nmtui $(DESTDIR)$(bindir)/$$link; \ ++ cd $(DESTDIR)$(bindir) && $(LN_S) -f nmtui $$link; \ + done + + uninstall-hook: diff --git a/configure.ac b/configure.ac -index a77d55a..3c216a2 100644 +index c21cb9d..ae2ec6d 100644 --- a/configure.ac +++ b/configure.ac -@@ -46,6 +46,8 @@ AM_PROG_CC_C_O +@@ -45,6 +45,8 @@ AM_PROG_CC_C_O # C++ only required if --enable-qt=yes AC_PROG_CXX @@ -21,16 +34,3 @@ index a77d55a..3c216a2 100644 dnl Initialize libtool LT_PREREQ([2.2]) LT_INIT([disable-static]) -diff --git a/tui/Makefile.am b/tui/Makefile.am -index 755b689..7f4e7d6 100644 ---- a/tui/Makefile.am -+++ b/tui/Makefile.am -@@ -24,7 +24,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname - - install-exec-hook: - for link in $(links); do \ -- ln -f $(DESTDIR)$(bindir)/nmtui $(DESTDIR)$(bindir)/$$link; \ -+ cd $(DESTDIR)$(bindir) && $(LN_S) -f nmtui $$link; \ - done - - uninstall-hook: diff --git a/debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch b/debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch index 8cc4c813..fbfd7eff 100644 --- a/debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch +++ b/debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch @@ -9,10 +9,10 @@ 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 f4a90c7..bed6b33 100644 +index ac408d3..116d4d3 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c -@@ -265,6 +265,45 @@ out: +@@ -250,6 +250,45 @@ out: g_object_unref (client); } @@ -58,12 +58,12 @@ index f4a90c7..bed6b33 100644 static GObject* constructor (GType type, guint n_construct_params, -@@ -290,6 +329,8 @@ constructor (GType type, +@@ -272,6 +311,8 @@ constructor (GType type, /* s390 stuff */ - _update_s390_subchannels (NM_DEVICE_ETHERNET (self)); + _update_s390_subchannels (NM_DEVICE_ETHERNET (object)); + -+ nm_device_check_virtual (NM_DEVICE_ETHERNET (self)); ++ nm_device_check_virtual (NM_DEVICE_ETHERNET (object)); } return object; diff --git a/debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch b/debian/patches/0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch index 32f9c2d8..9385e97f 100644 --- a/debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch +++ b/debian/patches/0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch @@ -9,10 +9,10 @@ a different path. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c -index 137fd20..439a36d 100644 +index 533290c..b5452bf 100644 --- a/src/dns-manager/nm-dns-unbound.c +++ b/src/dns-manager/nm-dns-unbound.c -@@ -40,7 +40,7 @@ update (NMDnsPlugin *plugin, +@@ -42,7 +42,7 @@ update (NMDnsPlugin *plugin, * without calling custom scripts. The dnssec-trigger functionality * may be eventually merged into NetworkManager. */ diff --git a/debian/patches/0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch b/debian/patches/0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch deleted file mode 100644 index 4833327a..00000000 --- a/debian/patches/0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch +++ /dev/null @@ -1,125 +0,0 @@ -From: Dan Winship <danw@gnome.org> -Date: Thu, 10 Jul 2014 15:33:06 -0400 -Subject: tui: fix Wi-Fi section of "nmtui connect" list in non-UTF-8 locales - -In locales where the Wi-Fi signal-strength characters couldn't be -represented (eg, LANG=C), the entire Wi-Fi SSID + signal strength -string would fail to convert, causing the Wi-Fi section of the -connection list to show up as a series of blank lines. - -Fix this by testing beforehand whether the characters can convert, and -falling back to plain ASCII if not. (And also, fix the similar code in -nmt-newt-section.c, which got broken when nmt_newt_locale_from_utf8() -was changed to never return NULL.) - -Also, for paranoia, represent the signal-strength strings via \nnn -escapes rather than actual UTF-8 data, to guarantee that they get -compiled to the expected values even if the source files get -re-encoded. - -https://bugzilla.gnome.org/show_bug.cgi?id=733007 - -(cherry picked from commit dd2e751b071edda8dc2ee7d60a53fda329f95dde) ---- - tui/newt/nmt-newt-section.c | 10 +++++----- - tui/nmt-connect-connection-list.c | 37 +++++++++++++++++++++++++++++-------- - 2 files changed, 34 insertions(+), 13 deletions(-) - -diff --git a/tui/newt/nmt-newt-section.c b/tui/newt/nmt-newt-section.c -index 094b41b..40c996d 100644 ---- a/tui/newt/nmt-newt-section.c -+++ b/tui/newt/nmt-newt-section.c -@@ -394,11 +394,11 @@ nmt_newt_section_class_init (NmtNewtSectionClass *section_class) - open_glyph = nmt_newt_locale_from_utf8 ("\342\225\244"); /* ╤ */ - line_glyph = nmt_newt_locale_from_utf8 ("\342\224\202"); /* │ */ - end_glyph = nmt_newt_locale_from_utf8 ("\342\224\224"); /* └ */ -- if (!closed_glyph || !open_glyph || !line_glyph || !end_glyph) { -- g_clear_pointer (&closed_glyph, g_free); -- g_clear_pointer (&open_glyph, g_free); -- g_clear_pointer (&line_glyph, g_free); -- g_clear_pointer (&end_glyph, g_free); -+ if (!*closed_glyph || !*open_glyph || !*line_glyph || !*end_glyph) { -+ g_free (closed_glyph); -+ g_free (open_glyph); -+ g_free (line_glyph); -+ g_free (end_glyph); - - closed_glyph = g_strdup ("-"); - open_glyph = g_strdup ("+"); -diff --git a/tui/nmt-connect-connection-list.c b/tui/nmt-connect-connection-list.c -index 54923ea..fffdc8e 100644 ---- a/tui/nmt-connect-connection-list.c -+++ b/tui/nmt-connect-connection-list.c -@@ -63,6 +63,8 @@ typedef struct { - GSList *nmt_devices; - } NmtConnectConnectionListPrivate; - -+static const char *strength_full, *strength_high, *strength_med, *strength_low, *strength_none; -+ - /** - * nmt_connect_connection_list_new: - * -@@ -524,23 +526,24 @@ nmt_connect_connection_list_rebuild (NmtConnectConnectionList *list) - guint8 strength = nm_access_point_get_strength (nmtconn->ap); - - if (strength > 80) -- strength_col = " ▂▄▆█"; -+ strength_col = strength_full; - else if (strength > 55) -- strength_col = " ▂▄▆_"; -+ strength_col = strength_high; - else if (strength > 30) -- strength_col = " ▂▄__"; -+ strength_col = strength_med; - else if (strength > 5) -- strength_col = " ▂___"; -+ strength_col = strength_low; - else -- strength_col = " ____"; -+ strength_col = strength_none; - } else -- strength_col = ""; -+ strength_col = NULL; - -- row = g_strdup_printf ("%c %s%-*s%s", -+ row = g_strdup_printf ("%c %s%-*s%s%s", - active_col, - nmtconn->name, - (int)(max_width - nmt_newt_text_width (nmtconn->name)), "", -- strength_col); -+ strength_col ? " " : "", -+ strength_col ? strength_col : ""); - - nmt_newt_listbox_append (listbox, row, nmtconn); - g_free (row); -@@ -603,12 +606,30 @@ static void - nmt_connect_connection_list_class_init (NmtConnectConnectionListClass *list_class) - { - GObjectClass *object_class = G_OBJECT_CLASS (list_class); -+ char *tmp; - - g_type_class_add_private (list_class, sizeof (NmtConnectConnectionListPrivate)); - - /* virtual methods */ - object_class->constructed = nmt_connect_connection_list_constructed; - object_class->finalize = nmt_connect_connection_list_finalize; -+ -+ /* globals */ -+ tmp = nmt_newt_locale_from_utf8 ("\342\226\202\342\226\204\342\226\206\342\226\210"); -+ if (*tmp) { -+ strength_full = /* ▂▄▆█ */ "\342\226\202\342\226\204\342\226\206\342\226\210"; -+ strength_high = /* ▂▄▆_ */ "\342\226\202\342\226\204\342\226\206_"; -+ strength_med = /* ▂▄__ */ "\342\226\202\342\226\204__"; -+ strength_low = /* ▂___ */ "\342\226\202___"; -+ strength_none = /* ____ */ "____"; -+ } else { -+ strength_full = "****"; -+ strength_high = "*** "; -+ strength_med = "** "; -+ strength_low = "* "; -+ strength_none = " "; -+ } -+ g_free (tmp); - } - - /** diff --git a/debian/patches/0007-core-fix-checks-for-default-routes-by-comparing-the-.patch b/debian/patches/0007-core-fix-checks-for-default-routes-by-comparing-the-.patch deleted file mode 100644 index de532cb6..00000000 --- a/debian/patches/0007-core-fix-checks-for-default-routes-by-comparing-the-.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Thomas Haller <thaller@redhat.com> -Date: Tue, 29 Jul 2014 19:10:08 +0200 -Subject: core: fix checks for default routes by comparing the prefix length - -At some places, we considered a default route to be a route with -destination network 0.0.0.0 (::). This is wrong because a default route -is a route with plen==0. - -This is for example relevant for OpenVPN which adds two routes -0.0.0.0/1 and 128.0.0.0/1 to hijack the default route. We should -not treat 0.0.0.0/1 as default route, instead NM should treat -it as any other subnet route (even if it effectively routes large -parts). - -Signed-off-by: Thomas Haller <thaller@redhat.com> - -(cherry picked from commit 06703c1670d0f96834b268920b09792e22fdb4c4) ---- - src/nm-ip4-config.c | 5 +++-- - src/nm-ip6-config.c | 5 +++-- - src/platform/nm-linux-platform.c | 4 ++-- - src/platform/nm-platform.h | 3 +++ - 4 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c -index e27c043..3956132 100644 ---- a/src/nm-ip4-config.c -+++ b/src/nm-ip4-config.c -@@ -198,7 +198,7 @@ nm_ip4_config_capture (int ifindex, gboolean capture_resolv_conf) - for (i = 0; i < priv->routes->len; i++) { - const NMPlatformIP4Route *route = &g_array_index (priv->routes, NMPlatformIP4Route, i); - -- if (route->network == 0) { -+ if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT (route)) { - if (route->metric < lowest_metric) { - priv->gateway = route->gateway; - lowest_metric = route->metric; -@@ -276,7 +276,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex) - /* Don't add the default route if the connection - * is never supposed to be the default connection. - */ -- if (nm_ip4_config_get_never_default (config) && route.network == 0) -+ if ( nm_ip4_config_get_never_default (config) -+ && NM_PLATFORM_IP_ROUTE_IS_DEFAULT (&route)) - continue; - - g_array_append_val (routes, route); -diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c -index aaf5e70..362b8c1 100644 ---- a/src/nm-ip6-config.c -+++ b/src/nm-ip6-config.c -@@ -308,7 +308,7 @@ nm_ip6_config_capture (int ifindex, gboolean capture_resolv_conf, NMSettingIP6Co - for (i = 0; i < priv->routes->len; i++) { - const NMPlatformIP6Route *route = &g_array_index (priv->routes, NMPlatformIP6Route, i); - -- if (IN6_IS_ADDR_UNSPECIFIED (&route->network)) { -+ if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT (route)) { - if (route->metric < lowest_metric) { - priv->gateway = route->gateway; - lowest_metric = route->metric; -@@ -387,7 +387,8 @@ nm_ip6_config_commit (const NMIP6Config *config, int ifindex) - /* Don't add the default route if the connection - * is never supposed to be the default connection. - */ -- if (nm_ip6_config_get_never_default (config) && IN6_IS_ADDR_UNSPECIFIED (&route.network)) -+ if ( nm_ip6_config_get_never_default (config) -+ && NM_PLATFORM_IP_ROUTE_IS_DEFAULT (&route)) - continue; - - g_array_append_val (routes, route); -diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index f73ff32..e3ec1c5 100644 ---- a/src/platform/nm-linux-platform.c -+++ b/src/platform/nm-linux-platform.c -@@ -3520,7 +3520,7 @@ ip4_route_get_all (NMPlatform *platform, int ifindex, gboolean include_default) - for (object = nl_cache_get_first (priv->route_cache); object; object = nl_cache_get_next (object)) { - if (_route_match ((struct rtnl_route *) object, AF_INET, ifindex)) { - if (init_ip4_route (&route, (struct rtnl_route *) object)) { -- if (route.plen != 0 || include_default) -+ if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT (&route) || include_default) - g_array_append_val (routes, route); - } - } -@@ -3542,7 +3542,7 @@ ip6_route_get_all (NMPlatform *platform, int ifindex, gboolean include_default) - for (object = nl_cache_get_first (priv->route_cache); object; object = nl_cache_get_next (object)) { - if (_route_match ((struct rtnl_route *) object, AF_INET6, ifindex)) { - if (init_ip6_route (&route, (struct rtnl_route *) object)) { -- if (route.plen != 0 || include_default) -+ if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT (&route) || include_default) - g_array_append_val (routes, route); - } - } -diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h -index 96b6cfa..348d1fa 100644 ---- a/src/platform/nm-platform.h -+++ b/src/platform/nm-platform.h -@@ -248,6 +248,9 @@ typedef struct { - }; - } NMPlatformIPRoute; - -+#define NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route) \ -+ ( ((const NMPlatformIPRoute *) (route))->plen <= 0 ) -+ - typedef struct { - __NMPlatformIPRoute_COMMON; - in_addr_t network; diff --git a/debian/patches/0007-fix-arping-path.patch b/debian/patches/0007-fix-arping-path.patch new file mode 100644 index 00000000..6e7afd4c --- /dev/null +++ b/debian/patches/0007-fix-arping-path.patch @@ -0,0 +1,29 @@ +From: Laurent Bigonville <bigon@bigon.be> +Date: Mon, 27 Oct 2014 11:08:02 +0100 +Subject: fix arping path + +Debian provides two arping implementations: +/usr/sbin/arping, shipped by the arping package, +/usr/bin/arping, shipped by the iputils-arping package. + +They aren't completely command line compatible, so we choose the one +which upstream (Fedora) is using, i.e. iputils-arping. + +Closes: #755039 +--- + src/devices/nm-device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index a989953..abe99d4 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -5095,7 +5095,7 @@ send_arps (NMDevice *self, const char *mode_arg) + if (num == 0) + return; + +- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); ++ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); + if (!argv[0]) { + _LOGW (LOGD_DEVICE | LOGD_IP4, "arping could not be found; no ARPs will be sent"); + return; diff --git a/debian/patches/0009-Support-building-against-libsystemd-library.patch b/debian/patches/0009-Support-building-against-libsystemd-library.patch deleted file mode 100644 index 5160fc17..00000000 --- a/debian/patches/0009-Support-building-against-libsystemd-library.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Tue, 30 Sep 2014 05:38:25 +0200 -Subject: Support building against libsystemd library - -In systemd v209, the various libraries were merged into a single -libsystemd library [1]. -Add support for building against this new library and fall back to the -old library names if not found. - -[1] http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html ---- - configure.ac | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3c216a2..b6eb201 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -329,7 +329,9 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$" - AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit") - AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "$with_session_tracking" = "systemd") - if test "$with_session_tracking" = "systemd"; then -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login]) -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd],, -+ [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])]) -+ - AC_SUBST(SYSTEMD_LOGIN_CFLAGS) - AC_SUBST(SYSTEMD_LOGIN_LIBS) - fi -@@ -340,7 +342,8 @@ AC_MSG_RESULT($with_session_tracking) - - AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd], [Build NetworkManager with specific suspend/resume support])) - if test "z$with_suspend_resume" = "z"; then -- PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no]) -+ PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes], -+ [PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no])]) - if test "z${have_systemd_inhibit}" = "zyes"; then - # Use systemd if it's new enough - with_suspend_resume="systemd" -@@ -354,7 +357,8 @@ case $with_suspend_resume in - upower) ;; - systemd) - # Link against libsystemd-daemon for sd_booted() -- PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183 libsystemd-daemon]) -+ PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],, -+ [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183 libsystemd-daemon])]) - ;; - *) - AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) diff --git a/debian/patches/0010-tui-fix-requesting-and-displaying-secrets.patch b/debian/patches/0010-tui-fix-requesting-and-displaying-secrets.patch deleted file mode 100644 index 151b80d0..00000000 --- a/debian/patches/0010-tui-fix-requesting-and-displaying-secrets.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Dan Williams <dcbw@redhat.com> -Date: Wed, 3 Sep 2014 17:12:32 -0500 -Subject: tui: fix requesting and displaying secrets - -nmt_sync_op_complete_pointer() completes the operation after the -caller of this function returns. This means that any values passed -to this function must either be allocated from its caller, or -referenced by the caller. - -nm_remote_connection_get_secrets() owns the 'secrets' hash passed -to the callback, and it is destroyed when the callback returns. -So nmtui's got_secrets() must copy the hash to ensure the data -sticks around for nmt_sync_op_wait_pointer() later. - -(cherry picked from commit 240a9a92ae28ee3e794567d3bf00f1d7b365fa0d) ---- - tui/nmt-editor.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/tui/nmt-editor.c b/tui/nmt-editor.c -index b204a5c..f03e9b1 100644 ---- a/tui/nmt-editor.c -+++ b/tui/nmt-editor.c -@@ -171,7 +171,19 @@ got_secrets (NMRemoteConnection *connection, - GError *error, - gpointer op) - { -- nmt_sync_op_complete_pointer (op, secrets, error); -+ GHashTable *copy = NULL, *setting; -+ GHashTableIter iter; -+ const char *name; -+ -+ if (secrets) { -+ /* 'secrets' is owned by the caller so we must copy it */ -+ copy = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_hash_table_destroy); -+ g_hash_table_iter_init (&iter, secrets); -+ while (g_hash_table_iter_next (&iter, (gpointer) &name, (gpointer) &setting)) -+ g_hash_table_insert (copy, g_strdup (name), nm_utils_gvalue_hash_dup (setting)); -+ } -+ -+ nmt_sync_op_complete_pointer (op, copy, error); - } - - static NMConnection * -@@ -196,8 +208,10 @@ build_edit_connection (NMConnection *orig_connection) - setting_name, got_secrets, &op); - /* FIXME: error handling */ - secrets = nmt_sync_op_wait_pointer (&op, NULL); -- if (secrets) -+ if (secrets) { - (void) nm_connection_update_secrets (edit_connection, setting_name, secrets, NULL); -+ g_hash_table_unref (secrets); -+ } - } - g_hash_table_unref (settings); - diff --git a/debian/patches/0011-tui-fix-updating-of-NmtPasswordFields-passwords-bgo-.patch b/debian/patches/0011-tui-fix-updating-of-NmtPasswordFields-passwords-bgo-.patch deleted file mode 100644 index 867454a2..00000000 --- a/debian/patches/0011-tui-fix-updating-of-NmtPasswordFields-passwords-bgo-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Dan Williams <dcbw@redhat.com> -Date: Wed, 3 Sep 2014 17:43:25 -0500 -Subject: tui: fix updating of NmtPasswordFields passwords (bgo #733002) - -The actual entry is a sub-widget, and was getting updated when the -user changed the password, but those changes were not being -propagated to the NmtPasswordFields object's 'password' property. - -https://bugzilla.gnome.org/show_bug.cgi?id=733002 - -(cherry picked from commit 82b0ea87075144650979d344f34c09c7111c4a4e) ---- - tui/nmt-password-fields.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tui/nmt-password-fields.c b/tui/nmt-password-fields.c -index ec8b521..be75b74 100644 ---- a/tui/nmt-password-fields.c -+++ b/tui/nmt-password-fields.c -@@ -156,6 +156,10 @@ nmt_password_fields_constructed (GObject *object) - } else - g_clear_object (&priv->show_password); - -+ g_object_bind_property (priv->entry, "text", -+ object, "password", -+ G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); -+ - G_OBJECT_CLASS (nmt_password_fields_parent_class)->constructed (object); - } - diff --git a/debian/patches/0012-fix-arping-path.patch b/debian/patches/0012-fix-arping-path.patch deleted file mode 100644 index 6d5f1960..00000000 --- a/debian/patches/0012-fix-arping-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Laurent Bigonville <bigon@bigon.be> -Date: Mon, Oct 27 11:08:02 2014 +0100 -Subject: fix arping path - -Debian provides two arping implementations: -/usr/sbin/arping, shipped by the arping package, -/usr/bin/arping, shipped by the iputils-arping package. - -They aren't completely command line compatible, so we choose the one -which upstream (Fedora) is using, i.e. iputils-arping. - -Closes: #755039 ---- a/src/devices/nm-device.c -+++ b/src/devices/nm-device.c -@@ -4429,7 +4429,7 @@ start_sharing (NMDevice *self, NMIP4Conf - static void - send_arps (NMDevice *self, const char *mode_arg) - { -- const char *argv[] = { "/sbin/arping", mode_arg, "-q", "-I", nm_device_get_ip_iface (self), "-c", "1", NULL, NULL }; -+ const char *argv[] = { "/usr/bin/arping", mode_arg, "-q", "-I", nm_device_get_ip_iface (self), "-c", "1", NULL, NULL }; - int ip_arg = G_N_ELEMENTS (argv) - 2; - NMConnection *connection; - NMSettingIP4Config *s_ip4; diff --git a/debian/patches/0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch b/debian/patches/0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch deleted file mode 100644 index edf5f58e..00000000 --- a/debian/patches/0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 151058b870970b2c0488e37047c86c0e599731d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com> -Date: Tue, 9 Sep 2014 13:32:46 +0200 -Subject: [PATCH 1/2] dhcp: fix dhclient abnormal exit due to SIGPIPE (bgo - #735962) - -DHCP client may be killed by SIGPIPE when attempting to write to a broken pipe. -This can be observed, for example, when journald is restarted. - -Fix that by redirecting both stdout and stderr to /dev/null. The client logs -into syslog anyway. When NetworkManager is run with '--debug' we duplicate -syslog to stderr, so the messages goes to terminal as well. - -Testcase: -- start a NetworkManager service by systemd -- activate an DHCP ethernet connection -- sudo systemctl restart systemd-journald.service -- reactive the ethernet connection (nmcli con up <my-eth>) -- DHCP client is killed by SIGPIPE right after its startup: - <info> (enp0s25): DHCPv4 client pid 13959 exited with status -1 - <warn> DHCP client died abnormally - -Another possible fix would be ignoring SIGPIPE in the DHCP client as it is not -useful in most cases. E.g. systemd ignores SIGPIPE for its services, by -default: -http://cgit.freedesktop.org/systemd/systemd/commit/?id=353e12c2f4a9e96a47eb80b80d2ffb7bc1d44a1b - -https://bugzilla.gnome.org/show_bug.cgi?id=735962 - -Conflicts: - src/dhcp-manager/nm-dhcp-dhclient.c - src/dhcp-manager/nm-dhcp-dhcpcd.c ---- - src/dhcp-manager/nm-dhcp-dhclient.c | 8 +++++++- - src/dhcp-manager/nm-dhcp-dhcpcd.c | 3 ++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index 4232ee0..595a0ac 100644 ---- a/src/dhcp-manager/nm-dhcp-dhclient.c -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c -@@ -413,6 +413,11 @@ dhclient_start (NMDHCPClient *client, - - g_ptr_array_add (argv, (gpointer) "-d"); - -+ /* Be quiet. dhclient logs to syslog anyway. And we duplicate the syslog -+ * to stderr in case of NM running with --debug. -+ */ -+ g_ptr_array_add (argv, (gpointer) "-q"); -+ - if (release) - g_ptr_array_add (argv, (gpointer) "-r"); - -@@ -456,7 +461,8 @@ dhclient_start (NMDHCPClient *client, - nm_log_dbg (log_domain, "running: %s", cmd_str); - g_free (cmd_str); - -- if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD, -+ if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, -+ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, - &dhclient_child_setup, NULL, &pid, &error)) { - nm_log_warn (log_domain, "dhclient failed to start: '%s'", error->message); - g_error_free (error); -diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c -index c0877a6..b295ae9 100644 ---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c -+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c -@@ -155,7 +155,8 @@ ip4_start (NMDHCPClient *client, - nm_log_dbg (LOGD_DHCP4, "running: %s", cmd_str); - g_free (cmd_str); - -- if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD, -+ if (!g_spawn_async (NULL, (char **) argv->pdata, NULL, -+ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, - &dhcpcd_child_setup, NULL, &pid, &error)) { - nm_log_warn (LOGD_DHCP4, "dhcpcd failed to start. error: '%s'", error->message); - g_error_free (error); --- -2.1.3 - diff --git a/debian/patches/0014-log-DHCLIENT-exit-status-better.patch b/debian/patches/0014-log-DHCLIENT-exit-status-better.patch deleted file mode 100644 index cfb47f30..00000000 --- a/debian/patches/0014-log-DHCLIENT-exit-status-better.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 1571e19f81f3ac1ce646d77ffb2fa730dd8b35d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com> -Date: Wed, 3 Sep 2014 12:45:58 +0200 -Subject: [PATCH 2/2] dhcp: log DHCP client exit status better - -Conflicts: - src/dhcp-manager/nm-dhcp-client.c ---- - src/dhcp-manager/nm-dhcp-client.c | 35 ++++++++++++++++++++++------------- - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c -index 0a541a0..759bd49 100644 ---- a/src/dhcp-manager/nm-dhcp-client.c -+++ b/src/dhcp-manager/nm-dhcp-client.c -@@ -255,21 +255,30 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data) - NMDHCPClient *self = NM_DHCP_CLIENT (user_data); - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); - NMDHCPState new_state; -+ guint64 log_domain; -+ guint ip_ver; -+ -+ log_domain = priv->ipv6 ? LOGD_DHCP6 : LOGD_DHCP4; -+ ip_ver = priv->ipv6 ? 6 : 4; -+ -+ if (WIFEXITED (status)) -+ nm_log_info (log_domain, "(%s): DHCPv%d client pid %d exited with status %d", -+ priv->iface, ip_ver, pid, WEXITSTATUS (status)); -+ else if (WIFSIGNALED (status)) -+ nm_log_info (log_domain, "(%s): DHCPv%d client pid %d killed by signal %d", -+ priv->iface, ip_ver, pid, WTERMSIG (status)); -+ else if (WIFSTOPPED(status)) -+ nm_log_info (log_domain, "(%s): DHCPv%d client pid %d stopped by signal %d", -+ priv->iface, ip_ver, pid, WSTOPSIG (status)); -+ else if (WIFCONTINUED (status)) -+ nm_log_info (log_domain, "(%s): DHCPv%d client pid %d resumed (by SIGCONT)", -+ priv->iface, ip_ver, pid); -+ else -+ nm_log_warn (LOGD_DHCP, "DHCP client died abnormally"); - -- if (priv->ipv6) { -- nm_log_info (LOGD_DHCP6, "(%s): DHCPv6 client pid %d exited with status %d", -- priv->iface, pid, -- WIFEXITED (status) ? WEXITSTATUS (status) : -1); -- } else { -- nm_log_info (LOGD_DHCP4, "(%s): DHCPv4 client pid %d exited with status %d", -- priv->iface, pid, -- WIFEXITED (status) ? WEXITSTATUS (status) : -1); -- } -- -- if (!WIFEXITED (status)) { -+ if (!WIFEXITED (status)) - new_state = DHC_ABEND; -- nm_log_warn (LOGD_DHCP, "DHCP client died abnormally"); -- } else -+ else - new_state = DHC_END; - - watch_cleanup (self); --- -2.1.3 - diff --git a/debian/patches/0015-core-don-t-override-external-route-metrics.patch b/debian/patches/0015-core-don-t-override-external-route-metrics.patch deleted file mode 100644 index 612083c7..00000000 --- a/debian/patches/0015-core-don-t-override-external-route-metrics.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 404f23a93198d0b5e81b87d6d55a479838e934cf Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Mon, 13 Oct 2014 16:27:20 -0500 -Subject: [PATCH 1/2] core: don't override external route metrics (bgo #738268) - -A generated connection contains a copy of the device's existing -configuration, so it's entirely redundant to merge the connection -back into the device's IP config. But even though that should -result in no changes to the IP config, NMSettingIPxConfig treats a -route metric of '0' as the device priority, while NMIPxConfig -allows 0 as a valid route metric. Since the setting values -are preferred (they are supposed to be user-supplied and thus -override anythign else, but in this case they are generated and -thus not user-supplied) external routes with a metric of 0 are -overwritten with the device priority metric. - -https://bugzilla.gnome.org/show_bug.cgi?id=738268 -(cherry picked from commit 8283672451d0b07655a8423af0e17fd26c07a0d1) ---- - src/devices/nm-device.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 4788a60..05f0e7b 100644 ---- a/src/devices/nm-device.c -+++ b/src/devices/nm-device.c -@@ -2635,9 +2635,13 @@ ip4_config_merge_and_apply (NMDevice *self, - if (priv->ext_ip4_config) - nm_ip4_config_merge (composite, priv->ext_ip4_config); - -- /* Merge user overrides into the composite config */ -+ /* Merge user overrides into the composite config. Generated+assumed -+ * connections come from the system not the user and merging them would -+ * be redundant, so don't bother. -+ */ - connection = nm_device_get_connection (self); -- if (connection) { -+ if ( connection -+ && !nm_settings_connection_get_nm_generated (NM_SETTINGS_CONNECTION (connection))) { - nm_ip4_config_merge_setting (composite, - nm_connection_get_setting_ip4_config (connection), - nm_device_get_priority (self)); -@@ -3080,9 +3084,13 @@ ip6_config_merge_and_apply (NMDevice *self, - if (priv->ext_ip6_config) - nm_ip6_config_merge (composite, priv->ext_ip6_config); - -- /* Merge user overrides into the composite config */ -+ /* Merge user overrides into the composite config. Generated+assumed -+ * connections come from the system not the user and merging them would -+ * be redundant, so don't bother. -+ */ - connection = nm_device_get_connection (self); -- if (connection) { -+ if ( connection -+ && !nm_settings_connection_get_nm_generated (NM_SETTINGS_CONNECTION (connection))) { - nm_ip6_config_merge_setting (composite, - nm_connection_get_setting_ip6_config (connection), - nm_device_get_priority (self)); --- -2.1.4 - diff --git a/debian/patches/0016-core-tell-systemd-to-restart-NetworkManager.service-.patch b/debian/patches/0016-core-tell-systemd-to-restart-NetworkManager.service-.patch deleted file mode 100644 index 50c0528c..00000000 --- a/debian/patches/0016-core-tell-systemd-to-restart-NetworkManager.service-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a2040e059c32021ad9c26e116364197e70721a87 Mon Sep 17 00:00:00 2001 -From: Mikko Rapeli <mikko.rapeli@iki.fi> -Date: Mon, 15 Dec 2014 16:47:45 +0100 -Subject: [PATCH 2/2] core: tell systemd to restart NetworkManager.service if - it exited with failure (bgo #741587) - -Crashed NetworkManager.service was not restarted by systemd. - -Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> - -https://bugzilla.gnome.org/show_bug.cgi?id=741587 - -(cherry picked from commit fe95185f6f9f0e3bd3a71024b8b916bca2dc397f) ---- - data/NetworkManager.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 84a9c95..b2e61ff 100644 ---- a/data/NetworkManager.service.in -+++ b/data/NetworkManager.service.in -@@ -7,6 +7,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ - Type=dbus - BusName=org.freedesktop.NetworkManager - ExecStart=@sbindir@/NetworkManager --no-daemon -+Restart=on-failure - # NM doesn't want systemd to kill its children for it - KillMode=process - --- -2.1.4 - diff --git a/debian/patches/series b/debian/patches/series index 12363620..3cd40cf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,14 +3,5 @@ 0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch 0004-Use-symlinks-for-nmtui.patch 0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch -0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch -0007-core-fix-checks-for-default-routes-by-comparing-the-.patch -0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch -0009-Support-building-against-libsystemd-library.patch -0010-tui-fix-requesting-and-displaying-secrets.patch -0011-tui-fix-updating-of-NmtPasswordFields-passwords-bgo-.patch -0012-fix-arping-path.patch -0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch -0014-log-DHCLIENT-exit-status-better.patch -0015-core-don-t-override-external-route-metrics.patch -0016-core-tell-systemd-to-restart-NetworkManager.service-.patch +0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch +0007-fix-arping-path.patch |