From a63eb74bce9e28b016ab337bc3f80570fba12909 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 19 Jul 2017 23:52:22 +0200 Subject: busybox: move traceroute applets to /bin busybox currently installs traceroute and traceroute6 into /usr/bin which prevents their 'full' iputils variants from being installed. Move those applets to /bin so they can coexist with their iputils siblings using the same PATH convention already applied for coreutils and other drop-in 'full' versions. Refresh existing patch while at it. Signed-off-by: Daniel Golle --- .../patches/500-move-traceroute-applets-to-bin.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch (limited to 'package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch') diff --git a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch new file mode 100644 index 0000000000..7fa06a68c7 --- /dev/null +++ b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch @@ -0,0 +1,13 @@ +--- a/networking/traceroute.c ++++ b/networking/traceroute.c +@@ -239,8 +239,8 @@ + //config: Add option -I to use ICMP ECHO instead of UDP datagrams. + + /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ +-//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE)) +-//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE)) ++//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_BIN, BB_SUID_MAYBE)) ++//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_BIN, BB_SUID_MAYBE)) + + //kbuild:lib-$(CONFIG_TRACEROUTE) += traceroute.o + //kbuild:lib-$(CONFIG_TRACEROUTE6) += traceroute.o -- cgit v1.2.3