diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2017-07-19 23:52:22 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-08-30 18:12:48 +0200 |
| commit | a63eb74bce9e28b016ab337bc3f80570fba12909 (patch) | |
| tree | b4efa0c8436c0c56a8b647403053ccdd2fa5e095 /package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch | |
| parent | 343e3d2ba8efe20554522419697e0e4c3038c92f (diff) | |
| download | upstream-a63eb74bce9e28b016ab337bc3f80570fba12909.tar.gz upstream-a63eb74bce9e28b016ab337bc3f80570fba12909.tar.bz2 upstream-a63eb74bce9e28b016ab337bc3f80570fba12909.zip | |
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 <daniel@makrotopia.org>
Diffstat (limited to 'package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch')
| -rw-r--r-- | package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch | 13 |
1 files changed, 13 insertions, 0 deletions
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 |