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

openssh: Update from 8.1 to 8.2

Browse Source
This commit is contained in:
Fredrik Fornwall 2020-02-15 23:04:18 +01:00
parent 8a77ed3b8c
commit 2ba9974d99
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/openssh/build.sh
View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=8.1p1
TERMUX_PKG_REVISION=4
TERMUX_PKG_VERSION=8.2p1
TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
TERMUX_PKG_SHA256=43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671
TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib"
TERMUX_PKG_CONFLICTS="dropbear"
# --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:

12
packages/openssh/fix-hardcoded-paths.patch
View File

@ -67,15 +67,3 @@ diff -uNr openssh-7.5p1/pathnames.h openssh-7.5p1.mod/pathnames.h
#endif
#ifndef _PATH_LS
diff -uNr openssh-7.5p1/ssh-agent.c openssh-7.5p1.mod/ssh-agent.c
--- openssh-7.5p1/ssh-agent.c 2017-03-20 04:39:27.000000000 +0200
+++ openssh-7.5p1.mod/ssh-agent.c 2017-09-14 16:28:32.912855451 +0300
@@ -89,7 +89,7 @@
#endif
#ifndef DEFAULT_PKCS11_WHITELIST
-# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
+# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*,@TERMUX_PREFIX@/lib*/*"
#endif
typedef enum {

17
packages/openssh/ssh-agent.c.patch
View File

@ -1,7 +1,16 @@
diff -ruN a/ssh-agent.c b/ssh-agent.c
--- a/ssh-agent.c 2018-08-08 13:44:30.076228968 +0200
+++ b/ssh-agent.c 2018-08-08 13:46:37.282997806 +0200
@@ -1064,9 +1064,11 @@
diff -u -r ../openssh-8.2p1/ssh-agent.c ./ssh-agent.c
--- ../openssh-8.2p1/ssh-agent.c 2020-02-14 00:40:54.000000000 +0000
+++ ./ssh-agent.c 2020-02-15 22:01:29.025352000 +0000
@@ -93,7 +93,7 @@
#include "sk-api.h"
#ifndef DEFAULT_PROVIDER_WHITELIST
-# define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
+# define DEFAULT_PROVIDER_WHITELIST "/data/data/com.termux/files/usr/lib*/*"
#endif
/* Maximum accepted message length */
@@ -1199,9 +1199,11 @@
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd();