7 files changed, 37 insertions, 23 deletions

diff --git a/contrib/README b/contrib/README
index 9de3d961d..c00223865 100644
--- a/contrib/README
+++ b/contrib/README
@@ -19,7 +19,7 @@ X11 SSH Askpass:
 Jim Knoble <jmknoble@pobox.com> has written an excellent X11
 passphrase requester. This is highly recommended:
 
-http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html
+http://www.jmknoble.net/software/x11-ssh-askpass/
 
 
 In this directory
@@ -44,17 +44,27 @@ sshd.pam.freebsd:
 A PAM config file which works with FreeBSD's PAM port. Contributed by
 Dominik Brettnacher <domi@saargate.de>
 
-mdoc2man.pl:
+findssl.sh:
 
-Converts mdoc formated manpages into normal manpages.  This can be used
-on Solaris machines to provide manpages that are not preformated.
-Contributed by Mark D. Roth <roth@feep.net>
+Search for all instances of OpenSSL headers and libraries and print their 
+versions.  This is intended to help diagnose OpenSSH's "OpenSSL headers do not
+match your library" errors. 
 
-redhat:
+aix:
+    Files to build an AIX native (installp or SMIT installable) package.
 
-RPM spec file and scripts for building Redhat packages
+caldera:
+    RPM spec file and scripts for building Caldera OpenLinuix packages
 
-suse:
+cygwin:
+    Support files for Cygwin
+
+hpux:
+    Support files for HP-UX
 
-RPM spec file and scripts for building SuSE packages
+redhat:
+    RPM spec file and scripts for building Redhat packages
+
+suse:
+    RPM spec file and scripts for building SuSE packages
 
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index e690f102f..53b16455e 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,11 +17,11 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
 %if %{use_stable}
-  %define version       3.8.1p1
+  %define version       3.9p1
   %define cvs           %{nil}
   %define release       1
 %else
-  %define version       3.8.1p1
+  %define version       3.9p1
   %define cvs           cvs20011009
   %define release       0r1
 %endif
@@ -60,7 +60,7 @@ Source0: see-above:/.../openssh-%{version}.tar.gz
 %if %{use_stable}
 Source1: see-above:/.../openssh-%{version}.tar.gz.sig
 %endif
-Source2: http://www.ntrnet.net/~jmknoble/software/%{xsa}/%{askpass}.tar.gz
+Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz
 Source3: http://www.openssh.com/faq.html
 
 %Package server
@@ -80,7 +80,7 @@ Summary(pt_BR) 	: Servidor do protocolo Secure Shell OpenSSH (sshd).
 %Package askpass
 Group           : System/Network
 Requires        : openssh = %{version}
-URL             : http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/
+URL             : http://www.jmknoble.net/software/x11-ssh-askpass/
 Obsoletes       : ssh-extras
 
 Summary         : OpenSSH X11 pass-phrase dialog.
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.49 2004/03/21 22:40:04 djm Exp $
+$Id: openssh.spec,v 1.51 2004/08/17 12:49:12 djm Exp $
diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index fc0a2f69b..5a9b1ce0c 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -212,8 +212,8 @@ in the Cygwin binary distribution, install like this:
         cd /tmp/cygwin-ssh
         find * \! -type d | tar cvjfT my-openssh.tar.bz2 -
         
-You must have installed the zlib and openssl-devel packages to be able to
-build OpenSSH!
+You must have installed the zlib, the openssl-devel and the minires-devel
+packages to be able to build OpenSSH!
 
 Please send requests, error reports etc. to cygwin@cygwin.com.
 
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index b7470092b..f8a91f2c2 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.8.1p1
+%define ver 3.9p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
@@ -74,7 +74,7 @@ Release: %{rel}
 %endif
 URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
+Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index 24f3b4651..e48607766 100644
--- a/contrib/redhat/sshd.pam
+++ b/contrib/redhat/sshd.pam
@@ -4,5 +4,3 @@ auth       required     pam_nologin.so
 account    required     pam_stack.so service=system-auth
 password   required     pam_stack.so service=system-auth
 session    required     pam_stack.so service=system-auth
-session    required     pam_limits.so
-session    optional     pam_console.so
diff --git a/contrib/solaris/README b/contrib/solaris/README
index eb4c590f4..fefdd4b53 100755
--- a/contrib/solaris/README
+++ b/contrib/solaris/README
@@ -12,8 +12,14 @@ Directions:
 
 1. make -F Makefile.in distprep  (Only if you are getting from the CVS tree)
 2. ./configure --with-pam [..any other options you want..]
-3. look at the top of contrib/solaris/buildpkg.sh for the configurable options.
-4. ./contrib/solaris/buildpkg.sh
+3. look at the top of buildpkg.sh for the configurable options and put
+   any changes you want in openssh-config.local. Additional customizations
+   can be done to the build process by creating one or more of the following
+   scripts that will be sourced by buildpkg.sh.
+        pkg_post_make_install_fixes.sh pkg-post-prototype-edit.sh
+        pkg-preinstall.local pkg-postinstall.local pkg-preremove.local
+        pkg-postremove.local pkg-request.local
+4. Run "make package"
 
 If all goes well you should have a solaris package ready to be installed.
 
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 2b43d0368..3f4a0189b 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
 Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name: openssh
-Version: 3.8.1p1
+Version: 3.9p1
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz