Skip to content
Snippets Groups Projects
Commit 74c4ad2c authored by Darren Tucker's avatar Darren Tucker Committed by Rosen Penev
Browse files

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: default avatarDarren Tucker <dtucker@dtucker.net>
parent 1daddd58
No related branches found
No related tags found
2 merge requests!39Merge openwrt v23.05.0-rc3,!38Merge openwrt v23.05.0-rc3
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment