fix build on x86 (--disable-asm), standardize.

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

diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index bc3ff0d..75eaf6e 100644 (file)
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/package/dropbear/Makefile
@@ -3,32 +3,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
-PKG_VERSION:=0.45
-PKG_RELEASE:=2
-PKG_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e
+PKG_VERSION:=0.48.1
+PKG_RELEASE:=1
+PKG_MD5SUM:=ca8e53a766faec831882831364568421
 
-PKG_SOURCE_URL:= \
-       http://matt.ucc.asn.au/dropbear/releases/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-IPKG_DROPBEAR:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_DROPBEAR:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_DROPBEAR:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches \*.patch
+$(PKG_BUILD_DIR)/.configured:
        $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
-       touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+       $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
        (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
                autoconf; \
                $(TARGET_CONFIGURE_OPTS) \
@@ -67,17 +59,27 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --disable-loginfunc \
                --disable-pututline \
                --disable-pututxline \
+               --disable-zlib \
        );
-       touch  $(PKG_BUILD_DIR)/.configured
+       touch $@
 
-$(PKG_BUILD_DIR)/dropbearmulti: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LD=$(TARGET_CC) \
-               PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
+               PROGRAMS="dropbear dbclient dropbearkey scp" \
                MULTI=1 SCPPROGRESS=1
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               LD=$(TARGET_CC) \
+               PROGRAMS="dropbearconvert"
+       touch $@
+       
+$(IPKG_DBCONVERT):
+       mkdir -p $(IDIR_DBCONVERT)/usr/bin
+       install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+               $(IDIR_DBCONVERT)/usr/bin/dropbearconvert
+       $(IPKG_BUILD) $(IDIR_DBCONVERT) $(PACKAGE_DIR)
 
-$(IPKG_DROPBEAR): $(PKG_BUILD_DIR)/dropbearmulti
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_DROPBEAR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+$(IPKG_DROPBEAR):
        mkdir -p $(IDIR_DROPBEAR)/usr/bin
        mkdir -p $(IDIR_DROPBEAR)/usr/sbin
        install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
@@ -87,19 +89,6 @@ $(IPKG_DROPBEAR): $(PKG_BUILD_DIR)/dropbearmulti
        ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh
        ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
        ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
-       ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearconvert
        mkdir -p $(IDIR_DROPBEAR)/etc/init.d
        install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
        $(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)
-
-$(INFO_DROPBEAR): $(IPKG_DROPBEAR)
-       $(IPKG) install $(IPKG_DROPBEAR)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_DROPBEAR)
-install: $(INFO_DROPBEAR)
-
-clean:
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_DROPBEAR)
-