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

fakeroot: fix paths in bin/fakeroot (fakeroot.in)

Browse Source
This commit is contained in:
Leonid Pliushch 2018-10-01 17:33:50 +03:00 committed by Fredrik Fornwall
parent 3efd835468
commit c713acafe9
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fakeroot/fakeroot-1.23_faked.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr fakeroot-1.23/faked.c fakeroot-1.23.mod/faked.c
--- fakeroot-1.23/faked.c 2018-07-01 22:01:34.000000000 +0300
+++ fakeroot-1.23.mod/faked.c 2018-10-01 17:11:53.263620010 +0300
+++ fakeroot-1.23.mod/faked.c 2018-10-01 17:31:45.172555748 +0300
@@ -1487,7 +1487,7 @@
/* literally copied from the linux klogd code, go to background */
if ((pid=fork()) == 0){

2
packages/fakeroot/fakeroot-1.23_libfakeroot.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr fakeroot-1.23/libfakeroot.c fakeroot-1.23.mod/libfakeroot.c
--- fakeroot-1.23/libfakeroot.c 2018-07-01 22:01:34.000000000 +0300
+++ fakeroot-1.23.mod/libfakeroot.c 2018-10-01 17:09:21.633620119 +0300
+++ fakeroot-1.23.mod/libfakeroot.c 2018-10-01 17:31:45.175889099 +0300
@@ -81,12 +81,14 @@
#define SEND_STAT64(a,b,c) send_stat64(a,b,c)
#define SEND_GET_STAT(a,b) send_get_stat(a,b)

25
packages/fakeroot/fakeroot-1.23_scripts_fakeroot.in.patch Normal file
View File

@ -0,0 +1,25 @@
diff -uNr fakeroot-1.23/scripts/fakeroot.in fakeroot-1.23.mod/scripts/fakeroot.in
--- fakeroot-1.23/scripts/fakeroot.in 2018-07-01 22:01:34.000000000 +0300
+++ fakeroot-1.23.mod/scripts/fakeroot.in 2018-10-01 17:32:47.566222406 +0300
@@ -145,8 +145,8 @@
if [ "$WAITINTRAP" -eq 0 ]; then
trap "kill -s @signal@ $PID" EXIT INT
else
- @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
- @MACOSX_TRUE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
+ @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDPRELOADVAR@="$LIB" ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
+ @MACOSX_TRUE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
fi
if test -z "$FAKEROOTKEY" || test -z "$PID"; then
@@ -168,8 +168,8 @@
export FAKEROOT_FD_BASE
if test -z "$*"; then
- @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
- @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
+ @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-@TERMUX_PREFIX@/bin/sh}
+ @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-@TERMUX_PREFIX@/bin/sh}
RESULT=$?
else
@MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"