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
This commit is contained in:
parent
3b66b4867f
commit
f88c28f160
@ -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_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_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
|
||||
|
@ -1,13 +1,13 @@
|
||||
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.
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user