5 files changed, 22 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index aba358d41..1276a7997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20011023
  - (bal) Updated version to 3.0p1 in preparing for release.
  - (bal) Added 'PAM_TTY_KLUDGE' to Solaris platform.
+ - (tim) [configure.in] Fix test for broken dirname. Based on patch from
+         Dave Dykstra <dwd@bell-labs.com>. Remove un-needed test for zlib.h.
+         [contrib/caldera/openssh.spec, contrib/redhat/openssh.spec,
+         contrib/suse/openssh.spec] Update version to match version.h
 
 20011022
  - (djm) Fix fd leak in loginrec.c (ro fd to lastlog was left open).
@@ -6748,4 +6752,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1613 2001/10/23 17:14:00 mouring Exp $
+$Id: ChangeLog,v 1.1614 2001/10/24 05:36:54 tim Exp $
diff --git a/configure.in b/configure.in
index 373089cd5..627401e20 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.316 2001/10/23 17:14:01 mouring Exp $
+# $Id: configure.in,v 1.317 2001/10/24 05:36:55 tim Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -396,11 +396,7 @@ AC_ARG_WITH(zlib,
         ]
 )
 
-AC_CHECK_HEADER(zlib.h,
-        AC_CHECK_LIB(z, gzread, ,
-                AC_MSG_ERROR([*** zlib missing. install first or check config.log ***])),
-        AC_MSG_ERROR([*** zlib missing. install first or check config.log ***]))
-
+AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]))
 
 # We don't want to check if we did an pcre override.
 if test -z "$no_comp_check" ; then
@@ -431,7 +427,7 @@ AC_FUNC_STRFTIME
 
 # Checks for header files.
 AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
-        getopt.h glob.h lastlog.h libgen.h limits.h login.h \
+        getopt.h glob.h lastlog.h limits.h login.h \
         login_cap.h maillock.h netdb.h netgroup.h \
         netinet/in_systm.h paths.h poll.h pty.h regex.h \
         security/pam_appl.h shadow.h stddef.h stdint.h \
@@ -581,10 +577,12 @@ AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \
         vhangup vsnprintf waitpid __b64_ntop _getpty)
 
 dnl IRIX and Solaris 2.5.1 have dirname() in libgen
-AC_CHECK_FUNCS(dirname, ,[
+AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
         AC_CHECK_LIB(gen, dirname,[
                 AC_CACHE_CHECK([for broken dirname],
                         ac_cv_have_broken_dirname, [
+                        save_LIBS="$LIBS"
+                        LIBS="$LIBS -lgen"
                         AC_TRY_RUN(
                                 [
 #include <libgen.h>
@@ -595,7 +593,7 @@ int main(int argc, char **argv) {
 
     strncpy(buf,"/etc", 32);
     s = dirname(buf);
-    if (s && s[0] == '\0') {
+    if (!s || strncmp(s, "/", 32) != 0) {
         exit(1);
     } else {
         exit(0);
@@ -605,10 +603,12 @@ int main(int argc, char **argv) {
                                 [ ac_cv_have_broken_dirname="no" ],
                                 [ ac_cv_have_broken_dirname="yes" ]
                         )
+                        LIBS="$save_LIBS"
                 ])
-                if test "x$ac_cv_have_getopt_optreset" = "xno" ; then
+                if test "x$ac_cv_have_broken_dirname" = "xno" ; then
                         LIBS="$LIBS -lgen"
                         AC_DEFINE(HAVE_DIRNAME)
+                        AC_CHECK_HEADERS(libgen.h)
                 fi
         ])
 ])
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index d6dbfc401..2a1b5b41d 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -1,11 +1,11 @@
 %define askpass         1.2.4.1
 
 Name            : openssh
-Version         : 2.9.9p2
-Release         : 3
+Version         : 3.0p2
+Release         : 1
 Group           : System/Network
 
-Summary         : OpenSSH free Secure Shell (SSH) implementation.
+Summary         : OpenSSH free Secure Shell (SSH) protocol implementation.
 Summary(de)     : OpenSSH - freie Implementation der Secure Shell (SSH).
 Summary(es)     : OpenSSH implementación libre de Secure Shell (SSH).
 Summary(fr)     : Implémentation libre du shell sécurisé OpenSSH (SSH).
@@ -24,7 +24,7 @@ BuildRoot   	: /tmp/%{Name}-%{Version}
 
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{Version}.tar.gz
 Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{askpass}.tar.gz
-Source2: http://www.openssh.com/openssh-faq.html
+Source2: http://www.openssh.com/faq.html
 
 
 %Package server
@@ -310,4 +310,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.21 2001/09/28 10:05:08 djm Exp $
+$Id: openssh.spec,v 1.22 2001/10/24 05:36:55 tim Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index e81869a09..79553ef0f 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,5 +1,5 @@
 # Version of OpenSSH
-%define oversion 2.9.9p2
+%define oversion 3.0p2
 
 # Version of ssh-askpass
 %define aversion 1.2.4.1
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index d3a6adadf..939e3e4a8 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: 2.9.9p2
+Version: 3.0p2
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz