From 0caa91d0e23524a13242e6d3f52ec6424de8add2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 May 2011 17:13:43 +0000 Subject: [PATCH] Openssh5.8p2 version.h was corrected upstream and a new source file made available, so this removes that from the patch and uses the new source package. --- net-misc/openssh/openssh-5.8p2.bep | 4 ++-- net-misc/openssh/patches/openssh-5.8p2.patch | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/net-misc/openssh/openssh-5.8p2.bep b/net-misc/openssh/openssh-5.8p2.bep index 3d2039e48..d5d99c515 100644 --- a/net-misc/openssh/openssh-5.8p2.bep +++ b/net-misc/openssh/openssh-5.8p2.bep @@ -2,11 +2,11 @@ DESCRIPTION="OpenSSH" HOMEPAGE="http://www.openssh.com/" SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz" -REVISION="1" +REVISION="3" STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" -CHECKSUM_MD5="88a4a83b0e0e60cd545430d4e4bd7e0c" +CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e" BUILD { cd openssh-5.8p2 autoconf diff --git a/net-misc/openssh/patches/openssh-5.8p2.patch b/net-misc/openssh/patches/openssh-5.8p2.patch index 31e066952..4ac3769eb 100644 --- a/net-misc/openssh/patches/openssh-5.8p2.patch +++ b/net-misc/openssh/patches/openssh-5.8p2.patch @@ -137,13 +137,4 @@ 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