fix ssltunnel dependency on openssl

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

diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index e7144a6..d43e70c 100644 (file)
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/package/dropbear/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear

-PKG_VERSION:=0.46
+PKG_VERSION:=0.47

 PKG_RELEASE:=1
 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
 
 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)))
 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
 
 $(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-loginfunc \
                --disable-pututline \
                --disable-pututxline \

+               --disable-zlib \

        );
        touch $@
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LD=$(TARGET_CC) \
        );
        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
                MULTI=1 SCPPROGRESS=1

+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               LD=$(TARGET_CC) \
+               PROGRAMS="dropbearconvert"

        touch $@
        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
 
 $(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/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)
        mkdir -p $(IDIR_DROPBEAR)/etc/init.d
        install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
        $(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)