Updte lsh to 2.0.4.

While here,
 * set LICENSE=gnu-gpl-v2
 * marked as user-destdir installation ready
 * switch to use system argp
 * add missing zlib buildlink

News for the 2.0.4 release

	Fixed x11 forwarding bug in the lsh client.

News for the 2.0.3 release

	At startup, lshd now tries to close any spurious open file
	descriptors. New test case for lshd fd leakage.

	lshd --daemonic --no-syslog now sets up a proper daemonic
	environment, except that log messages are still sent to
	stderr. Improved testing of this feature.

4 files changed, 23 insertions, 18 deletions

diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 807748a5da8..11260f4d497 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.17 2008/08/17 05:32:12 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2010/03/13 04:40:12 obache Exp $
 #
 
-DISTNAME=		lsh-2.0.2
-PKGREVISION=		1
+DISTNAME=		lsh-2.0.4
 CATEGORIES=		security
-MASTER_SITES=		http://www.lysator.liu.se/~nisse/archive/
+MASTER_SITES=		http://www.lysator.liu.se/~nisse/archive/ \
+			ftp://ftp.lysator.liu.se/pub/security/lsh/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.lysator.liu.se/~nisse/lsh/
 COMMENT=		SSH2 client/server
+LICENSE=		gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir		
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake gm4 bash:run
@@ -25,6 +28,8 @@ CONFLICTS+=		openssh-[0-9]* openssh+gssapi-[0-9]*
 # src/nettle/examples/nettle-openssl.c needs des_key*
 USE_OLD_DES_API=	yes
 
+.include "../../devel/argp/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/liboop/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/lsh/distinfo b/security/lsh/distinfo
index 8642b78498f..32cd82fc5f2 100644
--- a/security/lsh/distinfo
+++ b/security/lsh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2007/04/01 21:26:48 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/03/13 04:40:12 obache Exp $
 
-SHA1 (lsh-2.0.2.tar.gz) = baaf8de1368b0bd3b6c0e67e03f66284b910b54c
-RMD160 (lsh-2.0.2.tar.gz) = fa876113924a6045ecd302892dc0fbbec764dabe
-Size (lsh-2.0.2.tar.gz) = 2179353 bytes
-SHA1 (patch-aa) = 08cb6cf3f28ae2281d109e20dc9585111009ea50
-SHA1 (patch-ab) = 179647434ecf7a4b42e301f1ac1c794f217d69d0
+SHA1 (lsh-2.0.4.tar.gz) = c4e2a0b6a0e20dcba7fe02a0d5605bc00960106a
+RMD160 (lsh-2.0.4.tar.gz) = 24f16d6945f7c801aac190fd0109cad608a317de
+Size (lsh-2.0.4.tar.gz) = 2183843 bytes
+SHA1 (patch-aa) = ae43022c180e9f8ee2bb95fe424f371e834fdf07
+SHA1 (patch-ab) = e241831267630ffcf0b7079627e91c58482427c3
diff --git a/security/lsh/patches/patch-aa b/security/lsh/patches/patch-aa
index 1d2fe95d86d..1f76f196c8e 100644
--- a/security/lsh/patches/patch-aa
+++ b/security/lsh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2007/04/01 21:26:49 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2010/03/13 04:40:12 obache Exp $
 
---- src/unix_interact.c.orig	2003-10-14 19:12:21.000000000 +0200
-+++ src/unix_interact.c	2003-10-14 19:12:36.000000000 +0200
-@@ -261,7 +261,7 @@ do_make_raw(struct terminal_attributes *
+--- src/unix_interact.c.orig	2006-01-23 17:53:38.000000000 +0000
++++ src/unix_interact.c
+@@ -362,7 +362,7 @@ do_make_raw(struct terminal_attributes *
  
    /* Modify VMIN and VTIME, to save some bandwidth and make traffic
     * analysis of interactive sessions a little harder. */
diff --git a/security/lsh/patches/patch-ab b/security/lsh/patches/patch-ab
index 81f976b0d27..c2f8aec5493 100644
--- a/security/lsh/patches/patch-ab
+++ b/security/lsh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/04/01 21:26:49 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2010/03/13 04:40:12 obache Exp $
 
---- src/Makefile.in.orig	2003-10-14 20:17:54.000000000 +0200
-+++ src/Makefile.in	2003-10-14 20:18:14.000000000 +0200
-@@ -1110,10 +1110,6 @@
+--- src/Makefile.in.orig	2007-06-04 20:14:58.000000000 +0000
++++ src/Makefile.in
+@@ -1164,10 +1164,6 @@ depend:
  
  # This is GNU make specific