From 9e45884d6991cf7264a36966684a4240bde29f71 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 15 Mar 2010 12:25:02 +0800
Subject: lsh: Upgrade to the latest version to address two CVEs

CVE-2003-0826, CVE-2005-0814
---
 conf/checksums.ini       |  4 ----
 recipes/lsh/lsh_1.5.5.bb | 35 -----------------------------------
 recipes/lsh/lsh_2.0.4.bb | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 recipes/lsh/lsh_1.5.5.bb
 create mode 100644 recipes/lsh/lsh_2.0.4.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 70346bf92c..f1c94f6462 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -18050,10 +18050,6 @@ sha256=b1f136a1d89daa4b1b9711eb81ad120b53c9357d159f262021b84ef8c9d128be
 md5=b5ce6a74abc9b9eb2af94dffdfd372a4
 sha256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
 
-[http://www.lysator.liu.se/~nisse/archive/lsh-1.5.5.tar.gz]
-md5=a2b1ff6f5dcca6968516b5557c2e7ce7
-sha256=d1c10ca755db2f5fa8aa7c8ef2770d205a9bb9e5a6ed7272a5dda942647df4be
-
 [ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.77.tar.bz2]
 md5=7b0de0d1283f2d86407a98e5c2f05f04
 sha256=fe6fde629a97a2855e608cd6ae1f89e66ae42d7045499b1a6faca5cfb50f5f3b
diff --git a/recipes/lsh/lsh_1.5.5.bb b/recipes/lsh/lsh_1.5.5.bb
deleted file mode 100644
index 284a0100eb..0000000000
--- a/recipes/lsh/lsh_1.5.5.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/network"
-DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \
-(version 2) protocol. It includes a server, a client, and some \
-utility programs."
-DEPENDS = "zlib gmp liboop"
-
-SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz"
-S = "${WORKDIR}/lsh-${PV}"
-
-inherit autotools
-configopts = "  --enable-debug-alloc    Enable memory allocation sanity checks \
-		--enable-debug-trace    Enable tracing support \
-		--enable-gcov           Instrument for gcov (requires a modern gcc) \
-		--without-pty           Disable pty support \
-		--disable-srp           Disable the (experimental) support for SRP \
-		--disable-kerberos      Don't support kerberos \
-		--disable-pam           Don't support PAM \
-		--disable-datafellows-workarounds \
-		--enable-initgroups-workaround \
-		--disable-tcp-forward   Disable tcp forwarding \
-		--disable-x11-forward   Disable x11 forwarding (proxy only) \
-		--disable-agent-forward Disable auth-agent forwarding (proxy only) \
-		--disable-ipv6          Disable IPv6 support \
-		--disable-utmp          Disable utmp and wtmp support \
-		--without-zlib          Don't use zlib compression \
-		--with-tcpwrappers      Use tcp-wrappers for filtering connections \
-		--with-sshd1=PROGRAM support fallback to SSH1 daemon \
-		--with-scheme=PROGRAM Use a particular scheme implementation \
-		--without-system-argp   Don't use the system's argp \
-		--with-include-path     A colon-separated list of directories to search for \
-		--with-lib-path         A colon-separated list of directories to search for \
-		--with-x                use the X Window System"
-EXTRA_OECONF = "--disable-srp --disable-kerberos --disable-pam \
-		--without-x"
diff --git a/recipes/lsh/lsh_2.0.4.bb b/recipes/lsh/lsh_2.0.4.bb
new file mode 100644
index 0000000000..99d53583a5
--- /dev/null
+++ b/recipes/lsh/lsh_2.0.4.bb
@@ -0,0 +1,37 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \
+(version 2) protocol. It includes a server, a client, and some \
+utility programs."
+DEPENDS = "zlib gmp liboop"
+
+SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz;name=src"
+SRC_URI[src.md5sum] = "621f4442332bb772b92d397d17ccaf02"
+SRC_URI[src.sha256sum] = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091"
+S = "${WORKDIR}/lsh-${PV}"
+
+inherit autotools
+configopts = "  --enable-debug-alloc    Enable memory allocation sanity checks \
+		--enable-debug-trace    Enable tracing support \
+		--enable-gcov           Instrument for gcov (requires a modern gcc) \
+		--without-pty           Disable pty support \
+		--disable-srp           Disable the (experimental) support for SRP \
+		--disable-kerberos      Don't support kerberos \
+		--disable-pam           Don't support PAM \
+		--disable-datafellows-workarounds \
+		--enable-initgroups-workaround \
+		--disable-tcp-forward   Disable tcp forwarding \
+		--disable-x11-forward   Disable x11 forwarding (proxy only) \
+		--disable-agent-forward Disable auth-agent forwarding (proxy only) \
+		--disable-ipv6          Disable IPv6 support \
+		--disable-utmp          Disable utmp and wtmp support \
+		--without-zlib          Don't use zlib compression \
+		--with-tcpwrappers      Use tcp-wrappers for filtering connections \
+		--with-sshd1=PROGRAM support fallback to SSH1 daemon \
+		--with-scheme=PROGRAM Use a particular scheme implementation \
+		--without-system-argp   Don't use the system's argp \
+		--with-include-path     A colon-separated list of directories to search for \
+		--with-lib-path         A colon-separated list of directories to search for \
+		--with-x                use the X Window System"
+EXTRA_OECONF = "--disable-srp --disable-kerberos --disable-pam \
+		--without-x"
-- 
cgit v1.2.3