From 7a4eb993efb48bf3bbb4436c1f262727c9271b9d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 19 Apr 2022 17:33:01 +0200 Subject: [PATCH] openssh: make openssh-sftp-server conflict with older openssh --- packages/openssh/build.sh | 1 + packages/openssh/openssh-sftp-server.subpackage.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 7490cd89c..65c498f7f 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -3,6 +3,7 @@ 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=1 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a TERMUX_PKG_DEPENDS="krb5, ldns, libandroid-support, libedit, openssh-sftp-server, openssl, termux-auth, zlib" diff --git a/packages/openssh/openssh-sftp-server.subpackage.sh b/packages/openssh/openssh-sftp-server.subpackage.sh index e2824f7d8..010ba4911 100644 --- a/packages/openssh/openssh-sftp-server.subpackage.sh +++ b/packages/openssh/openssh-sftp-server.subpackage.sh @@ -5,3 +5,5 @@ share/man/man8/sftp-server.8.gz TERMUX_SUBPKG_DESCRIPTION="OpenSSH SFTP server subsystem" TERMUX_SUBPKG_DEPENDS="libandroid-support, openssl" TERMUX_SUBPKG_DEPEND_ON_PARENT=no +TERMUX_SUBPKG_REPLACES="openssh (<< 9.0p1-1)" +TERMUX_SUBPKG_BREAKS="openssh (<< 9.0p1-1)"