mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
openssh: bump version.
* remove oldest recipes.
This commit is contained in:
Jerome Duval
@@ -1,104 +0,0 @@
|
|||||||
SUMMARY="Secure Shell Client and Server (Remote Login Program)"
|
|
||||||
HOMEPAGE="http://www.openssh.com/"
|
|
||||||
LICENSE="OpenSSH"
|
|
||||||
COPYRIGHT="2005-2011 Tatu Ylonen et al."
|
|
||||||
SOURCE_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_SHA256="5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
|
|
||||||
REVISION="4"
|
|
||||||
ARCHITECTURES="x86_gcc2 ?x86"
|
|
||||||
|
|
||||||
PATCHES="openssh-5.8p2.patch"
|
|
||||||
|
|
||||||
ADDITIONAL_FILES="sshd_keymaker.sh"
|
|
||||||
|
|
||||||
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
|
|
||||||
lib:libcrypto
|
|
||||||
lib:libedit
|
|
||||||
lib:libssl
|
|
||||||
lib:libz
|
|
||||||
"
|
|
||||||
BUILD_REQUIRES="
|
|
||||||
openssl
|
|
||||||
"
|
|
||||||
BUILD_PREREQUIRES="
|
|
||||||
haiku_devel
|
|
||||||
cmd:aclocal
|
|
||||||
cmd:autoconf
|
|
||||||
cmd:automake
|
|
||||||
cmd:gcc
|
|
||||||
cmd:ld
|
|
||||||
cmd:libtoolize
|
|
||||||
cmd:make
|
|
||||||
"
|
|
||||||
|
|
||||||
|
|
||||||
PATCH()
|
|
||||||
{
|
|
||||||
echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
|
|
||||||
}
|
|
||||||
|
|
||||||
BUILD()
|
|
||||||
{
|
|
||||||
mkdir -p m4
|
|
||||||
aclocal --install -I m4
|
|
||||||
libtoolize --force --copy
|
|
||||||
aclocal -I m4
|
|
||||||
autoconf
|
|
||||||
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()
|
|
||||||
{
|
|
||||||
make install-nokeys
|
|
||||||
postInstallDir=$prefix/boot/post_install
|
|
||||||
mkdir -p $postInstallDir
|
|
||||||
cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST()
|
|
||||||
{
|
|
||||||
make tests
|
|
||||||
}
|
|
||||||
|
|
||||||
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.
|
|
||||||
"
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
DESCRIPTION="OpenSSH"
|
|
||||||
HOMEPAGE="http://www.openssh.com/"
|
|
||||||
SOURCE_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.1p1.tar.gz"
|
|
||||||
REVISION="1"
|
|
||||||
STATUS_HAIKU="stable"
|
|
||||||
DEPEND="dev-libs/openssl >= 1.0.0
|
|
||||||
dev-libs/libedit >= 20090923"
|
|
||||||
CHECKSUM_MD5="3345cbf4efe90ffb06a78670ab2d05d5"
|
|
||||||
BUILD()
|
|
||||||
{
|
|
||||||
cd openssh-6.1p1
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
INSTALL()
|
|
||||||
{
|
|
||||||
cd openssh-6.1p1
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST()
|
|
||||||
{
|
|
||||||
cd openssh-6.1p1
|
|
||||||
|
|
||||||
make tests
|
|
||||||
}
|
|
||||||
|
|
||||||
LICENSE="OpenSSH"
|
|
||||||
COPYRIGHT="2005-2012 Tatu Ylonen et al."
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
DESCRIPTION="OpenSSH"
|
|
||||||
HOMEPAGE="http://www.openssh.com/"
|
|
||||||
SOURCE_URI="http://ftp5.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.2p1.tar.gz"
|
|
||||||
REVISION="1"
|
|
||||||
STATUS_HAIKU="stable"
|
|
||||||
DEPEND="dev-libs/openssl >= 1.0.0
|
|
||||||
dev-libs/libedit >= 20090923"
|
|
||||||
CHECKSUM_MD5="7b2d9dd75b5cf267ea1737ec75500316"
|
|
||||||
BUILD()
|
|
||||||
{
|
|
||||||
cd openssh-6.2p1
|
|
||||||
# sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g'
|
|
||||||
#Makefile.in
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
INSTALL()
|
|
||||||
{
|
|
||||||
cd openssh-6.2p1
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST()
|
|
||||||
{
|
|
||||||
cd openssh-6.2p1
|
|
||||||
make tests
|
|
||||||
}
|
|
||||||
|
|
||||||
LICENSE="OpenSSH"
|
|
||||||
COPYRIGHT="2005-2013 Tatu Ylonen et al."
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
SUMMARY="Secure Shell Client and Server (Remote Login Program)"
|
|
||||||
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.
|
|
||||||
"
|
|
||||||
HOMEPAGE="http://www.openssh.com/"
|
|
||||||
LICENSE="OpenSSH"
|
|
||||||
COPYRIGHT="2005-2014 Tatu Ylonen et al."
|
|
||||||
SOURCE_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz"
|
|
||||||
CHECKSUM_SHA256="a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027"
|
|
||||||
SOURCE_URI="http://openbsd.locaweb.com.br/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz"
|
|
||||||
#SOURCE_URI="http://mindrot.org/openssh_snap/openssh-SNAP-20140127.tar.gz"
|
|
||||||
REVISION="1"
|
|
||||||
|
|
||||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
|
||||||
|
|
||||||
PATCHES="sshd_config.patch
|
|
||||||
pathnames.patch"
|
|
||||||
|
|
||||||
ADDITIONAL_FILES="sshd_keymaker.sh"
|
|
||||||
|
|
||||||
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
|
|
||||||
cmd:login
|
|
||||||
cmd:passwd
|
|
||||||
lib:libcrypto
|
|
||||||
lib:libedit
|
|
||||||
lib:libncurses
|
|
||||||
lib:libssl
|
|
||||||
lib:libz
|
|
||||||
"
|
|
||||||
BUILD_REQUIRES="
|
|
||||||
devel:libcrypto
|
|
||||||
devel:libedit
|
|
||||||
devel:libncurses
|
|
||||||
devel:libssl
|
|
||||||
devel:libz
|
|
||||||
"
|
|
||||||
BUILD_PREREQUIRES="
|
|
||||||
haiku_devel
|
|
||||||
cmd:aclocal
|
|
||||||
cmd:autoconf
|
|
||||||
cmd:automake
|
|
||||||
cmd:gcc
|
|
||||||
cmd:ld
|
|
||||||
cmd:libtoolize
|
|
||||||
cmd:make
|
|
||||||
cmd:pkg_config
|
|
||||||
"
|
|
||||||
|
|
||||||
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\"
|
|
||||||
"
|
|
||||||
PACKAGE_GROUPS="sshd"
|
|
||||||
|
|
||||||
|
|
||||||
PATCH()
|
|
||||||
{
|
|
||||||
echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
|
|
||||||
}
|
|
||||||
|
|
||||||
SOURCE_DIR="openssh"
|
|
||||||
|
|
||||||
BUILD()
|
|
||||||
{
|
|
||||||
mkdir -p m4
|
|
||||||
aclocal --install -I m4
|
|
||||||
libtoolize --force --copy
|
|
||||||
aclocal -I m4
|
|
||||||
autoconf
|
|
||||||
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"
|
|
||||||
|
|
||||||
# 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/ssh \
|
|
||||||
--libexecdir=$libExecDir/openssh \
|
|
||||||
--with-privsep-path=$dataDir/openssh/empty \
|
|
||||||
--with-pid-dir=$prefix/var/run \
|
|
||||||
--with-default-path="$defaultPath" \
|
|
||||||
--with-md5-passwords \
|
|
||||||
--disable-utmpx \
|
|
||||||
--with-libedit
|
|
||||||
make $jobArgs
|
|
||||||
}
|
|
||||||
|
|
||||||
INSTALL()
|
|
||||||
{
|
|
||||||
make install-nokeys
|
|
||||||
mkdir -p $postInstallDir
|
|
||||||
cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST()
|
|
||||||
{
|
|
||||||
make tests
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,29 @@
|
|||||||
SUMMARY="Secure Shell Client and Server (Remote Login Program)"
|
SUMMARY="Secure Shell Client and Server (Remote Login Program)"
|
||||||
|
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.
|
||||||
|
"
|
||||||
HOMEPAGE="http://www.openssh.com/"
|
HOMEPAGE="http://www.openssh.com/"
|
||||||
LICENSE="OpenSSH"
|
LICENSE="OpenSSH"
|
||||||
COPYRIGHT="2005-2012 Tatu Ylonen et al."
|
COPYRIGHT="2005-2015 Tatu Ylonen et al."
|
||||||
SOURCE_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz"
|
SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de"
|
CHECKSUM_SHA256="fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5"
|
||||||
REVISION="8"
|
REVISION="1"
|
||||||
|
|
||||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||||
|
|
||||||
PATCHES="openssh-6.0p1.patch"
|
PATCHES="sshd_config.patch
|
||||||
|
pathnames.patch
|
||||||
|
bzero.patch"
|
||||||
|
|
||||||
ADDITIONAL_FILES="sshd_keymaker.sh"
|
ADDITIONAL_FILES="sshd_keymaker.sh"
|
||||||
|
|
||||||
@@ -115,17 +131,3 @@ TEST()
|
|||||||
{
|
{
|
||||||
make tests
|
make tests
|
||||||
}
|
}
|
||||||
|
|
||||||
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.
|
|
||||||
"
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
diff -urN openssh-5.8p2/configure.ac openssh-5.8p2-haiku/configure.ac
|
|
||||||
--- openssh-5.8p2/configure.ac 2011-02-04 00:42:14.007077888 +0000
|
|
||||||
+++ openssh-5.8p2-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000
|
|
||||||
@@ -1345,7 +1345,7 @@
|
|
||||||
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
|
|
||||||
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
|
|
||||||
else
|
|
||||||
- LIBEDIT="-ledit -lcurses"
|
|
||||||
+ 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,
|
|
||||||
diff -urN openssh-5.8p2/pathnames.h openssh-5.8p2-haiku/pathnames.h
|
|
||||||
--- openssh-5.8p2/pathnames.h 2010-08-31 12:41:14.016252928 +0000
|
|
||||||
+++ openssh-5.8p2-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000
|
|
||||||
@@ -12,7 +12,14 @@
|
|
||||||
* called by a name other than "ssh" or "Secure Shell".
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define ETCDIR "/etc"
|
|
||||||
+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings"
|
|
||||||
+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings"
|
|
||||||
+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin"
|
|
||||||
+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var"
|
|
||||||
+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY
|
|
||||||
|
|
||||||
#ifndef SSHDIR
|
|
||||||
#define SSHDIR ETCDIR "/ssh"
|
|
||||||
@@ -45,7 +53,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
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -58,25 +66,25 @@
|
|
||||||
* The directory in user's home directory in which the files reside. The
|
|
||||||
* directory should be world-readable (though not all files are).
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_DIR ".ssh"
|
|
||||||
+#define _PATH_SSH_USER_DIR "config/settings/ssh"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user file containing host keys of known hosts. This file need not be
|
|
||||||
* readable by anyone except the user him/herself, though this does not
|
|
||||||
* contain anything particularly secret.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts"
|
|
||||||
/* backward compat for protocol 2 */
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name of the default file containing client-side authentication key. This
|
|
||||||
* file should only be readable by the user him/herself.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Configuration file in user's home directory. This file need not be
|
|
||||||
@@ -84,7 +92,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.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_CONFFILE ".ssh/config"
|
|
||||||
+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File containing a list of those rsa keys that permit logging in as this
|
|
||||||
@@ -94,10 +102,10 @@
|
|
||||||
* may need to be world-readable. (This file is read by the daemon which is
|
|
||||||
* running as root.)
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
|
|
||||||
|
|
||||||
/* backward compat for protocol v2 */
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user and system-wide ssh "rc" files. These files are executed with
|
|
||||||
@@ -105,7 +113,7 @@
|
|
||||||
* passed "proto cookie" as arguments if X11 forwarding with spoofing is in
|
|
||||||
* use. xauth will be run if neither of these exists.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_RC ".ssh/rc"
|
|
||||||
+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
|
|
||||||
#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -149,17 +157,16 @@
|
|
||||||
|
|
||||||
/* for sftp */
|
|
||||||
#ifndef _PATH_SFTP_SERVER
|
|
||||||
-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server"
|
|
||||||
+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
|
|
||||||
#ifndef _PATH_PRIVSEP_CHROOT_DIR
|
|
||||||
-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty"
|
|
||||||
+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty"
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
/* for passwd change */
|
|
||||||
#ifndef _PATH_PASSWD_PROG
|
|
||||||
-#define _PATH_PASSWD_PROG "/usr/bin/passwd"
|
|
||||||
+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _PATH_LS
|
|
||||||
@@ -171,11 +178,11 @@
|
|
||||||
# ifdef LOGIN_PROGRAM_FALLBACK
|
|
||||||
# define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK
|
|
||||||
# else
|
|
||||||
-# define LOGIN_PROGRAM "/usr/bin/login"
|
|
||||||
+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login"
|
|
||||||
# endif
|
|
||||||
#endif /* LOGIN_PROGRAM */
|
|
||||||
|
|
||||||
/* Askpass program define */
|
|
||||||
#ifndef ASKPASS_PROGRAM
|
|
||||||
-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
|
|
||||||
+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass"
|
|
||||||
#endif /* ASKPASS_PROGRAM */
|
|
||||||
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
diff -urN openssh-5.9p1/configure.ac openssh-5.9p1-haiku/configure.ac
|
|
||||||
--- openssh-5.9p1/configure.ac 2011-02-04 00:42:14.007077888 +0000
|
|
||||||
+++ openssh-5.9p1-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000
|
|
||||||
@@ -1345,7 +1345,7 @@
|
|
||||||
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
|
|
||||||
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
|
|
||||||
else
|
|
||||||
- LIBEDIT="-ledit -lcurses"
|
|
||||||
+ 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,
|
|
||||||
diff -urN openssh-5.9p1/pathnames.h openssh-5.9p1-haiku/pathnames.h
|
|
||||||
--- openssh-5.9p1/pathnames.h 2010-08-31 12:41:14.016252928 +0000
|
|
||||||
+++ openssh-5.9p1-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000
|
|
||||||
@@ -12,7 +12,14 @@
|
|
||||||
* called by a name other than "ssh" or "Secure Shell".
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define ETCDIR "/etc"
|
|
||||||
+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings"
|
|
||||||
+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings"
|
|
||||||
+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin"
|
|
||||||
+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var"
|
|
||||||
+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY
|
|
||||||
|
|
||||||
#ifndef SSHDIR
|
|
||||||
#define SSHDIR ETCDIR "/ssh"
|
|
||||||
@@ -45,7 +53,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
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -58,25 +66,25 @@
|
|
||||||
* The directory in user's home directory in which the files reside. The
|
|
||||||
* directory should be world-readable (though not all files are).
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_DIR ".ssh"
|
|
||||||
+#define _PATH_SSH_USER_DIR "config/settings/ssh"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user file containing host keys of known hosts. This file need not be
|
|
||||||
* readable by anyone except the user him/herself, though this does not
|
|
||||||
* contain anything particularly secret.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts"
|
|
||||||
/* backward compat for protocol 2 */
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name of the default file containing client-side authentication key. This
|
|
||||||
* file should only be readable by the user him/herself.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Configuration file in user's home directory. This file need not be
|
|
||||||
@@ -84,7 +92,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.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_CONFFILE ".ssh/config"
|
|
||||||
+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File containing a list of those rsa keys that permit logging in as this
|
|
||||||
@@ -94,10 +102,10 @@
|
|
||||||
* may need to be world-readable. (This file is read by the daemon which is
|
|
||||||
* running as root.)
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
|
|
||||||
|
|
||||||
/* backward compat for protocol v2 */
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user and system-wide ssh "rc" files. These files are executed with
|
|
||||||
@@ -105,7 +113,7 @@
|
|
||||||
* passed "proto cookie" as arguments if X11 forwarding with spoofing is in
|
|
||||||
* use. xauth will be run if neither of these exists.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_RC ".ssh/rc"
|
|
||||||
+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
|
|
||||||
#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -149,17 +157,16 @@
|
|
||||||
|
|
||||||
/* for sftp */
|
|
||||||
#ifndef _PATH_SFTP_SERVER
|
|
||||||
-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server"
|
|
||||||
+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
|
|
||||||
#ifndef _PATH_PRIVSEP_CHROOT_DIR
|
|
||||||
-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty"
|
|
||||||
+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty"
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
/* for passwd change */
|
|
||||||
#ifndef _PATH_PASSWD_PROG
|
|
||||||
-#define _PATH_PASSWD_PROG "/usr/bin/passwd"
|
|
||||||
+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _PATH_LS
|
|
||||||
@@ -171,11 +178,11 @@
|
|
||||||
# ifdef LOGIN_PROGRAM_FALLBACK
|
|
||||||
# define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK
|
|
||||||
# else
|
|
||||||
-# define LOGIN_PROGRAM "/usr/bin/login"
|
|
||||||
+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login"
|
|
||||||
# endif
|
|
||||||
#endif /* LOGIN_PROGRAM */
|
|
||||||
|
|
||||||
/* Askpass program define */
|
|
||||||
#ifndef ASKPASS_PROGRAM
|
|
||||||
-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
|
|
||||||
+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass"
|
|
||||||
#endif /* ASKPASS_PROGRAM */
|
|
||||||
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
diff -ur orig/openssh-6.0p1/configure.ac openssh-6.0p1/configure.ac
|
|
||||||
--- orig/openssh-6.0p1/configure.ac 2012-04-19 13:46:38.045613056 +0200
|
|
||||||
+++ openssh-6.0p1/configure.ac 2013-04-29 21:27:34.023068672 +0200
|
|
||||||
@@ -92,7 +92,9 @@
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
-AC_PATH_PROG([PATH_PASSWD_PROG], [passwd])
|
|
||||||
+if test -z "$PATH_PASSWD_PROG" ; then
|
|
||||||
+ AC_PATH_PROG([PATH_PASSWD_PROG], [passwd])
|
|
||||||
+fi
|
|
||||||
if test ! -z "$PATH_PASSWD_PROG" ; then
|
|
||||||
AC_DEFINE_UNQUOTED([_PATH_PASSWD_PROG], ["$PATH_PASSWD_PROG"],
|
|
||||||
[Full path of your "passwd" program])
|
|
||||||
@@ -1432,7 +1434,7 @@
|
|
||||||
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
|
|
||||||
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
|
|
||||||
else
|
|
||||||
- LIBEDIT="-ledit -lcurses"
|
|
||||||
+ 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],
|
|
||||||
diff -ur orig/openssh-6.0p1/pathnames.h openssh-6.0p1/pathnames.h
|
|
||||||
--- orig/openssh-6.0p1/pathnames.h 2011-05-29 13:39:38.054788096 +0200
|
|
||||||
+++ openssh-6.0p1/pathnames.h 2013-04-29 21:29:17.578289664 +0200
|
|
||||||
@@ -58,25 +58,25 @@
|
|
||||||
* The directory in user's home directory in which the files reside. The
|
|
||||||
* directory should be world-readable (though not all files are).
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_DIR ".ssh"
|
|
||||||
+#define _PATH_SSH_USER_DIR "config/settings/ssh"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user file containing host keys of known hosts. This file need not be
|
|
||||||
* readable by anyone except the user him/herself, though this does not
|
|
||||||
* contain anything particularly secret.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE "~/" _PATH_SSH_USER_DIR "/known_hosts"
|
|
||||||
/* backward compat for protocol 2 */
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE2 "~/" _PATH_SSH_USER_DIR "/known_hosts2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name of the default file containing client-side authentication key. This
|
|
||||||
* file should only be readable by the user him/herself.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Configuration file in user's home directory. This file need not be
|
|
||||||
@@ -84,7 +84,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.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_CONFFILE ".ssh/config"
|
|
||||||
+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File containing a list of those rsa keys that permit logging in as this
|
|
||||||
@@ -94,10 +94,10 @@
|
|
||||||
* may need to be world-readable. (This file is read by the daemon which is
|
|
||||||
* running as root.)
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
|
|
||||||
|
|
||||||
/* backward compat for protocol v2 */
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user and system-wide ssh "rc" files. These files are executed with
|
|
||||||
@@ -105,7 +105,7 @@
|
|
||||||
* passed "proto cookie" as arguments if X11 forwarding with spoofing is in
|
|
||||||
* use. xauth will be run if neither of these exists.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_RC ".ssh/rc"
|
|
||||||
+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
|
|
||||||
#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff -ur orig/openssh-6.0p1/sshd_config openssh-6.0p1/sshd_config
|
|
||||||
--- orig/openssh-6.0p1/sshd_config 2011-05-29 13:39:39.064225280 +0200
|
|
||||||
+++ openssh-6.0p1/sshd_config 2013-04-29 12:51:20.314834944 +0200
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
|
|
||||||
# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
|
|
||||||
# but this is overridden so installations will only check .ssh/authorized_keys
|
|
||||||
-AuthorizedKeysFile .ssh/authorized_keys
|
|
||||||
+AuthorizedKeysFile config/settings/ssh/authorized_keys
|
|
||||||
|
|
||||||
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
|
|
||||||
#RhostsRSAAuthentication no
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
diff -urN openssh-6.1p1/configure.ac openssh-6.1p1-haiku/configure.ac
|
|
||||||
--- openssh-6.1p1/configure.ac 2011-02-04 00:42:14.007077888 +0000
|
|
||||||
+++ openssh-6.1p1-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000
|
|
||||||
@@ -1432,7 +1432,7 @@
|
|
||||||
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
|
|
||||||
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
|
|
||||||
else
|
|
||||||
- LIBEDIT="-ledit -lcurses"
|
|
||||||
+ 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,
|
|
||||||
diff -urN openssh-6.1p1/pathnames.h openssh-6.1p1-haiku/pathnames.h
|
|
||||||
--- openssh-6.1p1/pathnames.h 2010-08-31 12:41:14.016252928 +0000
|
|
||||||
+++ openssh-6.1p1-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000
|
|
||||||
@@ -12,7 +12,14 @@
|
|
||||||
* called by a name other than "ssh" or "Secure Shell".
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define ETCDIR "/etc"
|
|
||||||
+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings"
|
|
||||||
+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings"
|
|
||||||
+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin"
|
|
||||||
+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var"
|
|
||||||
+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY
|
|
||||||
|
|
||||||
#ifndef SSHDIR
|
|
||||||
#define SSHDIR ETCDIR "/ssh"
|
|
||||||
@@ -45,7 +53,7 @@
|
|
||||||
#define _PATH_DH_PRIMES SSHDIR "/primes"
|
|
||||||
|
|
||||||
#ifndef _PATH_SSH_PROGRAM
|
|
||||||
-#define _PATH_SSH_PROGRAM "/usr/bin/ssh"
|
|
||||||
+#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -58,25 +66,25 @@
|
|
||||||
* The directory in user's home directory in which the files reside. The
|
|
||||||
* directory should be world-readable (though not all files are).
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_DIR ".ssh"
|
|
||||||
+#define _PATH_SSH_USER_DIR "config/settings/ssh"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user file containing host keys of known hosts. This file need not be
|
|
||||||
* readable by anyone except the user him/herself, though this does not
|
|
||||||
* contain anything particularly secret.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts"
|
|
||||||
/* backward compat for protocol 2 */
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name of the default file containing client-side authentication key. This
|
|
||||||
* file should only be readable by the user him/herself.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Configuration file in user's home directory. This file need not be
|
|
||||||
@@ -84,7 +92,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.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_CONFFILE ".ssh/config"
|
|
||||||
+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File containing a list of those rsa keys that permit logging in as this
|
|
||||||
@@ -94,10 +102,10 @@
|
|
||||||
* may need to be world-readable. (This file is read by the daemon which is
|
|
||||||
* running as root.)
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
|
|
||||||
|
|
||||||
/* backward compat for protocol v2 */
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user and system-wide ssh "rc" files. These files are executed with
|
|
||||||
@@ -105,7 +113,7 @@
|
|
||||||
* passed "proto cookie" as arguments if X11 forwarding with spoofing is in
|
|
||||||
* use. xauth will be run if neither of these exists.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_RC ".ssh/rc"
|
|
||||||
+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
|
|
||||||
#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -149,17 +157,16 @@
|
|
||||||
|
|
||||||
/* for sftp */
|
|
||||||
#ifndef _PATH_SFTP_SERVER
|
|
||||||
-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server"
|
|
||||||
+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
|
|
||||||
#ifndef _PATH_PRIVSEP_CHROOT_DIR
|
|
||||||
-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty"
|
|
||||||
+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty"
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
/* for passwd change */
|
|
||||||
#ifndef _PATH_PASSWD_PROG
|
|
||||||
-#define _PATH_PASSWD_PROG "/usr/bin/passwd"
|
|
||||||
+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _PATH_LS
|
|
||||||
@@ -171,11 +178,11 @@
|
|
||||||
# ifdef LOGIN_PROGRAM_FALLBACK
|
|
||||||
# define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK
|
|
||||||
# else
|
|
||||||
-# define LOGIN_PROGRAM "/usr/bin/login"
|
|
||||||
+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login"
|
|
||||||
# endif
|
|
||||||
#endif /* LOGIN_PROGRAM */
|
|
||||||
|
|
||||||
/* Askpass program define */
|
|
||||||
#ifndef ASKPASS_PROGRAM
|
|
||||||
-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
|
|
||||||
+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass"
|
|
||||||
#endif /* ASKPASS_PROGRAM */
|
|
||||||
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
diff -urN openssh-6.2p1/configure.ac openssh-6.2p1-haiku/configure.ac
|
|
||||||
--- openssh-6.2p1/configure.ac 2013-03-20 01:55:15.047972352 +0000
|
|
||||||
+++ openssh-6.2p1-haiku/configure.ac 2013-04-04 09:11:04.187957248 +0000
|
|
||||||
@@ -1430,7 +1430,7 @@
|
|
||||||
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
|
|
||||||
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
|
|
||||||
else
|
|
||||||
- LIBEDIT="-ledit -lcurses"
|
|
||||||
+ 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],
|
|
||||||
diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h
|
|
||||||
--- openssh-6.2p1/pathnames.h 2011-05-29 11:39:38.057409536 +0000
|
|
||||||
+++ openssh-6.2p1-haiku/pathnames.h 2013-04-04 09:11:10.076283904 +0000
|
|
||||||
@@ -12,7 +12,14 @@
|
|
||||||
* called by a name other than "ssh" or "Secure Shell".
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define ETCDIR "/etc"
|
|
||||||
+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings"
|
|
||||||
+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings"
|
|
||||||
+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin"
|
|
||||||
+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var"
|
|
||||||
+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY
|
|
||||||
|
|
||||||
#ifndef SSHDIR
|
|
||||||
#define SSHDIR ETCDIR "/ssh"
|
|
||||||
@@ -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 HAIKU_COMMON_BIN_DIRECTORY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -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).
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_DIR ".ssh"
|
|
||||||
+#define _PATH_SSH_USER_DIR "config/settings/ssh"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user file containing host keys of known hosts. This file need not be
|
|
||||||
* readable by anyone except the user him/herself, though this does not
|
|
||||||
* contain anything particularly secret.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts"
|
|
||||||
/* backward compat for protocol 2 */
|
|
||||||
-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2"
|
|
||||||
+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name of the default file containing client-side authentication key. This
|
|
||||||
* file should only be readable by the user him/herself.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa"
|
|
||||||
-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
|
|
||||||
+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Configuration file in user's home directory. This file need not be
|
|
||||||
@@ -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.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_CONFFILE ".ssh/config"
|
|
||||||
+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File containing a list of those rsa keys that permit logging in as this
|
|
||||||
@@ -94,10 +101,10 @@
|
|
||||||
* may need to be world-readable. (This file is read by the daemon which is
|
|
||||||
* running as root.)
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
|
|
||||||
|
|
||||||
/* backward compat for protocol v2 */
|
|
||||||
-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2"
|
|
||||||
+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-user and system-wide ssh "rc" files. These files are executed with
|
|
||||||
@@ -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.
|
|
||||||
*/
|
|
||||||
-#define _PATH_SSH_USER_RC ".ssh/rc"
|
|
||||||
+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
|
|
||||||
#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -149,17 +156,16 @@
|
|
||||||
|
|
||||||
/* for sftp */
|
|
||||||
#ifndef _PATH_SFTP_SERVER
|
|
||||||
-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server"
|
|
||||||
+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
|
|
||||||
#ifndef _PATH_PRIVSEP_CHROOT_DIR
|
|
||||||
-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty"
|
|
||||||
+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty"
|
|
||||||
#endif
|
|
||||||
-
|
|
||||||
/* for passwd change */
|
|
||||||
#ifndef _PATH_PASSWD_PROG
|
|
||||||
-#define _PATH_PASSWD_PROG "/usr/bin/passwd"
|
|
||||||
+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _PATH_LS
|
|
||||||
@@ -171,11 +177,11 @@
|
|
||||||
# ifdef LOGIN_PROGRAM_FALLBACK
|
|
||||||
# define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK
|
|
||||||
# else
|
|
||||||
-# define LOGIN_PROGRAM "/usr/bin/login"
|
|
||||||
+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login"
|
|
||||||
# endif
|
|
||||||
#endif /* LOGIN_PROGRAM */
|
|
||||||
|
|
||||||
/* Askpass program define */
|
|
||||||
#ifndef ASKPASS_PROGRAM
|
|
||||||
-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
|
|
||||||
+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass"
|
|
||||||
#endif /* ASKPASS_PROGRAM */
|
|
||||||
diff -urN openssh-6.2p1/sshd_config openssh-6.2p1-haiku/sshd_config
|
|
||||||
--- openssh-6.2p1/sshd_config 2013-02-12 00:02:09.066846720 +0000
|
|
||||||
+++ openssh-6.2p1-haiku/sshd_config 2013-04-04 09:02:19.284426240 +0000
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
|
|
||||||
# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
|
|
||||||
# but this is overridden so installations will only check .ssh/authorized_keys
|
|
||||||
-AuthorizedKeysFile .ssh/authorized_keys
|
|
||||||
+AuthorizedKeysFile config/settings/ssh
|
|
||||||
|
|
||||||
#AuthorizedPrincipalsFile none
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user