From 205db01824147e65ea7e90177d44656623b33aa7 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 18 Jun 2013 01:59:42 +0200
Subject: [PATCH] openssh: update recipe

* Update [BUILD_]REQUIRES.
* Add GLOBAL_WRITABLE_FILES, USER_SETTINGS_FILES, POST_INSTALL_SCRIPTS,
  and PACKAGE_USERS attributes.
* Change global settings directory back to $sysconfDir/ssh (as expected
  by sshd_keymaker.sh).
---
 net-misc/openssh/openssh-6.0p1.recipe | 28 ++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe
index ee8ac8425..0ba3dbc5c 100644
--- a/net-misc/openssh/openssh-6.0p1.recipe
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -4,7 +4,7 @@ LICENSE="OpenSSH"
 COPYRIGHT="2005-2012 Tatu Ylonen et al."
 SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz"
 CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="openssh-6.0p1.patch"
@@ -30,12 +30,11 @@ REQUIRES="
 	cmd:passwd
 	lib:libcrypto
 	lib:libedit
+	lib:libncurses
 	lib:libssl
 	lib:libz
 	"
 BUILD_REQUIRES="
-	$REQUIRES
-	openssl
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -43,11 +42,31 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:pkg_config
+	devel:libcrypto
+	devel:libedit
+	devel:libncurses
+	devel:libssl
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	"
 
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+
 SOURCE_DIR="$portVersionedName"
 
 PATCH()
@@ -72,7 +91,7 @@ BUILD()
 	PATH_PASSWD_PROG=$portPackageLinksDir/cmd:passwd/bin/passwd \
 	LOGIN_PROGRAM=$portPackageLinksDir/cmd:login/bin/login \
 	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/openssh \
+		--sysconfdir=$sysconfDir/ssh \
 		--libexecdir=$libExecDir/openssh \
 		--with-privsep-path=$dataDir/openssh/empty \
 		--with-pid-dir=$prefix/var/run \
@@ -86,7 +105,6 @@ BUILD()
 INSTALL()
 {
 	make install-nokeys
-	postInstallDir=$prefix/boot/post_install
 	mkdir -p $postInstallDir
 	cp -f $portDir/sshd_keymaker.sh $postInstallDir
 }