Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

5 files changed, 31 insertions, 23 deletions

diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
deleted file mode 100644
index e12ca80f3..000000000
--- a/package/dropbear/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_DROPBEAR
-	prompt "dropbear.......................... Small SSH 2 client/server"
-	tristate
-	default y if !ADK_TOOLCHAIN_ONLY
-	help
-	  A small SSH 2 server/client designed for small memory environments.
-	  
-	  http://matt.ucc.asn.au/dropbear/
-
-config ADK_PACKAGE_DBCONVERT
-	prompt   "dropbearconvert................. Utility for converting SSH keys"
-	tristate
-	default n
-	depends on ADK_PACKAGE_DROPBEAR
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 22a5680ac..6625cb21c 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -7,20 +7,23 @@ PKG_NAME:=		dropbear
 PKG_VERSION:=		0.52
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
-PKG_DESCR:=		SSH 2 server/client designed for small memory environments
+PKG_DESCR:=		SSH 2 server/client designed for embedded systems 
 PKG_SECTION:=		net
 PKG_URL:=		http://matt.ucc.asn.au/dropbear
-PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/ \
-			http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
+PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/
 
-PKG_DESCR_1:=		Utility for converting SSH keys
+PKG_DESCR_UTIL:=	Utility for converting SSH keys
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTIL},${PKG_SECTION}))
+
+PKGDFLT_DROPBEAR:=	y if !ADK_TOOLCHAIN_ONLY
+
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pam \
 			--enable-openpty \
 			--enable-syslog \
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index b1623c919..4a7d7a875 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -10,7 +10,7 @@ bothlog() {
 case $1 in
 autostop) ;;
 autostart)
-	[[ $dropbear_flags = NO ]] && exit 0
+	test x"${dropbear:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)
@@ -30,7 +30,7 @@ start)
 	/usr/sbin/dropbear $dropbear_flags
 	;;
 stop)
-	killall dropbear
+	pkill dropbear
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
index b09c34147..11c7923bb 100644
--- a/package/dropbear/files/dropbear.postinst
+++ b/package/dropbear/files/dropbear.postinst
@@ -1,3 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf '"NO" to disable' dropbear_flags " "
+add_rcconf dropbear dropbear YES
diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h
index c25f10856..b0903f45d 100644
--- a/package/dropbear/patches/patch-options_h
+++ b/package/dropbear/patches/patch-options_h
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- dropbear-0.52.orig/options.h	2008-11-11 15:13:50.000000000 +0100
-+++ dropbear-0.52/options.h	2009-03-19 19:24:46.000000000 +0100
++++ dropbear-0.52/options.h	2010-01-22 17:55:09.000000000 +0100
 @@ -10,6 +10,11 @@
   * parts are to allow for commandline -DDROPBEAR_XXX options etc.
   ******************************************************************/
@@ -13,6 +13,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #ifndef DROPBEAR_DEFPORT
  #define DROPBEAR_DEFPORT "22"
  #endif
+@@ -115,7 +120,7 @@ etc) slower (perhaps by 50%). Recommende
+  * Removing either of these won't save very much space.
+  * SSH2 RFC Draft requires dss, recommends rsa */
+ #define DROPBEAR_RSA
+-#define DROPBEAR_DSS
++/* #define DROPBEAR_DSS */
+ 
+ /* RSA can be vulnerable to timing attacks which use the time required for
+  * signing to guess the private key. Blinding avoids this attack, though makes
 @@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende
  /* #define DSS_PROTOK */
  
@@ -22,3 +31,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  /* Whether to print the message of the day (MOTD). This doesn't add much code
   * size */
+@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende
+ /* The command to invoke for xauth when using X11 forwarding.
+  * "-q" for quiet */
+ #ifndef XAUTH_COMMAND
+-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
++#define XAUTH_COMMAND "/usr/bin/xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with