From 1d4b88265b1befd36dc9e02881d57b46dfeb74b2 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Sun, 3 Dec 2023 18:11:38 +0200 Subject: [PATCH] dropbear: use ssh-keygen as an alias for dropbearkey The DropBear's dropbearkey supports limited set of arguments of OpenSSH ssh-keygen: -t, -q -N -Y After the change you can generate a key with the same command. Still many features of the original OpenSSH ssh-keygen are absent in the dropbearkey. If it's needed then users should install openssh-keygen package that will replace the /usr/bin/ssh-keygen with the full version. Signed-off-by: Sergey Ponomarev Link: https://github.com/openwrt/openwrt/pull/14174 [ wrap commit description to 80 columns ] Link: https://github.com/openwrt/openwrt/pull/14174 Signed-off-by: Christian Marangi --- package/network/services/dropbear/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index b0f486f990..abb46157ea 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2022.83 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -57,7 +57,7 @@ define Package/dropbear CATEGORY:=Base system TITLE:=Small SSH2 client/server DEPENDS:= +DROPBEAR_ZLIB:zlib - ALTERNATIVES:= + ALTERNATIVES:=100:/usr/bin/ssh-keygen:/usr/sbin/dropbear $(if $(CONFIG_DROPBEAR_SCP),ALTERNATIVES+= \ 100:/usr/bin/scp:/usr/sbin/dropbear,) $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES+= \ -- 2.30.2