From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Mon, 25 Jun 2018 05:16:09 +0000 (+0800)
Subject: dropbear: let opkg manage symlinks of ssh, scp
X-Git-Tag: v18.06.2~228
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9f8f5d4d142ad14d9ed68f79e051d8007fb2ef89;p=oweals%2Fopenwrt.git

dropbear: let opkg manage symlinks of ssh, scp

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(backported from c4aadbdaf69bad3fbb3ef54601a3629ba24a6e9b)
---

diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index d221fbc7ed..742e538ff5 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:=2017.75
-PKG_RELEASE:=5.1
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
@@ -49,6 +49,10 @@ define Package/dropbear
   CATEGORY:=Base system
   TITLE:=Small SSH2 client/server
   DEPENDS:= +DROPBEAR_ZLIB:zlib
+  ALTERNATIVES:=\
+	  100:/usr/bin/ssh:/usr/sbin/dropbear \
+	  100:/usr/bin/scp:/usr/sbin/dropbear \
+
 endef
 
 define Package/dropbear/description
@@ -131,8 +135,6 @@ define Package/dropbear/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(LN) ../sbin/dropbear $(1)/usr/bin/scp
-	$(LN) ../sbin/dropbear $(1)/usr/bin/ssh
 	$(LN) ../sbin/dropbear $(1)/usr/bin/dbclient
 	$(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey
 	$(INSTALL_DIR) $(1)/etc/config