mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
moved the pathnames fix into the patch so that the patched archive will will correctly. Eventually we'll need a better fix for this.
This commit is contained in:
Scott McCreary
@@ -7,7 +7,6 @@ DEPEND="dev-libs/openssl >= 1.0.0
|
||||
dev-libs/libedit >= 20090923"
|
||||
CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb"
|
||||
BUILD {
|
||||
cp ../patches/pathnames-haiku.h openssh-5.5p1/pathnames.h
|
||||
cd openssh-5.5p1
|
||||
autoconf
|
||||
mkdir -p m4
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -up openssh-5.5p1/configure.ac.orig openssh-5.5p1/configure.ac
|
||||
--- openssh-5.5p1/configure.ac.orig 2010-04-10 06:58:01.058458112 -0600
|
||||
+++ openssh-5.5p1/configure.ac 2010-04-29 17:31:43.944242688 -0600
|
||||
@@ -1277,7 +1277,7 @@ AC_ARG_WITH(libedit,
|
||||
diff -urN openssh-5.5p1-orig/configure.ac openssh-5.5p1-haiku/configure.ac
|
||||
--- openssh-5.5p1-orig/configure.ac 2010-04-10 12:58:01.014942208 +0000
|
||||
+++ openssh-5.5p1-haiku/configure.ac 2010-04-30 05:09:08.936378368 +0000
|
||||
@@ -1277,7 +1277,7 @@
|
||||
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
|
||||
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
|
||||
else
|
||||
@@ -10,3 +10,129 @@ diff -up openssh-5.5p1/configure.ac.orig openssh-5.5p1/configure.ac
|
||||
fi
|
||||
OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
|
||||
AC_CHECK_LIB(edit, el_init,
|
||||
diff -urN openssh-5.5p1-orig/pathnames.h openssh-5.5p1-haiku/pathnames.h
|
||||
--- openssh-5.5p1-orig/pathnames.h 2010-02-24 06:17:58.023592960 +0000
|
||||
+++ openssh-5.5p1-haiku/pathnames.h 2010-04-30 04:53:52.000000000 +0000
|
||||
@@ -12,7 +12,15 @@
|
||||
* 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_COMMON_SERVERS_DIRECTORY "/boot/common/servers"
|
||||
+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin"
|
||||
+
|
||||
+
|
||||
+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY
|
||||
|
||||
#ifndef SSHDIR
|
||||
#define SSHDIR ETCDIR "/ssh"
|
||||
@@ -44,7 +52,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
|
||||
|
||||
/*
|
||||
@@ -57,24 +65,24 @@
|
||||
* 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_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_RSA _PATH_SSH_USER_DIR "/id_rsa"
|
||||
|
||||
/*
|
||||
* Configuration file in user's home directory. This file need not be
|
||||
@@ -82,7 +90,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
|
||||
@@ -92,10 +100,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
|
||||
@@ -103,7 +111,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"
|
||||
|
||||
/*
|
||||
@@ -147,17 +155,16 @@
|
||||
|
||||
/* for sftp */
|
||||
#ifndef _PATH_SFTP_SERVER
|
||||
-#define _PATH_SFTP_SERVER "/usr/libexec/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 "/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
|
||||
@@ -169,11 +176,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,186 +0,0 @@
|
||||
/* $OpenBSD: pathnames.h,v 1.19 2010/02/11 20:37:47 djm Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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 "~/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_COMMON_SERVERS_DIRECTORY "/boot/common/servers"
|
||||
#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin"
|
||||
|
||||
|
||||
#define ETCDIR HAIKU_COMMON_SETTINGS_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 "/boot/home/config/settings/ssh/known_hosts"
|
||||
/* backward compat for protocol 2 */
|
||||
#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 _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 */
|
||||
Reference in New Issue
Block a user