From f4011eb4663693de10a457dc9f122af0db5d5838 Mon Sep 17 00:00:00 2001
From: snj <snj@pkgsrc.org>
Date: Thu, 12 May 2005 22:36:02 +0000
Subject: Pullup ticket 492 - requested by Lubomir Sedlacik security fix for
 lsh

Revisions pulled up:
- pkgsrc/security/lsh/Makefile		1.8
- pkgsrc/security/lsh/distinfo		1.4
- pkgsrc/security/lsh/patches/patch-ac	1.1

    Module Name:    pkgsrc
    Committed By:   drochner
    Date:           Sat Apr 30 12:23:42 UTC 2005

    Modified Files:
            pkgsrc/security/lsh: Makefile PLIST distinfo
    Added Files:
            pkgsrc/security/lsh/patches: patch-ac
            pkgsrc/security/lsh2: DESCR Makefile PLIST distinfo
            pkgsrc/security/lsh2/patches: patch-aa patch-ab

    Log Message:
    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.
---
 security/lsh/Makefile         |  4 ++--
 security/lsh/distinfo         |  3 ++-
 security/lsh/patches/patch-ac | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 security/lsh/patches/patch-ac

(limited to 'security')

diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 4be82142ab2..6ab5d8f54de 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2005/05/12 22:36:02 snj Exp $
 #
 
 DISTNAME=		lsh-1.4.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.lysator.liu.se/pub/security/lsh/
 
diff --git a/security/lsh/distinfo b/security/lsh/distinfo
index 24b0b30b7d7..a6108f0c8eb 100644
--- a/security/lsh/distinfo
+++ b/security/lsh/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.2.2.1 2005/05/12 22:36:02 snj Exp $
 
 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..32717e200c4
--- /dev/null
+++ b/security/lsh/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.2.2 2005/05/12 22:36:03 snj 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;
+     }
-- 
cgit v1.2.3