Add libpcap dependency

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

diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index 48d0068..46b1dd7 100644 (file)
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/package/dropbear/Makefile
@@ -3,6 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 DROPBEAR_VERSION:=0.45
+DROPBEAR_RELEASE:=2
 DROPBEAR_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e
 
 DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.bz2
@@ -11,7 +12,7 @@ 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):
@@ -44,6 +45,18 @@ $(DROPBEAR_DIR)/.configured: $(DROPBEAR_DIR)/.patched
                --infodir=/usr/info \
                $(DISABLE_NLS) \
                --with-shared \
+               --disable-pam \
+               --enable-openpty \
+               --enable-syslog \
+               --disable-shadow \
+               --disable-lastlog \
+               --disable-utmp \
+               --disable-utmpx \
+               --disable-wtmp \
+               --disable-wtmpx \
+               --disable-loginfunc \
+               --disable-pututline \
+               --disable-pututxline \
        );
        touch  $(DROPBEAR_DIR)/.configured
 
@@ -53,8 +66,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) \
@@ -62,12 +74,11 @@ $(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
+       install -m 755 ./files/S50dropbear $(DROPBEAR_IPK_DIR)/etc/init.d/
        $(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR)
 
 $(IPKG_STATE_DIR)/info/dropbear.list: $(PACKAGE_DIR)/$(DROPBEAR_IPK)