From f05d5c5dca348cc226d690287aaf7c2cc4026055 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 2 Mar 2019 14:53:08 +0200 Subject: [PATCH] wget: fix path to /tmp --- packages/wget/build.sh | 2 +- packages/wget/tmpdir-path.patch | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 packages/wget/tmpdir-path.patch diff --git a/packages/wget/build.sh b/packages/wget/build.sh index 720a3c4b7..7390239b4 100644 --- a/packages/wget/build.sh +++ b/packages/wget/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/wget/ TERMUX_PKG_DESCRIPTION="Commandline tool for retrieving files using HTTP, HTTPS and FTP" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.20.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=0f63e84dd23dc53ab3ab6f483c3afff8301e54c165783f772101cdd9b1c64928 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget-${TERMUX_PKG_VERSION}.tar.lz TERMUX_PKG_DEPENDS="pcre2, openssl, libuuid, libandroid-support, libunistring" diff --git a/packages/wget/tmpdir-path.patch b/packages/wget/tmpdir-path.patch new file mode 100644 index 000000000..9f8b03b88 --- /dev/null +++ b/packages/wget/tmpdir-path.patch @@ -0,0 +1,46 @@ +diff -uNr wget-1.20.1/lib/tempname.c wget-1.20.1.mod/lib/tempname.c +--- wget-1.20.1/lib/tempname.c 2018-12-26 22:08:19.000000000 +0200 ++++ wget-1.20.1.mod/lib/tempname.c 2019-03-01 18:28:01.751293299 +0200 +@@ -32,7 +32,7 @@ + + #include + #ifndef P_tmpdir +-# define P_tmpdir "/tmp" ++# define P_tmpdir "@TERMUX_PREFIX@/tmp" + #endif + #ifndef TMP_MAX + # define TMP_MAX 238328 +@@ -147,8 +147,8 @@ + { + if (direxists (P_tmpdir)) + dir = P_tmpdir; +- else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp")) +- dir = "/tmp"; ++ else if (strcmp (P_tmpdir, "@TERMUX_PREFIX@/tmp") != 0 && direxists ("@TERMUX_PREFIX@/tmp")) ++ dir = "@TERMUX_PREFIX@/tmp"; + else + { + __set_errno (ENOENT); +diff -uNr wget-1.20.1/lib/tmpdir.c wget-1.20.1.mod/lib/tmpdir.c +--- wget-1.20.1/lib/tmpdir.c 2018-12-26 22:08:19.000000000 +0200 ++++ wget-1.20.1.mod/lib/tmpdir.c 2019-03-01 18:27:22.434424043 +0200 +@@ -36,7 +36,7 @@ + # ifdef _P_tmpdir /* native Windows */ + # define P_tmpdir _P_tmpdir + # else +-# define P_tmpdir "/tmp" ++# define P_tmpdir "@TERMUX_PREFIX@/tmp" + # endif + #endif + +@@ -130,8 +130,8 @@ + #endif + if (direxists (P_tmpdir)) + dir = P_tmpdir; +- else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp")) +- dir = "/tmp"; ++ else if (strcmp (P_tmpdir, "@TERMUX_PREFIX@/tmp") != 0 && direxists ("@TERMUX_PREFIX@/tmp")) ++ dir = "@TERMUX_PREFIX@/tmp"; + else + { + __set_errno (ENOENT);