ports/79904: security/lsh: update to version 2.0.1

[Johan van Selst]

>Number:         79904
>Category:       ports
>Synopsis:       security/lsh: update to version 2.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 14 12:00:47 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Update to new stable version. lsh-2 has quite some improvements,
	see ANNOUNCE file for a comprehensive listing.

	While we're at it, clean up Makefile and add experimental USE_GPG

>How-To-Repeat:
	
>Fix:

	


diff -uNr lsh/Makefile lsh/Makefile
--- lsh/Makefile	Thu Apr 14 13:09:01 2005
+++ lsh/Makefile	Thu Apr 14 13:41:21 2005
@@ -5,13 +5,14 @@
 # $FreeBSD: ports/security/lsh/Makefile,v 1.28 2005/03/12 10:54:00 marcus Exp $
 
 PORTNAME=	lsh
-PORTVERSION=	1.5.3
-PORTREVISION=	3
+PORTVERSION=	2.0.1
 CATEGORIES=	security ipv6
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 		ftp://ftp.lysator.liu.se/pub/security/%SUBDIR%/
 MASTER_SITE_SUBDIR=	lsh lsh/old
 DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A secure (encrypted) remote shell compatible with ssh 2.0
@@ -26,6 +27,7 @@
 CONFIGURE_ARGS+=	--with-include-path=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-lib-path=${LOCALBASE}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
+USE_GPG?=	yes
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 PLIST_SUB+=	KRB=""
 .else
@@ -35,6 +37,13 @@
 LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
 .endif
+MAN1=		lsftp.1 ssh-conv.1 lshg.1 lsh.1 lsh-writekey.1 lsh-upgrade.1 \
+		lsh-upgrade-key.1 lsh-make-seed.1 lsh-keygen.1 \
+		lsh-export-key.1 lsh-decrypt-key.1 lsh-decode-key.1 \
+		lsh-authorize.1
+MAN5=		secsh.5 SPKI.5 SHA.5 DSA.5
+MAN8=		sftp-server.8 lshd.8
+INFO=		lsh nettle
 
 .include <bsd.port.pre.mk>
 
diff -uNr lsh/distinfo lsh/distinfo
--- lsh/distinfo	Thu Jan 29 17:11:31 2004
+++ lsh/distinfo	Thu Apr 14 13:45:47 2005
@@ -1,2 +1,4 @@
-MD5 (lsh-1.5.3.tar.gz) = 7fa504d4ee7b39c27cc35c372056d17b
-SIZE (lsh-1.5.3.tar.gz) = 1682922
+MD5 (lsh-2.0.1.tar.gz) = 25ca0b4385779de3d58d2d5757f495c3
+SIZE (lsh-2.0.1.tar.gz) = 1866063
+MD5 (lsh-2.0.1.tar.gz.asc) = 0982d7b8c6439b79771823882bcd36d4
+SIZE (lsh-2.0.1.tar.gz.asc) = 189
diff -uNr lsh/pkg-plist lsh/pkg-plist
--- lsh/pkg-plist	Sat Sep 20 22:50:40 2003
+++ lsh/pkg-plist	Thu Apr 14 13:35:42 2005
@@ -1,3 +1,4 @@
+bin/lcp
 bin/lsftp
 bin/lsh
 bin/lsh-authorize
@@ -16,8 +17,10 @@
 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
@@ -32,24 +35,20 @@
 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.h
+include/nettle/rsa-compat.h
 include/nettle/serpent.h
 include/nettle/sexp.h
 include/nettle/sha.h
 include/nettle/twofish.h
 include/nettle/yarrow.h
 @dirrm include/nettle
- at unexec install-info --delete %D/info/lsh.info %D/info/dir
- at unexec install-info --delete %D/info/nettle.info %D/info/dir
-info/lsh.info
-info/nettle.info
-info/nettle.info-1
-info/nettle.info-2
- at exec install-info %D/info/lsh.info %D/info/dir
- at exec install-info %D/info/nettle.info %D/info/dir
 lib/libnettle.a
 sbin/lsh-execuv
 %%KRB%%sbin/lsh-krb-checkpw
>Release-Note:
>Audit-Trail:
>Unformatted: