X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fdropbear%2FMakefile;h=a62e25131bce6e3380a1a3f8bd39c28224635c22;hb=0d52ac0f6a06a36bc0f0316b8593f1f8dc3a8a53;hp=eec889deaf19f14322c0b8cad2c8394159452e0c;hpb=a4d8c8e5caa11cb5301bedeb4aa29c880f599a2c;p=openwrt-10.03%2F.git

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index eec889dea..a62e25131 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -5,7 +5,7 @@
 #############################################################
 include $(TOPDIR)/rules.mk
 
-DROPBEAR_VERSION:=0.44
+DROPBEAR_VERSION:=0.45
 DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/
 DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION)
@@ -16,7 +16,7 @@ DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-1_$(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) x $(DROPBEAR_SITE)
 
 $(DROPBEAR_DIR)/.patched: $(DL_DIR)/$(DROPBEAR_SOURCE)
 	$(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -55,6 +55,7 @@ $(DROPBEAR_DIR)/$(DROPBEAR_BINARY): $(DROPBEAR_DIR)/.configured
 
 $(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
 	mkdir -p $(DROPBEAR_IPK_DIR)/usr/bin
 	mkdir -p $(DROPBEAR_IPK_DIR)/usr/sbin
 	install -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \
@@ -65,15 +66,19 @@ $(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
 	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)
 
+$(IPKG_STATE_DIR)/info/dropbear.list: $(PACKAGE_DIR)/$(DROPBEAR_IPK)
+	$(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK)
+
 source: $(DL_DIR)/$(DROPBEAR_SOURCE)
 prepare: $(DROPBEAR_DIR)/.patched
 compile: $(PACKAGE_DIR)/$(DROPBEAR_IPK)
-install: compile
-	$(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK)
+install: $(IPKG_STATE_DIR)/info/dropbear.list
+
 clean:
 	rm -rf $(DROPBEAR_DIR)
 	rm -f $(PACKAGE_DIR)/$(DROPBEAR_IPK)