about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorLaurent Bigonville <bigon@bigon.be>2014-10-27 11:08:02 +0100
committerLaurent Bigonville <bigon@bigon.be>2014-10-27 11:08:02 +0100
commit90ee86c0de2dd99a7c70ae9370550f62051e08b4 (patch)
treedcadefcbcfdef94627a2bad7c0400e47ef7fb98f /debian
parentbc71a81ca8cb07abc06fb912cc2bc826ca063da4 (diff)
Fix arping patch and add iputils-arping to the Recommends (Closes:#755039)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/control3
-rw-r--r--debian/patches/0012-fix-arping-path.patch11
-rw-r--r--debian/patches/series1
4 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 36bd0a1b..c8cdefc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (0.9.10.0-4) UNRELEASED; urgency=medium
+
+  * Fix arping patch and add iputils-arping to the Recommends (Closes:#755039)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 27 Oct 2014 11:06:47 +0100
+
 network-manager (0.9.10.0-3) unstable; urgency=medium
 
   [ Arto Jantunen ]
diff --git a/debian/control b/debian/control
index 7f11a1f2..d190565e 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,8 @@ Recommends: ppp (>= 2.4.6),
             dnsmasq-base,
             iptables,
             modemmanager,
-            crda
+            crda,
+            iputils-arping
 Suggests: avahi-autoipd,
           libteam-utils
 Breaks: network-manager-gnome (<< 0.9),
diff --git a/debian/patches/0012-fix-arping-path.patch b/debian/patches/0012-fix-arping-path.patch
new file mode 100644
index 00000000..28a5ddda
--- /dev/null
+++ b/debian/patches/0012-fix-arping-path.patch
@@ -0,0 +1,11 @@
+--- 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/series b/debian/patches/series
index 9a3586f7..ffb76316 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 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