From f5da03cce0e07919c8ecaa5294c5cc6aa2353484 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 24 Jan 2011 19:27:20 +0000
Subject: [PATCH] Updated openssh to 5.7p1

---
 net-misc/openssh/openssh-5.7p1.bep           | 11 +++++----
 net-misc/openssh/patches/openssh-5.7p1.patch | 24 ++++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/net-misc/openssh/openssh-5.7p1.bep b/net-misc/openssh/openssh-5.7p1.bep
index 8612775a6..252fb3e06 100644
--- a/net-misc/openssh/openssh-5.7p1.bep
+++ b/net-misc/openssh/openssh-5.7p1.bep
@@ -1,13 +1,14 @@
 DESCRIPTION="OpenSSH" 
 HOMEPAGE="http://www.openssh.com/" 
-SRC_URI="http://www.mindrot.org/openssh_snap/openssh-SNAP-20110117.tar.gz"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.7p1.tar.gz
+	http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.7p1.tar.gz"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
-CHECKSUM_MD5="92332e0f363723d253d569ee7e7b9c2f"
+CHECKSUM_MD5="50231fa257219791fa41b84a16c9df04"
 BUILD {
-	cd openssh
+	cd openssh-5.7p1
 	autoconf
 	mkdir -p m4
 	cp /boot/common/share/aclocal/libtool.m4 m4
@@ -38,14 +39,14 @@ BUILD {
 }
 
 INSTALL {
-	cd openssh
+	cd openssh-5.7p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
 TEST {
-	cd openssh
+	cd openssh-5.7p1
 	make tests
 }
 
diff --git a/net-misc/openssh/patches/openssh-5.7p1.patch b/net-misc/openssh/patches/openssh-5.7p1.patch
index d9df0bf04..fc1b8579d 100644
--- a/net-misc/openssh/patches/openssh-5.7p1.patch
+++ b/net-misc/openssh/patches/openssh-5.7p1.patch
@@ -1,7 +1,7 @@
 diff -urN openssh-5.7p1/configure.ac openssh-5.7p1-haiku/configure.ac
---- openssh-5.7p1/configure.ac	2010-04-10 12:58:01.014942208 +0000
-+++ openssh-5.7p1-haiku/configure.ac	2010-04-30 05:09:08.936378368 +0000
-@@ -1277,7 +1277,7 @@
+--- openssh-5.7p1/configure.ac	2011-01-21 22:37:05.026738688 +0000
++++ openssh-5.7p1-haiku/configure.ac	2011-01-25 08:26:16.039583744 +0000
+@@ -1347,7 +1347,7 @@
  			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
  			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
  		else
@@ -11,8 +11,8 @@ diff -urN openssh-5.7p1/configure.ac openssh-5.7p1-haiku/configure.ac
  		OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
  		AC_CHECK_LIB(edit, el_init,
 diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
---- openssh-5.7p1/pathnames.h	2010-02-24 06:17:58.023592960 +0000
-+++ openssh-5.7p1-haiku/pathnames.h	2010-04-30 04:53:52.000000000 +0000
+--- openssh-5.7p1/pathnames.h	2010-08-31 12:41:14.035651584 +0000
++++ openssh-5.7p1-haiku/pathnames.h	2011-01-25 08:26:32.062914560 +0000
 @@ -12,7 +12,15 @@
   * called by a name other than "ssh" or "Secure Shell".
   */
@@ -30,7 +30,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  
  #ifndef SSHDIR
  #define SSHDIR				ETCDIR "/ssh"
-@@ -44,7 +52,7 @@
+@@ -45,7 +53,7 @@
  #define _PATH_DH_PRIMES			SSHDIR "/primes"
  
  #ifndef _PATH_SSH_PROGRAM
@@ -39,7 +39,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  #endif
  
  /*
-@@ -57,25 +65,25 @@
+@@ -58,25 +66,25 @@
   * The directory in user's home directory in which the files reside. The
   * directory should be world-readable (though not all files are).
   */
@@ -72,7 +72,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  
  /*
   * Configuration file in user's home directory.  This file need not be
-@@ -82,7 +90,7 @@
+@@ -84,7 +92,7 @@
   * particularly secret.  If the user's home directory resides on an NFS
   * volume where root is mapped to nobody, this may need to be world-readable.
   */
@@ -81,7 +81,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  
  /*
   * File containing a list of those rsa keys that permit logging in as this
-@@ -92,10 +100,10 @@
+@@ -94,10 +102,10 @@
   * may need to be world-readable.  (This file is read by the daemon which is
   * running as root.)
   */
@@ -94,7 +94,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  
  /*
   * Per-user and system-wide ssh "rc" files.  These files are executed with
-@@ -103,7 +111,7 @@
+@@ -105,7 +113,7 @@
   * passed "proto cookie" as arguments if X11 forwarding with spoofing is in
   * use.  xauth will be run if neither of these exists.
   */
@@ -103,7 +103,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  #define _PATH_SSH_SYSTEM_RC		SSHDIR "/sshrc"
  
  /*
-@@ -147,17 +155,16 @@
+@@ -149,17 +157,16 @@
  
  /* for sftp */
  #ifndef _PATH_SFTP_SERVER
@@ -124,7 +124,7 @@ diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h
  #endif
  
  #ifndef _PATH_LS
-@@ -169,11 +176,11 @@
+@@ -171,11 +178,11 @@
  # ifdef LOGIN_PROGRAM_FALLBACK
  #  define LOGIN_PROGRAM         LOGIN_PROGRAM_FALLBACK
  # else