update to 0.44

changes:
-IPv6 support
-client added
-bugfixes
XXX dropbear wants to use /dev/random per default now which makes it
unusable on systems w/o entropy source. I've patched it back to
/dev/urandom. There might be security concerns.

5 files changed, 49 insertions, 25 deletions

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 9883831d332..1a512b96eca 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/18 17:30:59 drochner Exp $
 
-DISTNAME=	dropbear-0.43
-PKGREVISION=	1
+DISTNAME=	dropbear-0.44
 CATEGORIES=	security
 MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,5 +15,9 @@ USE_GNU_TOOLS+=	make
 
 MAKEFLAGS+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dropbear
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dropbear
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/dropbear/PLIST b/security/dropbear/PLIST
index a3b8e54b0ca..1d51488f9d2 100644
--- a/security/dropbear/PLIST
+++ b/security/dropbear/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/19 15:46:44 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/18 17:30:59 drochner Exp $
+bin/dbclient
 bin/dropbearconvert
 bin/dropbearkey
 sbin/dropbear
+share/doc/dropbear/README
+@dirrm share/doc/dropbear
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index f676945c632..ba40f714b57 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2004/08/31 10:27:38 martti Exp $
+$NetBSD: distinfo,v 1.5 2005/01/18 17:30:59 drochner Exp $
 
-SHA1 (dropbear-0.43.tar.bz2) = 0bce83ad1a90b9b91e34d0c777f0d914516fd99d
-Size (dropbear-0.43.tar.bz2) = 1140743 bytes
-SHA1 (patch-aa) = 56bf56a3f1485a7395d6ff681b507950a5878345
+SHA1 (dropbear-0.44.tar.bz2) = a95bde40bce8d7809097a1cda87ef139e97649ce
+Size (dropbear-0.44.tar.bz2) = 1263785 bytes
+SHA1 (patch-aa) = a6ee765ce4a06571ea560ad9d9705667c52ee5ec
+SHA1 (patch-ab) = b3c25e61718837f758723c06a97b691d25d82bd2
diff --git a/security/dropbear/patches/patch-aa b/security/dropbear/patches/patch-aa
index b4d4a2f87ac..bb0f07bc790 100644
--- a/security/dropbear/patches/patch-aa
+++ b/security/dropbear/patches/patch-aa
@@ -1,19 +1,23 @@
-$NetBSD: patch-aa,v 1.4 2004/08/31 10:27:38 martti Exp $
+$NetBSD: patch-aa,v 1.5 2005/01/18 17:30:59 drochner Exp $
 
---- Makefile.in.orig	2004-01-30 18:24:25.000000000 +0200
-+++ Makefile.in	2004-08-31 13:22:04.000000000 +0300
-@@ -63,8 +63,8 @@
- 	# chown might fail, so do it separately to the install
--	-chown root $(DESTDIR)$(sbindir)/dropbear
--	-chgrp 0 $(DESTDIR)$(sbindir)/dropbear
--	-chown root $(DESTDIR)$(bindir)/dropbearkey
--	-chgrp 0 $(DESTDIR)$(bindir)/dropbearkey
--	-chown root $(DESTDIR)$(bindir)/dropbearconvert
--	-chgrp 0 $(DESTDIR)$(bindir)/dropbearconvert
-+	-chown ${ROOT_USER} $(DESTDIR)$(sbindir)/dropbear
-+	-chgrp ${ROOT_GROUP} $(DESTDIR)$(sbindir)/dropbear
-+	-chown ${ROOT_USER} $(DESTDIR)$(bindir)/dropbearkey
-+	-chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/dropbearkey
-+	-chown ${ROOT_USER} $(DESTDIR)$(bindir)/dropbearconvert
-+	-chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/dropbearconvert
+--- Makefile.in.orig	2005-01-03 10:24:03.000000000 +0100
++++ Makefile.in
+@@ -140,14 +140,14 @@ insmulti%: dropbearmulti
+ inst_dropbear: dropbear
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
+ 	$(INSTALL) -m 755 $(SPREFIX)dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
+-	-chown root $(DESTDIR)$(sbindir)/$(SPREFIX)dropbear$(EXEEXT)
+-	-chgrp 0 $(DESTDIR)$(sbindir)/$(SPREFIX)dropbear$(EXEEXT)
++	-chown ${ROOT_USER} $(DESTDIR)$(sbindir)/$(SPREFIX)dropbear$(EXEEXT)
++	-chgrp ${ROOT_GROUP} $(DESTDIR)$(sbindir)/$(SPREFIX)dropbear$(EXEEXT)
  
+ inst_%: $*
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 755 $(SPREFIX)$*$(EXEEXT) $(DESTDIR)$(bindir)
+-	-chown root $(DESTDIR)$(bindir)/$(SPREFIX)$*$(EXEEXT)
+-	-chgrp 0 $(DESTDIR)$(bindir)/$(SPREFIX)$*$(EXEEXT)
++	-chown ${ROOT_USER} $(DESTDIR)$(bindir)/$(SPREFIX)$*$(EXEEXT)
++	-chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/$(SPREFIX)$*$(EXEEXT)
+ 
+ 
+ # for some reason the rule further down doesn't like $($@objs) as a prereq.
diff --git a/security/dropbear/patches/patch-ab b/security/dropbear/patches/patch-ab
new file mode 100644
index 00000000000..f6d51af3bf2
--- /dev/null
+++ b/security/dropbear/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/01/18 17:30:59 drochner Exp $
+
+--- options.h.orig	2005-01-18 15:42:25.000000000 +0100
++++ options.h
+@@ -139,7 +139,7 @@ etc) slower (perhaps by 50%). Recommende
+  * will prevent Dropbear from blocking on the device. This could
+  * however significantly reduce the security of your ssh connections
+  * if the PRNG state becomes simpler. */
+-#define DROPBEAR_RANDOM_DEV "/dev/random"
++#define DROPBEAR_RANDOM_DEV "/dev/urandom"
+ 
+ /* prngd must be manually set up to produce output */
+ /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/