From 45561e67fa69bf545a6ee63fba2edc8a43d16bfb Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 4 Apr 2013 10:07:10 +0000
Subject: [PATCH] Updated openssh6.2p1 patch to fix #634.

(cherry picked from commit d94cb3b1c96cabf8f89bf4376cef3a26a8bd6f93)
---
 net-misc/openssh/patches/openssh-6.2p1.patch | 37 +++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/net-misc/openssh/patches/openssh-6.2p1.patch b/net-misc/openssh/patches/openssh-6.2p1.patch
index 9b07a81f7..e1d32fb91 100644
--- a/net-misc/openssh/patches/openssh-6.2p1.patch
+++ b/net-misc/openssh/patches/openssh-6.2p1.patch
@@ -1,7 +1,7 @@
 diff -urN openssh-6.2p1/configure.ac openssh-6.2p1-haiku/configure.ac
---- openssh-6.2p1/configure.ac
-+++ openssh-6.2p1-haiku/configure.ac
-@@ -1426,7 +1426,7 @@
+--- openssh-6.2p1/configure.ac	2013-03-20 01:55:15.047972352 +0000
++++ openssh-6.2p1-haiku/configure.ac	2013-04-04 09:11:04.187957248 +0000
+@@ -1430,7 +1430,7 @@
  			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
  			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
  		else
@@ -9,10 +9,10 @@ diff -urN openssh-6.2p1/configure.ac openssh-6.2p1-haiku/configure.ac
 +			AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"]))
  		fi
  		OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
- 		AC_CHECK_LIB(edit, el_init,
+ 		AC_CHECK_LIB([edit], [el_init],
 diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
---- openssh-6.2p1/pathnames.h
-+++ openssh-6.2p1-haiku/pathnames.h
+--- openssh-6.2p1/pathnames.h	2011-05-29 11:39:38.057409536 +0000
++++ openssh-6.2p1-haiku/pathnames.h	2013-04-04 09:11:10.076283904 +0000
 @@ -12,7 +12,14 @@
   * called by a name other than "ssh" or "Secure Shell".
   */
@@ -29,7 +29,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  
  #ifndef SSHDIR
  #define SSHDIR				ETCDIR "/ssh"
-@@ -45,7 +53,7 @@
+@@ -45,7 +52,7 @@
  #define _PATH_DH_PRIMES			SSHDIR "/primes"
  
  #ifndef _PATH_SSH_PROGRAM
@@ -38,7 +38,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  #endif
  
  /*
-@@ -58,25 +66,25 @@
+@@ -58,25 +65,25 @@
   * The directory in user's home directory in which the files reside. The
   * directory should be world-readable (though not all files are).
   */
@@ -71,7 +71,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  
  /*
   * Configuration file in user's home directory.  This file need not be
-@@ -84,7 +92,7 @@
+@@ -84,7 +91,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.
   */
@@ -80,7 +80,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  
  /*
   * File containing a list of those rsa keys that permit logging in as this
-@@ -94,10 +102,10 @@
+@@ -94,10 +101,10 @@
   * may need to be world-readable.  (This file is read by the daemon which is
   * running as root.)
   */
@@ -93,7 +93,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  
  /*
   * Per-user and system-wide ssh "rc" files.  These files are executed with
-@@ -105,7 +113,7 @@
+@@ -105,7 +112,7 @@
   * passed "proto cookie" as arguments if X11 forwarding with spoofing is in
   * use.  xauth will be run if neither of these exists.
   */
@@ -102,7 +102,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  #define _PATH_SSH_SYSTEM_RC		SSHDIR "/sshrc"
  
  /*
-@@ -149,17 +157,16 @@
+@@ -149,17 +156,16 @@
  
  /* for sftp */
  #ifndef _PATH_SFTP_SERVER
@@ -123,7 +123,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
  #endif
  
  #ifndef _PATH_LS
-@@ -171,11 +178,11 @@
+@@ -171,11 +177,11 @@
  # ifdef LOGIN_PROGRAM_FALLBACK
  #  define LOGIN_PROGRAM         LOGIN_PROGRAM_FALLBACK
  # else
@@ -137,4 +137,15 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
 -#define ASKPASS_PROGRAM         "/usr/lib/ssh/ssh-askpass"
 +#define ASKPASS_PROGRAM         HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass"
  #endif /* ASKPASS_PROGRAM */
+diff -urN openssh-6.2p1/sshd_config openssh-6.2p1-haiku/sshd_config
+--- openssh-6.2p1/sshd_config	2013-02-12 00:02:09.066846720 +0000
++++ openssh-6.2p1-haiku/sshd_config	2013-04-04 09:02:19.284426240 +0000
+@@ -47,7 +47,7 @@
+ 
+ # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+ # but this is overridden so installations will only check .ssh/authorized_keys
+-AuthorizedKeysFile	.ssh/authorized_keys
++AuthorizedKeysFile	config/settings/ssh
+ 
+ #AuthorizedPrincipalsFile none