Merge 4.0p1 to the trunk.

6 files changed, 31 insertions, 14 deletions

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 53b16455e..67d8e6ff4 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,7 +17,7 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
 %if %{use_stable}
-  %define version       3.9p1
+  %define version       4.0p1
   %define cvs           %{nil}
   %define release       1
 %else
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.51 2004/08/17 12:49:12 djm Exp $
+$Id: openssh.spec,v 1.52 2005/03/09 00:02:42 djm Exp $
diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index 5a9b1ce0c..3dd45014a 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -195,28 +195,37 @@ configure are used for the Cygwin binary distribution:
 
         --prefix=/usr \
         --sysconfdir=/etc \
-        --libexecdir='$(sbindir)' \
+        --libexecdir='${sbindir}' \
         --localstatedir=/var \
-        --datadir='$(prefix)/share' \
-        --mandir='$(datadir)/man' \
+        --datadir='${prefix}/share' \
+        --mandir='${datadir}/man' \
+        --infodir='${datadir}/info'
         --with-tcp-wrappers
 
 If you want to create a Cygwin package, equivalent to the one
 in the Cygwin binary distribution, install like this:
 
         mkdir /tmp/cygwin-ssh
-        cd $(builddir)
+        cd ${builddir}
         make install DESTDIR=/tmp/cygwin-ssh
-        cd $(srcdir)/contrib/cygwin
+        cd ${srcdir}/contrib/cygwin
         make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh
         cd /tmp/cygwin-ssh
         find * \! -type d | tar cvjfT my-openssh.tar.bz2 -
-        
-You must have installed the zlib, the openssl-devel and the minires-devel
-packages to be able to build OpenSSH!
+
+You must have installed the following packages to be able to build OpenSSH:
+
+- zlib
+- openssl-devel
+- minires-devel
+
+If you want to build with --with-tcp-wrappers, you also need the package
+
+- tcp_wrappers
 
 Please send requests, error reports etc. to cygwin@cygwin.com.
 
+
 Have fun,
 
 Corinna Vinschen
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 9c0dabf41..c7164f610 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -449,7 +449,7 @@ then
           echo "Should this script create a new local account 'sshd_server' which has"
           if request "the required privileges?"
           then
-            _admingroup=`awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
+            _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
             if [ -z "${_admingroup}" ]
             then
               echo "There's no group with SID S-1-5-32-544 (Local administrators group) in"
diff --git a/contrib/findssl.sh b/contrib/findssl.sh
index 0c08d4a18..716abced5 100644
--- a/contrib/findssl.sh
+++ b/contrib/findssl.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# $Id: findssl.sh,v 1.3 2004/12/13 07:08:33 dtucker Exp $
+#
 # findssl.sh
 #       Search for all instances of OpenSSL headers and libraries
 #       and print their versions.
@@ -9,10 +11,11 @@
 #       Written by Darren Tucker (dtucker at zip dot com dot au)
 #       This file is placed in the public domain.
 #
-# $Id: findssl.sh,v 1.2 2003/11/21 12:48:56 djm Exp $
+#       Release history:
 #       2002-07-27: Initial release.
 #       2002-08-04: Added public domain notice.
 #       2003-06-24: Incorporated readme, set library paths. First cvs version.
+#       2004-12-13: Add traps to cleanup temp files, from Amarendra Godbole.
 #
 # "OpenSSL headers do not match your library" are usually caused by
 # OpenSSH's configure picking up an older version of OpenSSL headers
@@ -64,6 +67,11 @@ CC=gcc
 STATIC=-static
 
 #
+# Cleanup on interrupt
+#
+trap 'rm -f conftest.c' INT HUP TERM
+
+#
 # Set up conftest C source
 #
 rm -f findssl.log
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index f8a91f2c2..8fbc4c02a 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.9p1
+%define ver 4.0p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 3f4a0189b..449613db6 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.9p1
+Version: 4.0p1
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz