diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2023-05-11 16:33:31 +1000 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2023-05-17 11:02:19 +0300 |
| commit | 74c4ad2c0c0e2d7c277cda212ffe7027582214e9 (patch) | |
| tree | 7e9070696965a9dda36f556ad530979522b94f61 | |
| parent | 1daddd582f7fec1058ecb2ecf0d66e6a2951f56c (diff) | |
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 <dtucker@dtucker.net>
| -rw-r--r-- | net/openssh/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/openssh/Makefile b/net/openssh/Makefile index b76ef4070..f2112a40f 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 <tripolar@gmx.at> 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 |