From facd0157c5bc32657ec7fb9ce4dc2e8a13f6021c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 13 Oct 2022 00:42:27 +0900 Subject: [PATCH] openssh: Bump to 9.1p1 --- packages/openssh/Makefile.in.patch | 17 ++++++++--------- packages/openssh/build.sh | 5 ++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/openssh/Makefile.in.patch b/packages/openssh/Makefile.in.patch index f5c1e5ea99..802585f696 100644 --- a/packages/openssh/Makefile.in.patch +++ b/packages/openssh/Makefile.in.patch @@ -1,12 +1,11 @@ -diff -u -r ../openssh-7.9p1/Makefile.in ./Makefile.in ---- ../openssh-7.9p1/Makefile.in 2018-10-17 00:01:20.000000000 +0000 -+++ ./Makefile.in 2018-11-22 23:35:57.866748335 +0000 -@@ -172,7 +172,7 @@ - $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS) +--- a/Makefile.in ++++ b/Makefile.in +@@ -207,7 +207,7 @@ + $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(GSSLIBS) $(CHANNELLIBS) sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) -- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) -+ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -ltermux-auth -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) +- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) $(CHANNELLIBS) ++ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -ltermux-auth -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) $(CHANNELLIBS) - scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o - $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + scp$(EXEEXT): $(LIBCOMPAT) libssh.a $(SCP_OBJS) + $(LD) -o $@ $(SCP_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index b71f65ee37..b5617beb33 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -2,10 +2,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_MAINTAINER="@termux" -TERMUX_PKG_VERSION=9.0p1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=9.1p1 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a +TERMUX_PKG_SHA256=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 TERMUX_PKG_DEPENDS="krb5, ldns, libandroid-support, libedit, openssh-sftp-server, openssl, termux-auth, zlib" TERMUX_PKG_CONFLICTS="dropbear" # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: