From 74c4ad2c0c0e2d7c277cda212ffe7027582214e9 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 11 May 2023 16:33:31 +1000 Subject: [PATCH] openssh: sftp no longer needs crypto or zlib. OpenSSH 9.1p1 removed remaining dependencies and stopped linking sftp, sftp-server and scp against libcrypto or libz. This change moves those package dependencies from the default to those that still need them. In particular, this will allow sftp-server to be installed for use with Dropbear without needing to install zlib or openssl. Signed-off-by: Darren Tucker --- net/openssh/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index b76ef4070d..f2112a40f6 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=9.3p1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ @@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk define Package/openssh/Default SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenssl +zlib + DEPENDS:= TITLE:=OpenSSH MAINTAINER:=Peter Wagner URL:=https://www.openssh.com/ @@ -50,6 +50,7 @@ endef define Package/openssh-client $(call Package/openssh/Default) + DEPENDS+= +libopenssl +zlib TITLE+= client ALTERNATIVES:=\ 200:/usr/bin/ssh:/usr/libexec/ssh-openssh \ @@ -66,7 +67,7 @@ endef define Package/openssh-client-utils $(call Package/openssh/Default) - DEPENDS+= +openssh-client +openssh-keygen + DEPENDS+= +libopenssl +zlib +openssh-client +openssh-keygen TITLE+= client utilities endef @@ -76,6 +77,7 @@ endef define Package/openssh-keygen $(call Package/openssh/Default) + DEPENDS+= +libopenssl +zlib TITLE+= keygen endef @@ -85,7 +87,7 @@ endef define Package/openssh-server $(call Package/openssh/Default) - DEPENDS+= +openssh-keygen +OPENSSH_LIBFIDO2:libfido2 + DEPENDS+= +libopenssl +zlib +openssh-keygen +OPENSSH_LIBFIDO2:libfido2 TITLE+= server USERID:=sshd=22:sshd=22 VARIANT:=without-pam @@ -110,7 +112,7 @@ endef define Package/openssh-server-pam $(call Package/openssh/Default) - DEPENDS+= +libpthread +openssh-keygen +libpam + DEPENDS+= +libopenssl +zlib +libpthread +openssh-keygen +libpam TITLE+= server (with PAM support) VARIANT:=with-pam USERID:=sshd=22:sshd=22 -- 2.30.2