Move ping6 from inetutils to instead use system

The ping6 binary needs setuid, so use the working system version
instead of installing a broken version for non-root users.

Closes https://github.com/termux/termux-app/issues/74

diff --git a/packages/inetutils/build.sh b/packages/inetutils/build.sh
index 3933c335c4057ed1ef55748dbf709d21df90ede4..e69c8d609ff748e439ed1ac261d273f4b4b1a281 100644 (file)
--- a/packages/inetutils/build.sh
+++ b/packages/inetutils/build.sh
@@ -1,11 +1,11 @@
 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_HOMEPAGE=http://www.gnu.org/software/inetutils/
 TERMUX_PKG_DESCRIPTION="Collection of common network programs"
 TERMUX_PKG_VERSION=1.9.4

-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2

 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="readline, libutil"
 # These are old cruft / not suited for android:
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
 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-hostname"
+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"

 
 CPPFLAGS+=" -DLOGIN_PROCESS=6 -DDEAD_PROCESS=8 -DLOG_NFACILITIES=24"
 LDFLAGS+=" -llog" # for syslog
 
 CPPFLAGS+=" -DLOGIN_PROCESS=6 -DDEAD_PROCESS=8 -DLOG_NFACILITIES=24"
 LDFLAGS+=" -llog" # for syslog

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 7bee5ff95df7c9080e40a0b18b2b1b063ec22107..d5c02e2bcb06510e5e979fd6090b6bcd9fce95e6 100644 (file)
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,13 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"

-TERMUX_PKG_VERSION=0.22
+TERMUX_PKG_VERSION=0.23

 
 termux_step_make_install () {
        $CXX $CFLAGS $LDFLAGS -std=c++14 -Wall -Wextra -pedantic -Werror $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
 
        # Remove LD_LIBRARY_PATH from environment to avoid conflicting
        # with system libraries that am may link against.
 
 termux_step_make_install () {
        $CXX $CFLAGS $LDFLAGS -std=c++14 -Wall -Wextra -pedantic -Werror $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
 
        # Remove LD_LIBRARY_PATH from environment to avoid conflicting
        # with system libraries that am may link against.

-       for tool in am dalvikvm df getprop logcat ping pm; do
+       for tool in am dalvikvm df getprop logcat ping ping6 pm; do

                WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
                echo '#!/bin/sh' > $WRAPPER_FILE
                if [ $tool = am -o $tool = pm ]; then
                WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
                echo '#!/bin/sh' > $WRAPPER_FILE
                if [ $tool = am -o $tool = pm ]; then