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

openssh: update to 8.4p1

Browse Source
This commit is contained in:
Henrik Grimler 2020-10-17 22:15:12 +02:00
parent e2cc85618c
commit fed280dc50
2 changed files with 9 additions and 11 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_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.3p1 TERMUX_PKG_VERSION=8.4p1
TERMUX_PKG_REVISION=2
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=f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2 TERMUX_PKG_SHA256=5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24
TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib" TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib"
TERMUX_PKG_CONFLICTS="dropbear" TERMUX_PKG_CONFLICTS="dropbear"
# --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:

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

@ -1,16 +1,15 @@
diff -u -r ../openssh-8.2p1/ssh-agent.c ./ssh-agent.c --- ./ssh-agent.c.orig 2020-09-27 09:25:01.000000000 +0200
--- ../openssh-8.2p1/ssh-agent.c 2020-02-14 00:40:54.000000000 +0000 +++ ./ssh-agent.c 2020-10-17 22:11:56.636611859 +0200
+++ ./ssh-agent.c 2020-02-15 22:01:29.025352000 +0000 @@ -94,7 +94,7 @@
@@ -93,7 +93,7 @@
#include "sk-api.h" #include "sk-api.h"
#ifndef DEFAULT_PROVIDER_WHITELIST #ifndef DEFAULT_ALLOWED_PROVIDERS
-# define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*" -# define DEFAULT_ALLOWED_PROVIDERS "/usr/lib*/*,/usr/local/lib*/*"
+# define DEFAULT_PROVIDER_WHITELIST "@TERMUX_PREFIX@/lib*/*,@TERMUX_PREFIX@/local/lib*/*" +# define DEFAULT_ALLOWED_PROVIDERS "@TERMUX_PREFIX@/lib*/*,@TERMUX_PREFIX@/local/lib*/*"
#endif #endif
/* Maximum accepted message length */ /* Maximum accepted message length */
@@ -1199,9 +1199,11 @@ @@ -1292,9 +1292,11 @@
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd(); sanitise_stdfd();