Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openssh: sftp no longer needs crypto or zlib.

Browse source 
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>
This commit is contained in:
Darren Tucker 2023-05-11 16:33:31 +10:00 committed by Rosen Penev
parent 1daddd582f
commit 74c4ad2c0c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/openssh/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=9.3p1 PKG_VERSION:=9.3p1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/openssh/Default define Package/openssh/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libopenssl +zlib DEPENDS:=
TITLE:=OpenSSH TITLE:=OpenSSH
MAINTAINER:=Peter Wagner <tripolar@gmx.at> MAINTAINER:=Peter Wagner <tripolar@gmx.at>
URL:=https://www.openssh.com/ URL:=https://www.openssh.com/
@ -50,6 +50,7 @@ endef
define Package/openssh-client define Package/openssh-client
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +libopenssl +zlib
TITLE+= client TITLE+= client
ALTERNATIVES:=\ ALTERNATIVES:=\
200:/usr/bin/ssh:/usr/libexec/ssh-openssh \ 200:/usr/bin/ssh:/usr/libexec/ssh-openssh \
@ -66,7 +67,7 @@ endef
define Package/openssh-client-utils define Package/openssh-client-utils
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +openssh-client +openssh-keygen DEPENDS+= +libopenssl +zlib +openssh-client +openssh-keygen
TITLE+= client utilities TITLE+= client utilities
endef endef
@ -76,6 +77,7 @@ endef
define Package/openssh-keygen define Package/openssh-keygen
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +libopenssl +zlib
TITLE+= keygen TITLE+= keygen
endef endef
@ -85,7 +87,7 @@ endef
define Package/openssh-server define Package/openssh-server
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +openssh-keygen +OPENSSH_LIBFIDO2:libfido2 DEPENDS+= +libopenssl +zlib +openssh-keygen +OPENSSH_LIBFIDO2:libfido2
TITLE+= server TITLE+= server
USERID:=sshd=22:sshd=22 USERID:=sshd=22:sshd=22
VARIANT:=without-pam VARIANT:=without-pam
@ -110,7 +112,7 @@ endef
define Package/openssh-server-pam define Package/openssh-server-pam
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +libpthread +openssh-keygen +libpam DEPENDS+= +libopenssl +zlib +libpthread +openssh-keygen +libpam
TITLE+= server (with PAM support) TITLE+= server (with PAM support)
VARIANT:=with-pam VARIANT:=with-pam
USERID:=sshd=22:sshd=22 USERID:=sshd=22:sshd=22