aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2017-08-30 15:58:09 -0700
committerJohn Crispin <john@phrozen.org>2017-08-31 19:14:43 +0200
commitf7528ed0a8586434e18e9007b1bf0d05a18d6418 (patch)
tree68cc4e587d8948786eec3ee014e42b0028238508 /package/network
parentc56448e2cf2d365a425c2f0019df9f4368c0b810 (diff)
downloadupstream-f7528ed0a8586434e18e9007b1bf0d05a18d6418.tar.gz
upstream-f7528ed0a8586434e18e9007b1bf0d05a18d6418.tar.bz2
upstream-f7528ed0a8586434e18e9007b1bf0d05a18d6418.zip
dropbear: Link ssh and scp command to /bin instead of /usr/bin
ssh and scp commands interfere with OpenSSH when installed in /usr/bin . One use case is when installing dropbear to get root access when only OpenSSH is available (OpenSSH disallows root password logins). Once dropbear installs, it replaces OpenSSH's executables, even when removed with opkg. OpenSSH must be reinstalled to get them back. Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/dropbear/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index 7302db273c..95852baf77 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:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
@@ -126,8 +126,8 @@ 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)/bin/scp
+ $(LN) ../sbin/dropbear $(1)/bin/ssh
$(LN) ../sbin/dropbear $(1)/usr/bin/dbclient
$(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey
$(INSTALL_DIR) $(1)/etc/config