fix wpa/wpa2 with madwifi

[openwrt.git] / package / dropbear / Makefile

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index d43e70cfce7f35dc8c8fdbae5bb60a7fa818166d..28cdd15f7cf46231fc061f8b7d1255a7ea699f41 100644 (file)
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -3,22 +3,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
-PKG_VERSION:=0.47
+PKG_VERSION:=0.48.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=cf634614d52278d44dfd9c224a438bf2
-
-PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
+PKG_MD5SUM:=ca8e53a766faec831882831364568421
+PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/dropbear
+SECTION:=base
+CATEGORY:=Base system
+DEFAULT:=y
+TITLE:=Small SSH 2 client/server
+DESCRIPTION:=A small SSH 2 server/client designed for small memory environments.
+URL:=http://matt.ucc.asn.au/dropbear/
+endef
+
+define Package/dropbearconvert
+$(call Package/dropbear)
+TITLE:=Utility for converting SSH keys
+DESCRIPTION:=Utility for converting SSH keys
+DEPENDS:=+zlib
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
        $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
        $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
        (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
@@ -61,9 +73,9 @@ $(PKG_BUILD_DIR)/.configured:
                --disable-pututxline \
                --disable-zlib \
        );
-       touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LD=$(TARGET_CC) \
                PROGRAMS="dropbear dbclient dropbearkey scp" \
@@ -71,24 +83,26 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LD=$(TARGET_CC) \
                PROGRAMS="dropbearconvert"
-       touch $@
+endef
        
-$(IPKG_DBCONVERT):
-       mkdir -p $(IDIR_DBCONVERT)/usr/bin
+define Package/dropbear/install
+       mkdir -p $(1)/usr/bin
+       mkdir -p $(1)/usr/sbin
+       install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
+               $(1)/usr/sbin/dropbear
+       ln -sf ../sbin/dropbear $(1)/usr/bin/scp
+       ln -sf ../sbin/dropbear $(1)/usr/bin/ssh
+       ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient
+       ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey
+       mkdir -p $(1)/etc/init.d
+       install -m 755 ./files/S50dropbear $(1)/etc/init.d/
+endef
+
+define Package/dropbearconvert/install
+       mkdir -p $(1)/usr/bin
        install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
-               $(IDIR_DBCONVERT)/usr/bin/dropbearconvert
-       $(IPKG_BUILD) $(IDIR_DBCONVERT) $(PACKAGE_DIR)
+               $(1)/usr/bin/dropbearconvert
+endef
 
-$(IPKG_DROPBEAR):
-       mkdir -p $(IDIR_DROPBEAR)/usr/bin
-       mkdir -p $(IDIR_DROPBEAR)/usr/sbin
-       install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
-               $(IDIR_DROPBEAR)/usr/sbin/dropbear
-       $(STRIP) $(IDIR_DROPBEAR)/usr/sbin/dropbear
-       ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp
-       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
-       mkdir -p $(IDIR_DROPBEAR)/etc/init.d
-       install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
-       $(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)
+$(eval $(call BuildPackage,dropbear))
+$(eval $(call BuildPackage,dropbearconvert))