Move the freshly update lsh-2.0.1 into a separate pkg and leave

security/lsh at 1.4.3.
lsh-2.0.1 has interoperability problems with openssh servers
(always gets "Invalid server signature" errors).
lsh-1.4.3 is not affected by CAN-2003-0826. Add a patch to address
CAN-2005-0814 and bump PKGREVISION.

4 files changed, 30 insertions, 50 deletions

diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index e6b85dd6b35..76df29bca41 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,26 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2005/04/28 14:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/30 12:23:42 drochner Exp $
 #
 
-DISTNAME=		lsh-2.0.1
+DISTNAME=		lsh-1.4.3
+PKGREVISION=	2
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.lysator.liu.se/pub/security/lsh/
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.lysator.liu.se/~nisse/lsh/
-COMMENT=		SSH2 client/server
+COMMENT=		ssh2 client/server
 
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 
-# man/man8/sftp-server.8
-CONFLICTS+=		openssh-[0-9]* openssh+gssapi-[0-9]*
-
-# src/nettle/examples/nettle-openssl.c needs des_key*
-USE_OLD_DES_API=	yes
-
-INFO_FILES=		lsh.info nettle.info
-
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/liboop/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/lsh/PLIST b/security/lsh/PLIST
index c32f4d543e5..bf394402516 100644
--- a/security/lsh/PLIST
+++ b/security/lsh/PLIST
@@ -1,75 +1,49 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/28 14:10:04 wiz Exp $
-bin/lcp
+@comment $NetBSD: PLIST,v 1.3 2005/04/30 12:23:42 drochner Exp $
 bin/lsftp
 bin/lsh
 bin/lsh-authorize
 bin/lsh-decode-key
-bin/lsh-decrypt-key
 bin/lsh-export-key
 bin/lsh-keygen
 bin/lsh-make-seed
-bin/lsh-upgrade
-bin/lsh-upgrade-key
 bin/lsh-writekey
 bin/lshg
-bin/nettle-lfib-stream
 bin/sexp-conv
 bin/srp-gen
 bin/ssh-conv
 include/nettle/aes.h
 include/nettle/arcfour.h
-include/nettle/arctwo.h
-include/nettle/base16.h
 include/nettle/base64.h
-include/nettle/bignum.h
 include/nettle/blowfish.h
-include/nettle/buffer.h
 include/nettle/cast128.h
 include/nettle/cbc.h
 include/nettle/des-compat.h
 include/nettle/des.h
-include/nettle/dsa.h
 include/nettle/hmac.h
 include/nettle/knuth-lfib.h
-include/nettle/macros.h
-include/nettle/md2.h
-include/nettle/md4.h
 include/nettle/md5-compat.h
 include/nettle/md5.h
-include/nettle/memxor.h
 include/nettle/nettle-meta.h
-include/nettle/nettle-types.h
-include/nettle/pgp.h
-include/nettle/pkcs1.h
-include/nettle/realloc.h
-include/nettle/rsa-compat.h
 include/nettle/rsa.h
 include/nettle/serpent.h
-include/nettle/sexp.h
 include/nettle/sha.h
 include/nettle/twofish.h
 include/nettle/yarrow.h
+info/lsh.info
+info/nettle.info
+info/nettle.info-1
+info/nettle.info-2
 lib/libnettle.a
-man/man1/lsftp.1
-man/man1/lsh-authorize.1
-man/man1/lsh-decode-key.1
-man/man1/lsh-decrypt-key.1
-man/man1/lsh-export-key.1
-man/man1/lsh-keygen.1
-man/man1/lsh-make-seed.1
-man/man1/lsh-upgrade-key.1
-man/man1/lsh-upgrade.1
-man/man1/lsh-writekey.1
 man/man1/lsh.1
-man/man1/lshg.1
-man/man1/ssh-conv.1
+man/man1/lsh_keygen.1
+man/man1/lsh_writekey.1
 man/man5/DSA.5
 man/man5/SHA.5
 man/man5/SPKI.5
 man/man5/secsh.5
 man/man8/lshd.8
-man/man8/sftp-server.8
 sbin/lsh-execuv
+sbin/lsh_proxy
 sbin/lshd
 sbin/sftp-server
 @dirrm include/nettle
diff --git a/security/lsh/distinfo b/security/lsh/distinfo
index 3349a1e72e4..cb9a796035a 100644
--- a/security/lsh/distinfo
+++ b/security/lsh/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/04/28 14:10:04 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/04/30 12:23:42 drochner Exp $
 
-SHA1 (lsh-2.0.1.tar.gz) = 58f4829f29b12c1b96463c2b0efcba6d6e553081
-RMD160 (lsh-2.0.1.tar.gz) = 61541e8e8b6fb8f026059eaf0a2dc6f396aaa4cf
-Size (lsh-2.0.1.tar.gz) = 1866063 bytes
+SHA1 (lsh-1.4.3.tar.gz) = 25cb15a0851b3209cc5b3552344fedf80221ad6f
+RMD160 (lsh-1.4.3.tar.gz) = c5bc410396f6426e2e609ded97296424d8a3bd46
+Size (lsh-1.4.3.tar.gz) = 1414008 bytes
 SHA1 (patch-aa) = 08cb6cf3f28ae2281d109e20dc9585111009ea50
 SHA1 (patch-ab) = 179647434ecf7a4b42e301f1ac1c794f217d69d0
+SHA1 (patch-ac) = af2659ae7edb797481172c467936383e6d5a7f8a
diff --git a/security/lsh/patches/patch-ac b/security/lsh/patches/patch-ac
new file mode 100644
index 00000000000..533c8d39eda
--- /dev/null
+++ b/security/lsh/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/04/30 12:23:42 drochner Exp $
+
+--- src/keyexchange.c.orig	2005-04-29 17:39:35.000000000 +0200
++++ src/keyexchange.c
+@@ -113,7 +113,7 @@ parse_kexinit(struct lsh_string *packet)
+       /* Bad format */
+       int j;
+       for (j = 0; j<i; j++)
+-	KILL(lists[i]);
++	KILL(lists[j]);
+       KILL(res);
+       return NULL;
+     }