X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dc0f0a5b71d7f781cb33d768279ba315e64ffec7..72c232e2577ea92e2ec06ec194cfd4f40751c0b7:/package/dropbear/Makefile?ds=sidebyside diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index e7144a60d..d43e70cfc 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=0.46 +PKG_VERSION:=0.47 PKG_RELEASE:=1 -PKG_MD5SUM:=f0e535a62b57e5bde9ecba4a11402178 +PKG_MD5SUM:=cf634614d52278d44dfd9c224a438bf2 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -16,6 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 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))) $(PKG_BUILD_DIR)/.configured: $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h @@ -58,15 +59,25 @@ $(PKG_BUILD_DIR)/.configured: --disable-loginfunc \ --disable-pututline \ --disable-pututxline \ + --disable-zlib \ ); touch $@ $(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): mkdir -p $(IDIR_DROPBEAR)/usr/bin @@ -78,7 +89,6 @@ $(IPKG_DROPBEAR): 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)