From 194d5509d758446e34f618af0a39ae1bdc89e1a9 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 4 Jul 2016 18:15:00 -0400 Subject: [PATCH] openssh: Keep PREFIX environment variable --- packages/openssh/build.sh | 2 +- packages/openssh/session_c_tmpdir.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 9cf73592..ca15a9f3 100755 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.openssh.com/ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_VERSION=7.2p2 -TERMUX_PKG_BUILD_REVISION=6 +TERMUX_PKG_BUILD_REVISION=7 TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl" # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: diff --git a/packages/openssh/session_c_tmpdir.patch b/packages/openssh/session_c_tmpdir.patch index 7cdff260..487d6ba2 100644 --- a/packages/openssh/session_c_tmpdir.patch +++ b/packages/openssh/session_c_tmpdir.patch @@ -24,7 +24,7 @@ diff -u -r ../openssh-7.2p2/session.c ./session.c child_set_env(&env, &envsize, "TZ", getenv("TZ")); +#ifdef __ANDROID__ -+ char const* envs_to_keep[] = {"LD_LIBRARY_PATH", "PATH", "ANDROID_ROOT", "ANDROID_DATA", "EXTERNAL_STORAGE", "LANG"}; ++ char const* envs_to_keep[] = {"LD_LIBRARY_PATH", "PATH", "ANDROID_ROOT", "ANDROID_DATA", "EXTERNAL_STORAGE", "LANG", "PREFIX"}; + for (i = 0; i < (sizeof(envs_to_keep) / sizeof(envs_to_keep[0])); i++) { + char const* env_to_keep_name = envs_to_keep[i]; + char const* env_to_keep_value = getenv(env_to_keep_name); -- 2.11.0