diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.bep index addfecdde..eb1472a95 100644 --- a/net-misc/openssh/openssh-5.4p1.bep +++ b/net-misc/openssh/openssh-5.4p1.bep @@ -6,6 +6,7 @@ STATUS_HAIKU="stable" DEPEND="openssl" CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e" BUILD { + cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h cd openssh-5.4p1 mkdir -p m4 cp /boot/common/share/aclocal/libtool.m4 m4 @@ -14,11 +15,11 @@ BUILD { cp /boot/common/share/aclocal/ltsugar.m4 m4 cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy --install + libtoolize --force --copy aclocal -I m4 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_DIRECTORY`/sbin \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ @@ -27,6 +28,18 @@ BUILD { --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ --mandir=`finddir B_COMMON_DIRECTORY`/man \ --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ + --sharedstatedir=/boot/home/1 \ + --localstatedir=/boot/home/2 \ + --includedir=/boot/home/3 \ + --oldincludedir=/boot/home/4 \ + --datarootdir=/boot/home/5 \ + --infodir=/boot/home/6 \ + --localedir=/boot/home/7 \ + --htmldir=/boot/home/8 \ + --dvidir=/boot/home/9 \ + --pdfdir=/boot/home/10 \ + --psdir=/boot/home/11 \ --with-md5-passwords make } diff --git a/net-misc/openssh/openssh-5.2p1-haiku.diff b/net-misc/openssh/patches/openssh-5.2p1-haiku.patch similarity index 100% rename from net-misc/openssh/openssh-5.2p1-haiku.diff rename to net-misc/openssh/patches/openssh-5.2p1-haiku.patch diff --git a/net-misc/openssh/patches/pathnames-haiku.h b/net-misc/openssh/patches/pathnames-haiku.h new file mode 100644 index 000000000..76d7dc1c9 --- /dev/null +++ b/net-misc/openssh/patches/pathnames-haiku.h @@ -0,0 +1,186 @@ +/* $OpenBSD: pathnames.h,v 1.19 2010/02/11 20:37:47 djm Exp $ */ + +/* + * Author: Tatu Ylonen + * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland + * All rights reserved + * + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". + */ + +#define HAIKU_USER_SETTINGS_DIRECTORY "/boot/home/config/settings" +#define HAIKU_COMMON_ETC_DIRECTORY "/boot/common/etc" +#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" +#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" +#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" +#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" + + +#define ETCDIR HAIKU_COMMON_ETC_DIRECTORY + +#ifndef SSHDIR +#define SSHDIR ETCDIR "/ssh" +#endif + +#ifndef _PATH_SSH_PIDDIR +#define _PATH_SSH_PIDDIR "/var/run" +#endif + +/* + * System-wide file containing host keys of known hosts. This file should be + * world-readable. + */ +#define _PATH_SSH_SYSTEM_HOSTFILE SSHDIR "/ssh_known_hosts" +/* backward compat for protocol 2 */ +#define _PATH_SSH_SYSTEM_HOSTFILE2 SSHDIR "/ssh_known_hosts2" + +/* + * Of these, ssh_host_key must be readable only by root, whereas ssh_config + * should be world-readable. + */ +#define _PATH_SERVER_CONFIG_FILE SSHDIR "/sshd_config" +#define _PATH_HOST_CONFIG_FILE SSHDIR "/ssh_config" +#define _PATH_HOST_KEY_FILE SSHDIR "/ssh_host_key" +#define _PATH_HOST_DSA_KEY_FILE SSHDIR "/ssh_host_dsa_key" +#define _PATH_HOST_RSA_KEY_FILE SSHDIR "/ssh_host_rsa_key" +#define _PATH_DH_MODULI SSHDIR "/moduli" +/* Backwards compatibility */ +#define _PATH_DH_PRIMES SSHDIR "/primes" + +#ifndef _PATH_SSH_PROGRAM +#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY +#endif + +/* + * The process id of the daemon listening for connections is saved here to + * make it easier to kill the correct daemon when necessary. + */ +#define _PATH_SSH_DAEMON_PID_FILE _PATH_SSH_PIDDIR "/sshd.pid" + +/* + * 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 "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 _PATH_SSH_USER_DIR "/known_hosts" +/* backward compat for protocol 2 */ +#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 _PATH_SSH_USER_DIR "/identity" +#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" +#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" + +/* + * Configuration file in user's home directory. This file need not be + * readable by anyone but the user him/herself, but does not contain anything + * 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 _PATH_SSH_USER_DIR "/config" + +/* + * File containing a list of those rsa keys that permit logging in as this + * user. This file need not be readable by anyone but the user him/herself, + * but does not contain anything 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. (This file is read by the daemon which is + * running as root.) + */ +#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" + +/* backward compat for protocol v2 */ +#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 + * /bin/sh before starting the shell or command if they exist. They will be + * 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 _PATH_SSH_USER_DIR "/rc" +#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" + +/* + * Ssh-only version of /etc/hosts.equiv. Additionally, the daemon may use + * ~/.rhosts and /etc/hosts.equiv if rhosts authentication is enabled. + */ +#define _PATH_SSH_HOSTS_EQUIV SSHDIR "/shosts.equiv" +#define _PATH_RHOSTS_EQUIV "/etc/hosts.equiv" + +/* + * Default location of askpass + */ +#ifndef _PATH_SSH_ASKPASS_DEFAULT +#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" +#endif + +/* Location of ssh-keysign for hostbased authentication */ +#ifndef _PATH_SSH_KEY_SIGN +#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" +#endif + +/* Location of ssh-pkcs11-helper to support keys in tokens */ +#ifndef _PATH_SSH_PKCS11_HELPER +#define _PATH_SSH_PKCS11_HELPER "/usr/libexec/ssh-pkcs11-helper" +#endif + +/* xauth for X11 forwarding */ +#ifndef _PATH_XAUTH +#define _PATH_XAUTH "/usr/X11R6/bin/xauth" +#endif + +/* UNIX domain socket for X11 server; displaynum will replace %u */ +#ifndef _PATH_UNIX_X +#define _PATH_UNIX_X "/tmp/.X11-unix/X%u" +#endif + +/* for scp */ +#ifndef _PATH_CP +#define _PATH_CP "cp" +#endif + +/* for sftp */ +#ifndef _PATH_SFTP_SERVER +#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" +#endif + +/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ +#ifndef _PATH_PRIVSEP_CHROOT_DIR +#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" +#endif +/* for passwd change */ +#ifndef _PATH_PASSWD_PROG +#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" +#endif + +#ifndef _PATH_LS +#define _PATH_LS "ls" +#endif + +/* path to login program */ +#ifndef LOGIN_PROGRAM +# ifdef LOGIN_PROGRAM_FALLBACK +# define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK +# else +# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" +# endif +#endif /* LOGIN_PROGRAM */ + +/* Askpass program define */ +#ifndef ASKPASS_PROGRAM +#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" +#endif /* ASKPASS_PROGRAM */