From 5a89fe4299a832767e8681734897d68b23dd6297 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 24 Sep 2012 19:06:11 +0000 Subject: [PATCH] Updated patch for openssh-6.0p1, this should fix #633, also for 6.1p1, untested yet. --- net-misc/openssh/patches/openssh-6.0p1.patch | 27 ++++++++++---------- net-misc/openssh/patches/openssh-6.1p1.patch | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/net-misc/openssh/patches/openssh-6.0p1.patch b/net-misc/openssh/patches/openssh-6.0p1.patch index 7d5209f76..a61ef0c9e 100644 --- a/net-misc/openssh/patches/openssh-6.0p1.patch +++ b/net-misc/openssh/patches/openssh-6.0p1.patch @@ -1,6 +1,6 @@ diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-haiku/configure.ac ---- openssh-6.0p1/configure.ac 2011-02-04 00:42:14.007077888 +0000 -+++ openssh-6.0p1-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000 +--- openssh-6.0p1/configure.ac 2012-04-19 11:46:38.030408704 +0000 ++++ openssh-6.0p1-haiku/configure.ac 2012-09-24 16:55:13.139198464 +0000 @@ -1432,7 +1432,7 @@ LIBEDIT=`$PKGCONFIG --libs-only-l libedit` CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" @@ -9,10 +9,10 @@ diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-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.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h ---- openssh-6.0p1/pathnames.h 2010-08-31 12:41:14.016252928 +0000 -+++ openssh-6.0p1-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000 +--- openssh-6.0p1/pathnames.h 2011-05-29 11:39:38.039583744 +0000 ++++ openssh-6.0p1-haiku/pathnames.h 2012-09-24 16:55:13.148373504 +0000 @@ -12,7 +12,14 @@ * called by a name other than "ssh" or "Secure Shell". */ @@ -29,16 +29,16 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-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 -#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY ++#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY #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.0p1/pathnames.h openssh-6.0p1-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.0p1/pathnames.h openssh-6.0p1-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.0p1/pathnames.h openssh-6.0p1-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.0p1/pathnames.h openssh-6.0p1-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.0p1/pathnames.h openssh-6.0p1-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,3 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-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 --git a/net-misc/openssh/patches/openssh-6.1p1.patch b/net-misc/openssh/patches/openssh-6.1p1.patch index 987fedcff..fb88db8d5 100644 --- a/net-misc/openssh/patches/openssh-6.1p1.patch +++ b/net-misc/openssh/patches/openssh-6.1p1.patch @@ -34,7 +34,7 @@ diff -urN openssh-6.1p1/pathnames.h openssh-6.1p1-haiku/pathnames.h #ifndef _PATH_SSH_PROGRAM -#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY ++#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY #endif /*