projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dropbear: fix dropbear startup issue
[openwrt/staging/chunkeey.git]
/
package
/
network
/
services
/
dropbear
/
Makefile
diff --git
a/package/network/services/dropbear/Makefile
b/package/network/services/dropbear/Makefile
index ef57502e69896d7a4643b6c4a467b98d805cebfe..0ed7199e68bd1d72b6221a920cd632978e0bd105 100644
(file)
--- a/
package/network/services/dropbear/Makefile
+++ b/
package/network/services/dropbear/Makefile
@@
-8,27
+8,31
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
-PKG_VERSION:=201
5.71
-PKG_RELEASE:=
3
+PKG_VERSION:=201
7.75
+PKG_RELEASE:=
9
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
http://matt.ucc.asn.au/dropbear/releases/ \
https://dropbear.nl/mirror/releases/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
http://matt.ucc.asn.au/dropbear/releases/ \
https://dropbear.nl/mirror/releases/
-PKG_
MD5SUM:=2ccc0a2f3e37ca221db12c5af6a88137
+PKG_
HASH:=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
+PKG_CPE_ID:=cpe:/a:matt_johnston:dropbear_ssh_server
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
-PKG_CONFIG_DEPENDS:=CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC CONFIG_DROPBEAR_CURVE25519
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC \
+ CONFIG_DROPBEAR_CURVE25519 CONFIG_DROPBEAR_ZLIB \
+ CONFIG_DROPBEAR_UTMP CONFIG_DROPBEAR_PUTUTLINE
include $(INCLUDE_DIR)/package.mk
ifneq ($(DUMP),1)
include $(INCLUDE_DIR)/package.mk
ifneq ($(DUMP),1)
- STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell
$(SH_FUNC) echo $(CONFIG_TARGET_INIT_PATH) | md5s
)
+ STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell
echo $(CONFIG_TARGET_INIT_PATH) | mkhash md5
)
endif
define Package/dropbear/Default
endif
define Package/dropbear/Default
@@
-44,6
+48,11
@@
define Package/dropbear
SECTION:=net
CATEGORY:=Base system
TITLE:=Small SSH2 client/server
SECTION:=net
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
endef
define Package/dropbear/description
@@
-52,7
+61,7
@@
endef
define Package/dropbear/conffiles
/etc/dropbear/dropbear_rsa_host_key
define Package/dropbear/conffiles
/etc/dropbear/dropbear_rsa_host_key
-/etc/config/dropbear
+/etc/config/dropbear
endef
define Package/dropbearconvert
endef
define Package/dropbearconvert
@@
-66,7
+75,6
@@
CONFIGURE_ARGS += \
--disable-pam \
--enable-openpty \
--enable-syslog \
--disable-pam \
--enable-openpty \
--enable-syslog \
- $(if $(CONFIG_SHADOW_PASSWORDS),,--disable-shadow) \
--disable-lastlog \
--disable-utmpx \
$(if $(CONFIG_DROPBEAR_UTMP),,--disable-utmp) \
--disable-lastlog \
--disable-utmpx \
$(if $(CONFIG_DROPBEAR_UTMP),,--disable-utmp) \
@@
-75,11
+83,11
@@
CONFIGURE_ARGS += \
--disable-loginfunc \
$(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \
--disable-pututxline \
--disable-loginfunc \
$(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \
--disable-pututxline \
-
--disable-zlib
\
+
$(if $(CONFIG_DROPBEAR_ZLIB),,--disable-zlib)
\
--enable-bundled-libtom
--enable-bundled-libtom
-TARGET_CFLAGS += -D
DEFAULT_PATH=\\\"$(TARGET_INIT_PATH)\\\" -DARGTYPE=3 -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
+TARGET_CFLAGS += -D
ARGTYPE=3 -ffunction-sections -fdata-sections -flto
+TARGET_LDFLAGS += -Wl,--gc-sections
-flto=jobserver
define Build/Configure
$(Build/Configure/Default)
define Build/Configure
$(Build/Configure/Default)
@@
-105,6
+113,10
@@
define Build/Configure
mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h || exit 1; \
done
mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h || exit 1; \
done
+ # remove protocol idented software version number
+ $(SED) 's,^#define LOCAL_IDENT .*$$$$,#define LOCAL_IDENT "SSH-2.0-dropbear",g' \
+ $(PKG_BUILD_DIR)/sysoptions.h
+
# Enforce rebuild of svr-chansession.c
rm -f $(PKG_BUILD_DIR)/svr-chansession.o
endef
# Enforce rebuild of svr-chansession.c
rm -f $(PKG_BUILD_DIR)/svr-chansession.o
endef
@@
-123,12
+135,10
@@
define Package/dropbear/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear
$(INSTALL_DIR) $(1)/usr/bin
$(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
$(LN) ../sbin/dropbear $(1)/usr/bin/dbclient
$(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey
$(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_
DATA
) ./files/dropbear.config $(1)/etc/config/dropbear
+ $(INSTALL_
CONF
) ./files/dropbear.config $(1)/etc/config/dropbear
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
$(INSTALL_DIR) $(1)/usr/lib/opkg/info
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
$(INSTALL_DIR) $(1)/usr/lib/opkg/info