sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tsocks: use @TERMUX_PREFIX@ in patch

This commit is contained in:
Leonid Pliushch 2021-10-13 13:09:18 +03:00
parent a850806102
commit a2d0d0d79b
No known key found for this signature in database
GPG Key ID: 45F2964132545795
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/tsocks/build.sh
View File

@ -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_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
TERMUX_PKG_VERSION=1.8beta5 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_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true

16
packages/tsocks/tsocks.patch
View File

@ -7,17 +7,17 @@ index 8380d9c..7d1df7a 100755
if [ -z "$LD_PRELOAD" ] if [ -z "$LD_PRELOAD" ]
then then
- export LD_PRELOAD="/usr/lib/libtsocks.so" - export LD_PRELOAD="/usr/lib/libtsocks.so"
+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so" + export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so"
else else
- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ - echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" - export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
+ echo $LD_PRELOAD | grep -q "$PREFIX/lib/libtsocks\.so" || \ + echo $LD_PRELOAD | grep -q "@TERMUX_PREFIX@/lib/libtsocks\.so" || \
+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so $LD_PRELOAD" + export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so $LD_PRELOAD"
fi fi
;; ;;
off) off)
- export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'` - 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" ] if [ -z "$LD_PRELOAD" ]
then then
unset LD_PRELOAD unset LD_PRELOAD
@ -26,18 +26,18 @@ index 8380d9c..7d1df7a 100755
if [ -z "$LD_PRELOAD" ] if [ -z "$LD_PRELOAD" ]
then then
- export LD_PRELOAD="/usr/lib/libtsocks.so" - export LD_PRELOAD="/usr/lib/libtsocks.so"
+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so" + export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so"
else else
- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ - echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" - export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
+ echo $LD_PRELOAD | grep -q "$PREFIX/lib/libtsocks\.so" || \ + echo $LD_PRELOAD | grep -q "@TERMUX_PREFIX@/lib/libtsocks\.so" || \
+ export LD_PRELOAD="$PREFIX/lib/libtsocks.so $LD_PRELOAD" + export LD_PRELOAD="@TERMUX_PREFIX@/lib/libtsocks.so $LD_PRELOAD"
fi fi
if [ $# = 0 ] if [ $# = 0 ]
then then
- ${SHELL:-/bin/sh} - ${SHELL:-/bin/sh}
+ ${SHELL:-$PREFIX/bin/sh} + ${SHELL:-@TERMUX_PREFIX@/bin/sh}
fi fi
if [ $# -gt 0 ] if [ $# -gt 0 ]