From bd65d9b350b4ff051ea34141c124353b35d51e0f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 17 Jan 2017 22:02:05 +0100 Subject: Rebase patches --- ...n-t-make-NetworkManager-D-Bus-activatable.patch | 30 ++++++++--------- ...-Sleep-Monitor-if-not-booted-with-systemd.patch | 4 +-- debian/patches/Fix-arping-path.patch | 38 ++++++++++++++++++++++ debian/patches/Fix-iscsiadm-path.patch | 21 +++++++----- ...Force-online-state-with-unmanaged-devices.patch | 22 ++++++------- debian/patches/fix-arping-path.patch | 38 ---------------------- debian/patches/series | 2 +- ...-t-enable-NetworkManager-wait-online.serv.patch | 26 ++++++++------- 8 files changed, 92 insertions(+), 89 deletions(-) create mode 100644 debian/patches/Fix-arping-path.patch delete mode 100644 debian/patches/fix-arping-path.patch (limited to 'debian') 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 380b33be..fbb15eae 100644 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch @@ -5,30 +5,28 @@ Subject: Don't make NetworkManager D-Bus activatable If the NetworkManager daemon has been stopped manually we don't want it to be autostarted by a client request. --- - data/Makefile.am | 7 ------- + Makefile.am | 5 ----- data/NetworkManager.service.in | 1 - - 2 files changed, 8 deletions(-) + 2 files changed, 6 deletions(-) -diff --git a/data/Makefile.am b/data/Makefile.am -index ce059fc..4ab4106 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -19,13 +19,6 @@ endif - NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in - $(edit) $< >$@ +diff --git a/Makefile.am b/Makefile.am +index 211648648..5a3eaba74 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3304,11 +3304,6 @@ endif + data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in + $(AM_V_GEN) $(data_edit) $< >$@ --servicedir = $(datadir)/dbus-1/system-services --service_in_files = org.freedesktop.NetworkManager.service.in --service_DATA = $(service_in_files:.service.in=.service) +-data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in +- $(AM_V_GEN) $(data_edit) $< >$@ - --$(service_DATA): $(service_in_files) Makefile -- $(edit) $< >$@ +-service_DATA += data/org.freedesktop.NetworkManager.service - - install-exec-local: + install-exec-local-data: install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index a9e8731..e6cd392 100644 +index a9e87310c..e6cd392ed 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -24,6 +24,5 @@ ProtectHome=read-only 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 de7bb743..09d12432 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 @@ -16,7 +16,7 @@ Closes: #742933 1 file changed, 5 insertions(+) diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index 13ce1be..561e503 100644 +index 3be542c7d..d552d5c2d 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c @@ -25,6 +25,7 @@ @@ -27,7 +27,7 @@ index 13ce1be..561e503 100644 #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -@@ -340,6 +341,10 @@ on_proxy_acquired (GObject *object, +@@ -341,6 +342,10 @@ on_proxy_acquired (GObject *object, static void nm_sleep_monitor_init (NMSleepMonitor *self) { diff --git a/debian/patches/Fix-arping-path.patch b/debian/patches/Fix-arping-path.patch new file mode 100644 index 00000000..a51faf85 --- /dev/null +++ b/debian/patches/Fix-arping-path.patch @@ -0,0 +1,38 @@ +From: Laurent Bigonville +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-arping-manager.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c +index 7b765844a..59f0faed5 100644 +--- a/src/devices/nm-arping-manager.c ++++ b/src/devices/nm-arping-manager.c +@@ -222,7 +222,7 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er + + priv->completed = 0; + +- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); ++ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); + if (!argv[0]) { + g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "arping could not be found"); +@@ -342,7 +342,7 @@ send_announcements (NMArpingManager *self, const char *mode_arg) + 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 ("arping could not be found; no ARPs will be sent"); + return; diff --git a/debian/patches/Fix-iscsiadm-path.patch b/debian/patches/Fix-iscsiadm-path.patch index 07e9bf83..b2247c78 100644 --- a/debian/patches/Fix-iscsiadm-path.patch +++ b/debian/patches/Fix-iscsiadm-path.patch @@ -4,20 +4,23 @@ Subject: Fix iscsiadm path The open-scsi package in Debian installs the iscisadm binary as /usr/bin/iscsiadm. + +This patch can be dropped post-stretch as open-iscsi now also ships the +binary as /sbin/iscsiadm (and /usr/bin/iscsiadm is a compat symlink). --- - src/settings/plugins/ibft/plugin.c | 2 +- + src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c -index 6f9b8c8..ce89599 100644 ---- a/src/settings/plugins/ibft/plugin.c -+++ b/src/settings/plugins/ibft/plugin.c -@@ -60,7 +60,7 @@ read_connections (SettingsPluginIbft *self) +diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c +index c9069dc74..9dcf7dc81 100644 +--- a/src/settings/plugins/ibft/nms-ibft-plugin.c ++++ b/src/settings/plugins/ibft/nms-ibft-plugin.c +@@ -74,7 +74,7 @@ read_connections (NMSIbftPlugin *self) GError *error = NULL; - NMIbftConnection *connection; + NMSIbftConnection *connection; -- if (!read_ibft_blocks ("/sbin/iscsiadm", &blocks, &error)) { -+ if (!read_ibft_blocks ("/usr/bin/iscsiadm", &blocks, &error)) { +- if (!nms_ibft_reader_load_blocks ("/sbin/iscsiadm", &blocks, &error)) { ++ if (!nms_ibft_reader_load_blocks ("/usr/bin/iscsiadm", &blocks, &error)) { nm_log_dbg (LOGD_SETTINGS, "ibft: failed to read iscsiadm records: %s", error->message); g_error_free (error); return; diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 2a059a63..8f95f232 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,19 +12,19 @@ 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 c3d65cd..f5b3996 100644 +index 867e0db6d..92e457a93 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c -@@ -60,6 +60,8 @@ - #include "nmdbus-manager.h" - #include "nmdbus-device.h" +@@ -59,6 +59,8 @@ + #include "introspection/org.freedesktop.NetworkManager.h" + #include "introspection/org.freedesktop.NetworkManager.Device.h" +#define IFUPDOWN_STATE_FILE "/run/network/ifstate" + static gboolean add_device (NMManager *self, NMDevice *device, GError **error); static NMActiveConnection *_new_active_connection (NMManager *self, -@@ -143,6 +145,10 @@ typedef struct { +@@ -145,6 +147,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index c3d65cd..f5b3996 100644 guint timestamp_update_id; gboolean startup; -@@ -798,6 +804,29 @@ find_best_device_state (NMManager *manager, gboolean *force_connectivity_check) +@@ -809,6 +815,29 @@ find_best_device_state (NMManager *manager, gboolean *force_connectivity_check) return best_state; } @@ -65,7 +65,7 @@ index c3d65cd..f5b3996 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -837,6 +866,9 @@ nm_manager_update_state (NMManager *manager) +@@ -848,6 +877,9 @@ nm_manager_update_state (NMManager *manager) else new_state = find_best_device_state (manager, &force_connectivity_check); @@ -75,7 +75,7 @@ index c3d65cd..f5b3996 100644 nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); if (new_state == NM_STATE_CONNECTED_SITE || force_connectivity_check) { -@@ -4587,6 +4619,65 @@ impl_manager_check_connectivity (NMManager *self, +@@ -4705,6 +4737,65 @@ impl_manager_check_connectivity (NMManager *self, } static void @@ -141,7 +141,7 @@ index c3d65cd..f5b3996 100644 start_factory (NMDeviceFactory *factory, gpointer user_data) { nm_device_factory_start (factory); -@@ -4657,6 +4748,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -4827,6 +4918,9 @@ nm_manager_start (NMManager *self, GError **error) check_if_startup_complete (self); @@ -151,7 +151,7 @@ index c3d65cd..f5b3996 100644 return TRUE; } -@@ -5625,6 +5719,22 @@ nm_manager_init (NMManager *self) +@@ -5833,6 +5927,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -174,7 +174,7 @@ index c3d65cd..f5b3996 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -5858,6 +5968,16 @@ dispose (GObject *object) +@@ -6072,6 +6182,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/fix-arping-path.patch b/debian/patches/fix-arping-path.patch deleted file mode 100644 index 643fdbe8..00000000 --- a/debian/patches/fix-arping-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Laurent Bigonville -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-arping-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c -index dfb20b4..eb8338f 100644 ---- a/src/devices/nm-arping-manager.c -+++ b/src/devices/nm-arping-manager.c -@@ -202,7 +202,7 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er - - priv->completed = 0; - -- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); -+ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); - if (!argv[0]) { - g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "arping could not be found"); -@@ -317,7 +317,7 @@ send_announcements (NMArpingManager *self, const char *mode_arg) - 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 ("arping could not be found; no ARPs will be sent"); - return; diff --git a/debian/patches/series b/debian/patches/series index a29c5335..01c14f38 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -fix-arping-path.patch +Fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch systemd-Don-t-enable-NetworkManager-wait-online.serv.patch Fix-iscsiadm-path.patch diff --git a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch index c822c2d5..419f7e34 100644 --- a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch +++ b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch @@ -10,21 +10,23 @@ WantedBy=network-online.target This way the user can easily disable the service. --- - data/Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) + Makefile.am | 6 ------ + 1 file changed, 6 deletions(-) -diff --git a/data/Makefile.am b/data/Makefile.am -index 4ab4106..bbe6b32 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -18,10 +18,6 @@ endif +diff --git a/Makefile.am b/Makefile.am +index 5a3eaba74..e54556274 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3304,12 +3304,6 @@ endif + data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in + $(AM_V_GEN) $(data_edit) $< >$@ - NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in - $(edit) $< >$@ -- --install-exec-local: +-install-exec-local-data: - install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants - ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants +- +-install_exec_local += install-exec-local-data +- endif - examplesdir = $(docdir)/examples + examples_DATA += data/server.conf -- cgit 1.3.0-6-gf8a5