Browse Source

openssh: remove hardcoded prefix

build-on-device
Henrik Grimler 5 years ago
parent
commit
ed1081f2f2
  1. 2
      packages/openssh/build.sh
  2. 2
      packages/openssh/ssh-agent.c.patch

2
packages/openssh/build.sh

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=8.2p1 TERMUX_PKG_VERSION=8.2p1
TERMUX_PKG_REVISION=2 TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671 TERMUX_PKG_SHA256=43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671
TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib" TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib"

2
packages/openssh/ssh-agent.c.patch

@ -6,7 +6,7 @@ diff -u -r ../openssh-8.2p1/ssh-agent.c ./ssh-agent.c
#ifndef DEFAULT_PROVIDER_WHITELIST #ifndef DEFAULT_PROVIDER_WHITELIST
-# define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*" -# define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
+# define DEFAULT_PROVIDER_WHITELIST "/data/data/com.termux/files/usr/lib*/*" +# define DEFAULT_PROVIDER_WHITELIST "@TERMUX_PREFIX@/lib*/*,@TERMUX_PREFIX@/local/lib*/*"
#endif #endif
/* Maximum accepted message length */ /* Maximum accepted message length */

Loading…
Cancel
Save