Fixes for Solaris
Damien Miller
djm at mindrot.org
Tue Nov 23 12:31:41 EST 1999
Attached is a small patch that should fix most of the problems
reported.
I am adding a recommendation to use GNU make to the INSTALL
document.
Regards,
Damien
--
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)
-------------- next part --------------
Index: ChangeLog
===================================================================
RCS file: /var/cvs/openssh/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.72
diff -u -r1.69 -r1.72
--- ChangeLog 1999/11/22 07:11:23 1.69
+++ ChangeLog 1999/11/23 00:24:32 1.72
@@ -1,3 +1,9 @@
+19991123
+ - Added SuSE package files from Chris Saia <csaia at wtower.com>
+ - Restructured package-related files under packages/*
+ - Added generic PAM config
+ - Numerous little Solaris fixes
+
19991122
- Make <enter> close gnome-ssh-askpass (Debian bug #50299)
- OpenBSD CVS Changes
@@ -17,6 +23,9 @@
- Only display public key comment when presenting ssh-askpass dialog
- Released 1.2pre14
+ - Configure, Make and changelog corrections from Tudor Bosman
+ <tudorb at jm.nu> and Niels Kristian Bech Jensen <nkbj at image.dk>
+
19991121
- OpenBSD CVS Changes:
- [channels.c]
@@ -60,7 +69,7 @@
- EGD uses a socket, not a named pipe. Duh.
- Fix includes in fingerprint.c
- Fix scp progress bar bug again.
- - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of
+ - Move ssh-askpass from ${libdir}/ssh to ${libexecdir}/ssh at request of
David Rankin <drankin at bohemians.lexington.ky.us>
- Added autoconf option to enable Kerberos 4 support (untested)
- Added autoconf option to enable AFS support (untested)
Index: INSTALL
===================================================================
RCS file: /var/cvs/openssh/INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- INSTALL 1999/11/22 05:12:31 1.5
+++ INSTALL 1999/11/22 23:11:29 1.6
@@ -57,9 +57,10 @@
This will install the binaries in /opt/{bin,lib,sbin}, but will place the
configuration files in /etc/ssh.
-If you are using PAM, you will need to manually install the sshd.pam
-control file as "/etc/pam.d/sshd". This file is customised for Redhat
-Linux, you may need to edit it before using it on your system.
+If you are using PAM, you will need to manually install a PAM control
+file as "/etc/pam.d/sshd" (or wherever your system prefers to keep
+them). A generic PAM configuration is included as "sshd.pam.generic",
+you may need to edit it before using it on your system.
There are a few other options to the configure script:
Index: Makefile.in
===================================================================
RCS file: /var/cvs/openssh/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.in 1999/11/22 02:57:07 1.29
+++ Makefile.in 1999/11/22 11:31:49 1.30
@@ -2,7 +2,6 @@
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
-libdir=@libdir@
libexecdir=@libexecdir@
mandir=@mandir@
sysconfdir=@sysconfdir@
@@ -83,7 +82,7 @@
ln -sf ssh.1 $(mandir)/man1/slogin.1
if [ "x at INSTALL_ASKPASS@" = "xyes" ] ; then \
- install -d $(libdir) ; \
+ install -d $(libexecdir) ; \
install -d $(libexecdir)/ssh ; \
if [ -z "@GNOME_ASKPASS@" ] ; then \
install -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
Index: README
===================================================================
RCS file: /var/cvs/openssh/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- README 1999/11/22 04:24:35 1.25
+++ README 1999/11/22 23:11:29 1.26
@@ -54,6 +54,7 @@
'jonchen' - the original author of PAM support of SSH
Ben Taylor <bent at clark.net> - Solaris debugging and fixes
Chip Salzenberg <chip at valinux.com> - Assorted patches
+Chris Saia <csaia at wtower.com> - SuSE packaging
Dan Brosemer <odin at linuxfreak.com> - Autoconf and build fixes & Debian scripts
Jim Knoble <jmknoble at pobox.com> - RPM spec file fixes
Marc G. Fournier <marc.fournier at acadiau.ca> - Solaris patches
Index: acconfig.h
===================================================================
RCS file: /var/cvs/openssh/acconfig.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- acconfig.h 1999/11/22 03:27:24 1.16
+++ acconfig.h 1999/11/23 00:24:32 1.17
@@ -68,17 +68,25 @@
/* ******************* Shouldn't need to edit below this line ************** */
-# include <sys/types.h> /* For u_intXX_t */
-# include <sys/socket.h> /* For SHUT_XXXX */
+#include <sys/types.h> /* For u_intXX_t */
+#include <sys/socket.h> /* For SHUT_XXXX */
#ifdef HAVE_PATHS_H
# include <paths.h> /* For _PATH_XXX */
#endif
+#ifdef HAVE_UTMP_H
+# include <utmp.h> /* For _PATH_XXX */
+#endif
+
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h> /* For timersub */
#endif
+#ifdef HAVE_MAILLOCK_H
+#include <maillock.h>
+#endif
+
#ifndef SHUT_RDWR
enum
{
@@ -174,6 +182,10 @@
#ifndef _PATH_STDPATH
# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin:"
+#endif
+
+#ifndef _PATH_DEVNULL
+# define _PATH_DEVNULL "/dev/null"
#endif
#ifndef _PATH_MAILDIR
Index: configure.in
===================================================================
RCS file: /var/cvs/openssh/configure.in,v
retrieving revision 1.25
retrieving revision 1.27
diff -u -r1.25 -r1.27
--- configure.in 1999/11/22 05:11:05 1.25
+++ configure.in 1999/11/23 00:24:32 1.27
@@ -55,7 +55,7 @@
AC_CHECK_LIB(pam, pam_authenticate, , )
dnl Checks for header files.
-AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h sys/select.h sys/time.h)
+AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h utmp.h sys/select.h sys/time.h)
dnl Checks for library functions.
AC_CHECK_FUNCS(openpty strlcpy strlcat mkdtemp arc4random setproctitle setlogin setenv)
@@ -284,7 +284,7 @@
)
dnl Check whether user wants TCP wrappers support
-AC_ARG_WITH(skey,
+AC_ARG_WITH(tcp-wrappers,
[ --with-tcp-wrappers Enable tcpwrappers support],
[
AC_DEFINE(LIBWRAP)
@@ -293,7 +293,7 @@
)
dnl Check whether to enable MD5 passwords
-AC_ARG_WITH(md5passwords,
+AC_ARG_WITH(md5-passwords,
[ --with-md5-passwords Enable use of MD5 passwords],
[AC_DEFINE(HAVE_MD5_PASSWORDS)]
)
Index: gnome-ssh-askpass.c
===================================================================
RCS file: /var/cvs/openssh/gnome-ssh-askpass.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-ssh-askpass.c 1999/11/22 01:51:42 1.3
+++ gnome-ssh-askpass.c 1999/11/22 11:42:17 1.4
@@ -117,7 +117,7 @@
if (passphrase_dialog(&passphrase, message))
{
- printf("%s\n", passphrase);
+ puts(passphrase);
memset(passphrase, '\0', strlen(passphrase));
}
Index: ssh-add.c
===================================================================
RCS file: /var/cvs/openssh/ssh-add.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ssh-add.c 1999/11/22 07:11:23 1.11
+++ ssh-add.c 1999/11/23 00:24:32 1.12
@@ -184,8 +184,6 @@
/* check if RSA support exists */
if (rsa_alive() == 0) {
- extern char *__progname;
-
fprintf(stderr,
"%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
__progname);
Index: sshd.c
===================================================================
RCS file: /var/cvs/openssh/sshd.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sshd.c 1999/11/22 03:27:24 1.28
+++ sshd.c 1999/11/23 00:24:32 1.29
@@ -32,10 +32,6 @@
#include "uidswap.h"
#include "compat.h"
-#ifdef HAVE_MAILLOCK_H
-# include <maillock.h>
-#endif
-
#ifdef LIBWRAP
#include <tcpd.h>
#include <syslog.h>
More information about the openssh-unix-dev
mailing list