summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in20
-rw-r--r--contrib/caldera/openssh.spec10
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/suse/openssh.spec2
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 @@
120011023 120011023
2 - (bal) Updated version to 3.0p1 in preparing for release. 2 - (bal) Updated version to 3.0p1 in preparing for release.
3 - (bal) Added 'PAM_TTY_KLUDGE' to Solaris platform. 3 - (bal) Added 'PAM_TTY_KLUDGE' to Solaris platform.
4 - (tim) [configure.in] Fix test for broken dirname. Based on patch from
5 Dave Dykstra <dwd@bell-labs.com>. Remove un-needed test for zlib.h.
6 [contrib/caldera/openssh.spec, contrib/redhat/openssh.spec,
7 contrib/suse/openssh.spec] Update version to match version.h
4 8
520011022 920011022
6 - (djm) Fix fd leak in loginrec.c (ro fd to lastlog was left open). 10 - (djm) Fix fd leak in loginrec.c (ro fd to lastlog was left open).
@@ -6748,4 +6752,4 @@
6748 - Wrote replacements for strlcpy and mkdtemp 6752 - Wrote replacements for strlcpy and mkdtemp
6749 - Released 1.0pre1 6753 - Released 1.0pre1
6750 6754
6751$Id: ChangeLog,v 1.1613 2001/10/23 17:14:00 mouring Exp $ 6755$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 @@
1# $Id: configure.in,v 1.316 2001/10/23 17:14:01 mouring Exp $ 1# $Id: configure.in,v 1.317 2001/10/24 05:36:55 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -396,11 +396,7 @@ AC_ARG_WITH(zlib,
396 ] 396 ]
397) 397)
398 398
399AC_CHECK_HEADER(zlib.h, 399AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***]))
400 AC_CHECK_LIB(z, gzread, ,
401 AC_MSG_ERROR([*** zlib missing. install first or check config.log ***])),
402 AC_MSG_ERROR([*** zlib missing. install first or check config.log ***]))
403
404 400
405# We don't want to check if we did an pcre override. 401# We don't want to check if we did an pcre override.
406if test -z "$no_comp_check" ; then 402if test -z "$no_comp_check" ; then
@@ -431,7 +427,7 @@ AC_FUNC_STRFTIME
431 427
432# Checks for header files. 428# Checks for header files.
433AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ 429AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
434 getopt.h glob.h lastlog.h libgen.h limits.h login.h \ 430 getopt.h glob.h lastlog.h limits.h login.h \
435 login_cap.h maillock.h netdb.h netgroup.h \ 431 login_cap.h maillock.h netdb.h netgroup.h \
436 netinet/in_systm.h paths.h poll.h pty.h regex.h \ 432 netinet/in_systm.h paths.h poll.h pty.h regex.h \
437 security/pam_appl.h shadow.h stddef.h stdint.h \ 433 security/pam_appl.h shadow.h stddef.h stdint.h \
@@ -581,10 +577,12 @@ AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \
581 vhangup vsnprintf waitpid __b64_ntop _getpty) 577 vhangup vsnprintf waitpid __b64_ntop _getpty)
582 578
583dnl IRIX and Solaris 2.5.1 have dirname() in libgen 579dnl IRIX and Solaris 2.5.1 have dirname() in libgen
584AC_CHECK_FUNCS(dirname, ,[ 580AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
585 AC_CHECK_LIB(gen, dirname,[ 581 AC_CHECK_LIB(gen, dirname,[
586 AC_CACHE_CHECK([for broken dirname], 582 AC_CACHE_CHECK([for broken dirname],
587 ac_cv_have_broken_dirname, [ 583 ac_cv_have_broken_dirname, [
584 save_LIBS="$LIBS"
585 LIBS="$LIBS -lgen"
588 AC_TRY_RUN( 586 AC_TRY_RUN(
589 [ 587 [
590#include <libgen.h> 588#include <libgen.h>
@@ -595,7 +593,7 @@ int main(int argc, char **argv) {
595 593
596 strncpy(buf,"/etc", 32); 594 strncpy(buf,"/etc", 32);
597 s = dirname(buf); 595 s = dirname(buf);
598 if (s && s[0] == '\0') { 596 if (!s || strncmp(s, "/", 32) != 0) {
599 exit(1); 597 exit(1);
600 } else { 598 } else {
601 exit(0); 599 exit(0);
@@ -605,10 +603,12 @@ int main(int argc, char **argv) {
605 [ ac_cv_have_broken_dirname="no" ], 603 [ ac_cv_have_broken_dirname="no" ],
606 [ ac_cv_have_broken_dirname="yes" ] 604 [ ac_cv_have_broken_dirname="yes" ]
607 ) 605 )
606 LIBS="$save_LIBS"
608 ]) 607 ])
609 if test "x$ac_cv_have_getopt_optreset" = "xno" ; then 608 if test "x$ac_cv_have_broken_dirname" = "xno" ; then
610 LIBS="$LIBS -lgen" 609 LIBS="$LIBS -lgen"
611 AC_DEFINE(HAVE_DIRNAME) 610 AC_DEFINE(HAVE_DIRNAME)
611 AC_CHECK_HEADERS(libgen.h)
612 fi 612 fi
613 ]) 613 ])
614]) 614])
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 @@
1%define askpass 1.2.4.1 1%define askpass 1.2.4.1
2 2
3Name : openssh 3Name : openssh
4Version : 2.9.9p2 4Version : 3.0p2
5Release : 3 5Release : 1
6Group : System/Network 6Group : System/Network
7 7
8Summary : OpenSSH free Secure Shell (SSH) implementation. 8Summary : OpenSSH free Secure Shell (SSH) protocol implementation.
9Summary(de) : OpenSSH - freie Implementation der Secure Shell (SSH). 9Summary(de) : OpenSSH - freie Implementation der Secure Shell (SSH).
10Summary(es) : OpenSSH implementación libre de Secure Shell (SSH). 10Summary(es) : OpenSSH implementación libre de Secure Shell (SSH).
11Summary(fr) : Implémentation libre du shell sécurisé OpenSSH (SSH). 11Summary(fr) : Implémentation libre du shell sécurisé OpenSSH (SSH).
@@ -24,7 +24,7 @@ BuildRoot : /tmp/%{Name}-%{Version}
24 24
25Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{Version}.tar.gz 25Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{Version}.tar.gz
26Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{askpass}.tar.gz 26Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{askpass}.tar.gz
27Source2: http://www.openssh.com/openssh-faq.html 27Source2: http://www.openssh.com/faq.html
28 28
29 29
30%Package server 30%Package server
@@ -310,4 +310,4 @@ fi
310* Mon Jan 01 1998 ... 310* Mon Jan 01 1998 ...
311Template Version: 1.31 311Template Version: 1.31
312 312
313$Id: openssh.spec,v 1.21 2001/09/28 10:05:08 djm Exp $ 313$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 @@
1# Version of OpenSSH 1# Version of OpenSSH
2%define oversion 2.9.9p2 2%define oversion 3.0p2
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.2.4.1 5%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 @@
1Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 1Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
2Name: openssh 2Name: openssh
3Version: 2.9.9p2 3Version: 3.0p2
4URL: http://www.openssh.com/ 4URL: http://www.openssh.com/
5Release: 1 5Release: 1
6Source0: openssh-%{version}.tar.gz 6Source0: openssh-%{version}.tar.gz