include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
-PKG_VERSION:=0.45
-PKG_RELEASE:=2
-PKG_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e
-
-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_VERSION:=0.48.1
+PKG_RELEASE:=1
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
-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)
+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
-$(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
- $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
- touch $(PKG_BUILD_DIR)/.prepared
+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: $(PKG_BUILD_DIR)/.prepared
+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; \
autoconf; \
$(TARGET_CONFIGURE_OPTS) \
--disable-loginfunc \
--disable-pututline \
--disable-pututxline \
+ --disable-zlib \
);
- touch $(PKG_BUILD_DIR)/.configured
+endef
-$(PKG_BUILD_DIR)/dropbearmulti: $(PKG_BUILD_DIR)/.configured
+define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
LD=$(TARGET_CC) \
- PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
+ PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
-
-$(IPKG_DROPBEAR): $(PKG_BUILD_DIR)/dropbearmulti
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_DROPBEAR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(IDIR_DROPBEAR)/usr/bin
- mkdir -p $(IDIR_DROPBEAR)/usr/sbin
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ LD=$(TARGET_CC) \
+ PROGRAMS="dropbearconvert"
+endef
+
+define Package/dropbear/install
+ mkdir -p $(1)/usr/bin
+ mkdir -p $(1)/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
- 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)
+ $(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
-clean:
- rm -rf $(PKG_BUILD_DIR) $(IPKG_DROPBEAR)
+define Package/dropbearconvert/install
+ mkdir -p $(1)/usr/bin
+ install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+ $(1)/usr/bin/dropbearconvert
+endef
+$(eval $(call BuildPackage,dropbear))
+$(eval $(call BuildPackage,dropbearconvert))