pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security Move the freshly update lsh-2.0.1 into a sepa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f664a72948aa
branches: trunk
changeset: 493230:f664a72948aa
user: drochner <drochner%pkgsrc.org@localhost>
date: Sat Apr 30 12:23:42 2005 +0000
description:
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.
diffstat:
security/lsh/Makefile | 16 ++------
security/lsh/PLIST | 42 ++++-------------------
security/lsh/distinfo | 9 ++--
security/lsh/patches/patch-ac | 13 +++++++
security/lsh2/DESCR | 1 +
security/lsh2/Makefile | 26 ++++++++++++++
security/lsh2/PLIST | 75 ++++++++++++++++++++++++++++++++++++++++++
security/lsh2/distinfo | 7 +++
security/lsh2/patches/patch-aa | 13 +++++++
security/lsh2/patches/patch-ab | 15 ++++++++
10 files changed, 167 insertions(+), 50 deletions(-)
diffs (truncated from 315 to 300 lines):
diff -r dfc7f9e3b241 -r f664a72948aa security/lsh/Makefile
--- a/security/lsh/Makefile Sat Apr 30 11:50:42 2005 +0000
+++ b/security/lsh/Makefile Sat Apr 30 12:23:42 2005 +0000
@@ -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@localhost
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 -r dfc7f9e3b241 -r f664a72948aa security/lsh/PLIST
--- a/security/lsh/PLIST Sat Apr 30 11:50:42 2005 +0000
+++ b/security/lsh/PLIST Sat Apr 30 12:23:42 2005 +0000
@@ -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 -r dfc7f9e3b241 -r f664a72948aa security/lsh/distinfo
--- a/security/lsh/distinfo Sat Apr 30 11:50:42 2005 +0000
+++ b/security/lsh/distinfo Sat Apr 30 12:23:42 2005 +0000
@@ -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 -r dfc7f9e3b241 -r f664a72948aa security/lsh/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh/patches/patch-ac Sat Apr 30 12:23:42 2005 +0000
@@ -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;
+ }
diff -r dfc7f9e3b241 -r f664a72948aa security/lsh2/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh2/DESCR Sat Apr 30 12:23:42 2005 +0000
@@ -0,0 +1,1 @@
+lsh is an alternative (GNU licensed) ssh2 client/server.
diff -r dfc7f9e3b241 -r f664a72948aa security/lsh2/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh2/Makefile Sat Apr 30 12:23:42 2005 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2005/04/30 12:23:42 drochner Exp $
+#
+
+DISTNAME= lsh-2.0.1
+CATEGORIES= security
+MASTER_SITES= ftp://ftp.lysator.liu.se/pub/security/lsh/
+
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://www.lysator.liu.se/~nisse/lsh/
+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 -r dfc7f9e3b241 -r f664a72948aa security/lsh2/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh2/PLIST Sat Apr 30 12:23:42 2005 +0000
@@ -0,0 +1,75 @@
+@comment $NetBSD: PLIST,v 1.1 2005/04/30 12:23:42 drochner Exp $
+bin/lcp
+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
+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/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/lshd
+sbin/sftp-server
+@dirrm include/nettle
diff -r dfc7f9e3b241 -r f664a72948aa security/lsh2/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh2/distinfo Sat Apr 30 12:23:42 2005 +0000
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 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 (patch-aa) = 08cb6cf3f28ae2281d109e20dc9585111009ea50
+SHA1 (patch-ab) = 179647434ecf7a4b42e301f1ac1c794f217d69d0
diff -r dfc7f9e3b241 -r f664a72948aa security/lsh2/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh2/patches/patch-aa Sat Apr 30 12:23:42 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/04/30 12:23:42 drochner 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 *
+
+ /* Modify VMIN and VTIME, to save some bandwidth and make traffic
+ * analysis of interactive sessions a little harder. */
+- res->ios.c_cc[VMIN] = 4;
++ res->ios.c_cc[VMIN] = 1;
+ /* Inter-character timer, in units of 0.1s */
+ res->ios.c_cc[VTIME] = 1;
+
diff -r dfc7f9e3b241 -r f664a72948aa security/lsh2/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lsh2/patches/patch-ab Sat Apr 30 12:23:42 2005 +0000
@@ -0,0 +1,15 @@
Home |
Main Index |
Thread Index |
Old Index