mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
Update openssh 6.0p1 recipe and patch
* Back-port (and fix) the AuthorizedKeysFile change in sshd_config from 6.2p1. * Declare login and passwd as requires and find them via the package links directory. * configure.ac: Allow passing the path to passwd via the environment. * Remove all but the ".ssh" dir related changes from the pathnames.h patch. The other paths can be specified/overridden via configure, so we don't need to patch them. Same for LOGIN_PROGRAM in sshd_config. * Fix sysconfdir and libexecdir paths. The build system doesn't append a subdir path.
This commit is contained in:
@@ -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="2"
|
||||
REVISION="3"
|
||||
ARCHITECTURES="x86_gcc2 ?x86"
|
||||
|
||||
PATCHES="openssh-6.0p1.patch"
|
||||
@@ -26,6 +26,8 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
cmd:login
|
||||
cmd:passwd
|
||||
lib:libcrypto
|
||||
lib:libedit
|
||||
lib:libssl
|
||||
@@ -64,8 +66,16 @@ BUILD()
|
||||
defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
|
||||
defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
|
||||
defaultPath+=":/boot/system/preferences"
|
||||
|
||||
# Note: override sysconfdir and libexecdir since ssh doesn't create
|
||||
# subdirectories as it should.
|
||||
PATH_PASSWD_PROG=$portPackageLinksDir/cmd:passwd/bin/passwd \
|
||||
LOGIN_PROGRAM=$portPackageLinksDir/cmd:login/bin/login \
|
||||
runConfigure ./configure \
|
||||
--sysconfdir=$sysconfDir/openssh \
|
||||
--libexecdir=$libExecDir/openssh \
|
||||
--with-privsep-path=$dataDir/openssh/empty \
|
||||
--with-pid-dir=$prefix/var/run \
|
||||
--with-default-path="$defaultPath" \
|
||||
--with-md5-passwords \
|
||||
--disable-utmpx \
|
||||
|
||||
Reference in New Issue
Block a user