From c7a47824839caeec231da98cd31e1ecea6d7b440 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 29 Apr 2013 00:43:36 +0200
Subject: [PATCH] Convert openssh 5.8p2 recipe to actual recipe

---
 net-misc/openssh/openssh-5.8p2.recipe | 109 +++++++++++++++++---------
 1 file changed, 74 insertions(+), 35 deletions(-)

diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe
index 5fd558387..b3b5d972c 100644
--- a/net-misc/openssh/openssh-5.8p2.recipe
+++ b/net-misc/openssh/openssh-5.8p2.recipe
@@ -1,55 +1,94 @@
-DESCRIPTION="OpenSSH" 
+SUMMARY="Secure Shell Client and Server (Remote Login Program)"
 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="3"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/openssl >= 1.0.0
-	dev-libs/libedit >= 20090923"
+LICENSE="OpenSSH"
+COPYRIGHT="2005-2011 Tatu Ylonen et al."
+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
+	"
 CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="openssh-5.8p2.patch"
+
+PROVIDES="
+	openssh = $portVersion compat >= 5
+	cmd:scp = $portVersion compat >= 5
+	cmd:sftp = $portVersion compat >= 5
+	cmd:sftp_server = $portVersion compat >= 5
+	cmd:slogin = $portVersion compat >= 5
+	cmd:ssh = $portVersion compat >= 5
+	cmd:ssh_add = $portVersion compat >= 5
+	cmd:ssh_agent = $portVersion compat >= 5
+	cmd:ssh_keygen = $portVersion compat >= 5
+	cmd:ssh_keyscan = $portVersion compat >= 5
+	cmd:ssh_keysign = $portVersion compat >= 5
+	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
+	cmd:sshd = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libcrypto
+	lib:libedit
+	lib:libssl
+	lib:libz
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	openssl
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCH()
+{
+	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
+}
+
 BUILD()
 {
-	cd openssh-5.8p2
-	autoconf
 	mkdir -p m4
 	aclocal --install -I m4
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
 	libtoolize --force --copy
 	aclocal -I m4
 	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	COMMON_DIR=`finddir B_COMMON_DIRECTORY`
-	./configure --prefix=$COMMON_DIR \
-	--sbindir=$COMMON_BIN \
-	--bindir=$COMMON_BIN \
-	--libexecdir=$COMMON_BIN \
-	--sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \
-	--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-	--includedir=$COMMON_DIR/include \
-	--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-	--mandir=$COMMON_DOCS/man \
-	--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \
-	--with-default-path=${PATH} \
-	--with-md5-passwords \
-	--disable-utmpx \
-	--with-libedit
-	make
+	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
+	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
+	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
+	defaultPath+=":/boot/system/preferences"
+	runConfigure ./configure \
+		--with-privsep-path=$dataDir/openssh/empty \
+		--with-default-path="$defaultPath" \
+		--with-md5-passwords \
+		--disable-utmpx \
+		--with-libedit
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd openssh-5.8p2
-	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
+	make install-nokeys
+	postInstallDir=$prefix/boot/post_install
+	mkdir -p $postInstallDir
+	cp -f $portDir/sshd_keymaker.sh $postInstallDir
 }
 
 TEST()
 {
-	cd openssh-5.8p2
 	make tests
 }
 
-LICENSE="OpenSSH"
-COPYRIGHT="2005-2011 Tatu Ylonen et al."
+DESCRIPTION="OpenSSH is a FREE version of the SSH connectivity tools that technical users of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH provides secure tunneling capabilities and several authentication methods, and supports all SSH protocol versions.
+
+The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with scp, and ftp with sftp. Also included is sshd (the server side of the package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, ssh-keygen and sftp-server."