remove version and architecture from control files

[openwrt/openwrt.git] / openwrt / package / dropbear / Makefile

diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index 50031300b92743045a1cad92f58539b42757152e..72cc03005ab872c8cf175617381e0436174d9597 100644 (file)
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/package/dropbear/Makefile
@@ -1,22 +1,22 @@
-#############################################################
-#
-# dropbear
-#
-#############################################################
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 DROPBEAR_VERSION:=0.45
+DROPBEAR_RELEASE:=2
+DROPBEAR_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e
+
 DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/
 DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION)
 DROPBEAR_CAT:=bzcat
 DROPBEAR_BINARY:=dropbearmulti
 DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear
-DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-1_$(ARCH).ipk
+DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-$(DROPBEAR_RELEASE)_$(ARCH).ipk
 DROPBEAR_IPK_DIR:=$(DROPBEAR_DIR)/ipkg
 
 $(DL_DIR)/$(DROPBEAR_SOURCE):
-        $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(DROPBEAR_SOURCE) $(DROPBEAR_MD5SUM) $(DROPBEAR_SITE)
 
 $(DROPBEAR_DIR)/.patched: $(DL_DIR)/$(DROPBEAR_SOURCE)
        $(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -54,8 +54,7 @@ $(DROPBEAR_DIR)/$(DROPBEAR_BINARY): $(DROPBEAR_DIR)/.configured
                MULTI=1 SCPPROGRESS=1 -C $(DROPBEAR_DIR)
 
 $(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(DROPBEAR_IPK_DIR) dropbear.control $(DROPBEAR_VERSION)-1 $(ARCH)
-       cp dropbear.conffiles $(DROPBEAR_IPK_DIR)/CONTROL/conffiles
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(DROPBEAR_IPK_DIR) dropbear.control $(DROPBEAR_VERSION)-$(DROPBEAR_RELEASE) $(ARCH)
        mkdir -p $(DROPBEAR_IPK_DIR)/usr/bin
        mkdir -p $(DROPBEAR_IPK_DIR)/usr/sbin
        install -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \
@@ -63,10 +62,10 @@ $(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
        $(STRIP) $(DROPBEAR_IPK_DIR)/usr/sbin/dropbear
        ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/scp
        ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/ssh
+       ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dbclient
        ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dropbearkey
        ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dropbearconvert
        mkdir -p $(DROPBEAR_IPK_DIR)/etc/init.d
-       cp ./files/passwd $(DROPBEAR_IPK_DIR)/etc
        cp ./files/S50dropbear $(DROPBEAR_IPK_DIR)/etc/init.d/
        chmod a+x $(DROPBEAR_IPK_DIR)/etc/init.d/S50dropbear
        $(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR)