From 4aee3c350c7821f214ec6b7454b971316eb17a6e Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 30 Jan 2017 01:19:49 +0100
Subject: [PATCH] Remove traceroute from busybox and inetutils

We will provide traceroute as a symlink to tracepath so that it
works for non-root users.
---
 packages/busybox/build.sh       |  2 +-
 packages/busybox/busybox.config |  4 ++--
 packages/inetutils/build.sh     | 22 +++++++++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 1546e00aa..166154922 100755
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://busybox.net/
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.26.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config
index 3179a56f1..cb3bd0fcd 100644
--- a/packages/busybox/busybox.config
+++ b/packages/busybox/busybox.config
@@ -856,9 +856,9 @@ CONFIG_FEATURE_TFTP_PUT=y
 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
 CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
 # CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE=n
 # CONFIG_TRACEROUTE6 is not set
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
 # CONFIG_TUNCTL is not set
diff --git a/packages/inetutils/build.sh b/packages/inetutils/build.sh
index 7636bb5c5..c76f6faf2 100644
--- a/packages/inetutils/build.sh
+++ b/packages/inetutils/build.sh
@@ -1,11 +1,27 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/inetutils/
 TERMUX_PKG_DESCRIPTION="Collection of common network programs"
 TERMUX_PKG_VERSION=1.9.4
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37
 TERMUX_PKG_DEPENDS="readline, libutil"
-# These are old cruft / not suited for android:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ifconfig --disable-rcp --disable-rlogin --disable-rsh --disable-rexecd --disable-uucpd --disable-rexec --disable-ping --disable-ping6 --disable-hostname"
+# These are old cruft / not suited for android
+# (we --disable-traceroute as it requires root
+# in favour of tracepath, which sets up traceroute
+# as a symlink to tracepath):
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-hostname
+--disable-ifconfig
+--disable-ping
+--disable-ping6
+--disable-rcp
+--disable-rexec
+--disable-rexecd
+--disable-rlogin
+--disable-rsh
+--disable-traceroute
+--disable-uucpd
+"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_crypt_crypt=no"
 
 termux_step_pre_configure() {