[package] mac80211: oops, add missing patches

[openwrt.git] / package / dropbear / Makefile

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index ea452f2..a98c24a 100644 (file)
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -1,108 +1,101 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear

-PKG_VERSION:=0.48.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.51
+PKG_RELEASE:=2

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
-PKG_MD5SUM:=ca8e53a766faec831882831364568421
-PKG_CAT:=zcat
+PKG_SOURCE_URL:= \
+       http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ \
+       http://matt.ucc.asn.au/dropbear/releases/
+PKG_MD5SUM:=1045df60c2bdbd39c707238305a1e9e5

 
 

-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dropbear/Default
+  URL:=http://matt.ucc.asn.au/dropbear/
+endef

 
 define Package/dropbear
 
 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/
+  $(call Package/dropbear/Default)
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Small SSH2 client/server
+endef
+
+define Package/dropbear/description
+ A small SSH2 server/client designed for small memory environments.

 endef
 
 define Package/dropbearconvert
 endef
 
 define Package/dropbearconvert

-$(call Package/dropbear)
-DEFAULT:=m
-TITLE:=Utility for converting SSH keys
-DESCRIPTION:=Utility for converting SSH keys
-DEPENDS:=zlib
+  $(call Package/dropbear/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Utility for converting SSH keys

 endef
 
 endef
 

+CONFIGURE_ARGS += \
+       --with-shared \
+       --disable-pam \
+       --enable-openpty \
+       --enable-syslog \
+       $(if $(CONFIG_SHADOW_PASSWORDS),,--disable-shadow) \
+       --disable-lastlog \
+       --disable-utmp \
+       --disable-utmpx \
+       --disable-wtmp \
+       --disable-wtmpx \
+       --disable-loginfunc \
+       --disable-pututline \
+       --disable-pututxline \
+       --disable-zlib
+

 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
 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) \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-               ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --datadir=/usr/share \
-               --includedir=/usr/include \
-               --infodir=/usr/share/info \
-               --libdir=/usr/lib \
-               --libexecdir=/usr/lib \
-               --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --sbindir=/usr/sbin \
-               --sysconfdir=/etc \
-               $(DISABLE_LARGEFILE) \
-               $(DISABLE_NLS) \
-               --with-shared \
-               --disable-pam \
-               --enable-openpty \
-               --enable-syslog \
-               --disable-shadow \
-               --disable-lastlog \
-               --disable-utmp \
-               --disable-utmpx \
-               --disable-wtmp \
-               --disable-wtmpx \
-               --disable-loginfunc \
-               --disable-pututline \
-               --disable-pututxline \
-               --disable-zlib \
-       );
+       $(call Build/Configure/Default)

 endef
 
 endef
 

-define Buid/Compile
+define Build/Compile

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               LD=$(TARGET_CC) \
+               $(TARGET_CONFIGURE_OPTS) \
+               LD="$(TARGET_CC)" \

                PROGRAMS="dropbear dbclient dropbearkey scp" \
                MULTI=1 SCPPROGRESS=1
        $(MAKE) -C $(PKG_BUILD_DIR) \
                PROGRAMS="dropbear dbclient dropbearkey scp" \
                MULTI=1 SCPPROGRESS=1
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               LD=$(TARGET_CC) \
+               $(TARGET_CONFIGURE_OPTS) \
+               LD="$(TARGET_CC)" \

                PROGRAMS="dropbearconvert"
 endef
                PROGRAMS="dropbearconvert"
 endef

-       
+

 define Package/dropbear/install
 define Package/dropbear/install

-       mkdir -p $(IDIR_DROPBEAR)/usr/bin
-       mkdir -p $(IDIR_DROPBEAR)/usr/sbin
-       install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
-               $(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/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear
+       $(INSTALL_DIR) $(1)/usr/bin
+       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
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
+       $(INSTALL_DIR) $(1)/usr/lib/opkg/info
+       echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/opkg/info/dropbear.conffiles
+       echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/opkg/info/dropbear.conffiles

 endef
 
 define Package/dropbearconvert/install
 endef
 
 define Package/dropbearconvert/install

-       mkdir -p $(IDIR_DBCONVERT)/usr/bin
-       install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
-               $(IDIR_DBCONVERT)/usr/bin/dropbearconvert
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearconvert $(1)/usr/bin/dropbearconvert

 endef
 
 $(eval $(call BuildPackage,dropbear))
 endef
 
 $(eval $(call BuildPackage,dropbear))