package/dropbear: simplify & reduce init script size (closes #7985)

[openwrt.git] / package / dropbear / Makefile

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 591d778..6fad273 100644 (file)
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -1,21 +1,23 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear

-PKG_VERSION:=0.48.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.52
+PKG_RELEASE:=5

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
-PKG_MD5SUM:=ca8e53a766faec831882831364568421
-PKG_CAT:=zcat
+PKG_SOURCE_URL:= \
+       http://matt.ucc.asn.au/dropbear/releases/ \
+       http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
+PKG_MD5SUM:=1c69ec674481d7745452f68f2ea5597e
+
+PKG_BUILD_PARALLEL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -28,8 +30,16 @@ define Package/dropbear
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Small SSH2 client/server
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Small SSH2 client/server

-  DESCRIPTION:=\
-       A small SSH2 server/client designed for small memory environments.
+endef
+
+define Package/dropbear/description
+ A small SSH2 server/client designed for small memory environments.
+endef
+
+define Package/dropbear/conffiles
+/etc/dropbear/dropbear_rsa_host_key
+/etc/dropbear/dropbear_dss_host_key 
+/etc/config/dropbear 

 endef
 
 define Package/dropbearconvert
 endef
 
 define Package/dropbearconvert


@@ -44,7 +54,7 @@ CONFIGURE_ARGS += \
        --disable-pam \
        --enable-openpty \
        --enable-syslog \
        --disable-pam \
        --enable-openpty \
        --enable-syslog \

-       --disable-shadow \
+       $(if $(CONFIG_SHADOW_PASSWORDS),,--disable-shadow) \

        --disable-lastlog \
        --disable-utmp \
        --disable-utmpx \
        --disable-lastlog \
        --disable-utmp \
        --disable-utmpx \


@@ -62,21 +72,20 @@ define Build/Configure
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \

                $(TARGET_CONFIGURE_OPTS) \
                LD="$(TARGET_CC)" \
                PROGRAMS="dropbear dbclient dropbearkey scp" \
                MULTI=1 SCPPROGRESS=1
                $(TARGET_CONFIGURE_OPTS) \
                LD="$(TARGET_CC)" \
                PROGRAMS="dropbear dbclient dropbearkey scp" \
                MULTI=1 SCPPROGRESS=1

-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \

                $(TARGET_CONFIGURE_OPTS) \
                LD="$(TARGET_CC)" \
                PROGRAMS="dropbearconvert"
 endef
                $(TARGET_CONFIGURE_OPTS) \
                LD="$(TARGET_CC)" \
                PROGRAMS="dropbearconvert"
 endef

-       
+

 define Package/dropbear/install
        $(INSTALL_DIR) $(1)/usr/sbin
 define Package/dropbear/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti \
-               $(1)/usr/sbin/dropbear
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear

        $(INSTALL_DIR) $(1)/usr/bin
        ln -sf ../sbin/dropbear $(1)/usr/bin/scp
        ln -sf ../sbin/dropbear $(1)/usr/bin/ssh
        $(INSTALL_DIR) $(1)/usr/bin
        ln -sf ../sbin/dropbear $(1)/usr/bin/scp
        ln -sf ../sbin/dropbear $(1)/usr/bin/ssh


@@ -86,12 +95,15 @@ define Package/dropbear/install
        $(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
        $(INSTALL_DATA) ./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/dropbear
+       touch $(1)/etc/dropbear/dropbear_rsa_host_key
+       touch $(1)/etc/dropbear/dropbear_dss_host_key

 endef
 
 define Package/dropbearconvert/install
        $(INSTALL_DIR) $(1)/usr/bin
 endef
 
 define Package/dropbearconvert/install
        $(INSTALL_DIR) $(1)/usr/bin

-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearconvert \
-               $(1)/usr/bin/dropbearconvert
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearconvert $(1)/usr/bin/dropbearconvert

 endef
 
 $(eval $(call BuildPackage,dropbear))
 endef
 
 $(eval $(call BuildPackage,dropbear))