diff --git a/packages/tsocks/build.sh b/packages/tsocks/build.sh index 4620cbbab..d1d65af2b 100644 --- a/packages/tsocks/build.sh +++ b/packages/tsocks/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="transparent network access through a SOCKS 4 or 5 proxy" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_VERSION=1.8beta5 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/tsocks/tsocks.patch b/packages/tsocks/tsocks.patch index dc046f8c3..8923ecb47 100644 --- a/packages/tsocks/tsocks.patch +++ b/packages/tsocks/tsocks.patch @@ -7,17 +7,17 @@ index 8380d9c..7d1df7a 100755 if [ -z "$LD_PRELOAD" ] then - export LD_PRELOAD="/usr/lib/libtsocks.so" -+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so" ++ export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so" else - echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ - export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" -+ echo $LD_PRELOAD | grep -q "$PREFIX/lib/libtsocks\.so" || \ -+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so $LD_PRELOAD" ++ echo $LD_PRELOAD | grep -q "@TERMUX_PREFIX@/lib/libtsocks\.so" || \ ++ export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so $LD_PRELOAD" fi ;; off) - export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'` -+ export LD_PRELOAD=`echo -n $LD_PRELOAD | sed "s:$PREFIX/lib/libtsocks.so *::"` ++ export LD_PRELOAD=`echo -n $LD_PRELOAD | sed "s:@TERMUX_PREFIX@/lib/libtsocks.so *::"` if [ -z "$LD_PRELOAD" ] then unset LD_PRELOAD @@ -26,18 +26,18 @@ index 8380d9c..7d1df7a 100755 if [ -z "$LD_PRELOAD" ] then - export LD_PRELOAD="/usr/lib/libtsocks.so" -+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so" ++ export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so" else - echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ - export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" -+ echo $LD_PRELOAD | grep -q "$PREFIX/lib/libtsocks\.so" || \ -+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so $LD_PRELOAD" ++ echo $LD_PRELOAD | grep -q "@TERMUX_PREFIX@/lib/libtsocks\.so" || \ ++ export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so $LD_PRELOAD" fi if [ $# = 0 ] then - ${SHELL:-/bin/sh} -+ ${SHELL:-$PREFIX/bin/sh} ++ ${SHELL:-@TERMUX_PREFIX@/bin/sh} fi if [ $# -gt 0 ]