From 1501702d13cb76b617134cf8897861ab7f428c7f Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 5 May 2011 00:05:38 +0000
Subject: [PATCH] Fixed version.h version, and removed B_COMMON_SERVERS
 directory.  TODO: move some files that are ending up in /boot/common/lib,
 that should probably go into /boot/common/bin instead.

---
 net-misc/openssh/patches/openssh-5.8p2.patch | 25 +++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/net-misc/openssh/patches/openssh-5.8p2.patch b/net-misc/openssh/patches/openssh-5.8p2.patch
index 994692695..31e066952 100644
--- a/net-misc/openssh/patches/openssh-5.8p2.patch
+++ b/net-misc/openssh/patches/openssh-5.8p2.patch
@@ -1,7 +1,7 @@
 diff -urN openssh-5.8p2/configure.ac openssh-5.8p2-haiku/configure.ac
---- openssh-5.8p2/configure.ac	2011-01-21 22:37:05.026738688 +0000
-+++ openssh-5.8p2-haiku/configure.ac	2011-01-25 08:26:16.039583744 +0000
-@@ -1347,7 +1347,7 @@
+--- openssh-5.8p2/configure.ac	2011-02-04 00:42:14.007077888 +0000
++++ openssh-5.8p2-haiku/configure.ac	2011-05-04 16:01:02.093585408 +0000
+@@ -1345,7 +1345,7 @@
  			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
  			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
  		else
@@ -11,9 +11,9 @@ diff -urN openssh-5.8p2/configure.ac openssh-5.8p2-haiku/configure.ac
  		OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
  		AC_CHECK_LIB(edit, el_init,
 diff -urN openssh-5.8p2/pathnames.h openssh-5.8p2-haiku/pathnames.h
---- openssh-5.8p2/pathnames.h	2010-08-31 12:41:14.035651584 +0000
-+++ openssh-5.8p2-haiku/pathnames.h	2011-01-25 08:26:32.062914560 +0000
-@@ -12,7 +12,15 @@
+--- openssh-5.8p2/pathnames.h	2010-08-31 12:41:14.016252928 +0000
++++ openssh-5.8p2-haiku/pathnames.h	2011-05-04 16:01:02.127139840 +0000
+@@ -12,7 +12,14 @@
   * called by a name other than "ssh" or "Secure Shell".
   */
  
@@ -22,7 +22,6 @@ diff -urN openssh-5.8p2/pathnames.h openssh-5.8p2-haiku/pathnames.h
 +#define HAIKU_COMMON_SETTINGS_DIRECTORY		"/boot/common/settings"
 +#define HAIKU_COMMON_BIN_DIRECTORY		"/boot/common/bin"
 +#define HAIKU_COMMON_VAR_DIRECTORY		"/boot/common/var"
-+#define HAIKU_COMMON_SERVERS_DIRECTORY	"/boot/common/servers"
 +#define HAIKU_SYSTEM_BIN_DIRECTORY		"/boot/system/bin"
 +
 +
@@ -108,7 +107,7 @@ diff -urN openssh-5.8p2/pathnames.h openssh-5.8p2-haiku/pathnames.h
  /* for sftp */
  #ifndef _PATH_SFTP_SERVER
 -#define _PATH_SFTP_SERVER		"/usr/libexec/sftp-server"
-+#define _PATH_SFTP_SERVER		HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server"
++#define _PATH_SFTP_SERVER		HAIKU_COMMON_BIN_DIRECTORY"/sftp-server"
  #endif
  
  /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
@@ -138,3 +137,13 @@ diff -urN openssh-5.8p2/pathnames.h openssh-5.8p2-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-5.8p2/version.h openssh-5.8p2-haiku/version.h
+--- openssh-5.8p2/version.h	2011-02-04 00:48:57.027262976 +0000
++++ openssh-5.8p2-haiku/version.h	2011-05-04 16:05:12.604504064 +0000
+@@ -2,5 +2,5 @@
+ 
+ #define SSH_VERSION	"OpenSSH_5.8"
+ 
+-#define SSH_PORTABLE	"p1"
++#define SSH_PORTABLE	"p2"
+ #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE