summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-05-04 11:05:22 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-05-04 11:05:22 +1000
commit0d780114319636a7ffc172fdbb15aa558536b744 (patch)
tree875685353f3e7ea396cd42aa743cefee50226b8f
parentd0d3fff483379baf1f38c00415c7895b41b37df9 (diff)
- (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>
to fix building on some plaforms. Fom bowman at math utah edu and des at des no.
-rw-r--r--ChangeLog69
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 68 deletions
diff --git a/ChangeLog b/ChangeLog
index 5eda2f27..30d693c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,68 +1,7 @@
-20120427
- - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6
- platform rather than exiting early, so that we still clean up and return
- success or failure to test-exec.sh
-
-20120426
- - (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters
- via Niels
- - (djm) [auth-krb5.c] Save errno across calls that might modify it;
- ok dtucker@
-
-20120423
- - OpenBSD CVS Sync
- - djm@cvs.openbsd.org 2012/04/23 08:18:17
- [channels.c]
- fix function proto/source mismatch
-
-20120422
- - OpenBSD CVS Sync
- - djm@cvs.openbsd.org 2012/02/29 11:21:26
- [ssh-keygen.c]
- allow conversion of RSA1 keys to public PEM and PKCS8; "nice" markus@
- - guenther@cvs.openbsd.org 2012/03/15 03:10:27
- [session.c]
- root should always be excluded from the test for /etc/nologin instead
- of having it always enforced even when marked as ignorenologin. This
- regressed when the logic was incompletely flipped around in rev 1.251
- ok halex@ millert@
- - djm@cvs.openbsd.org 2012/03/28 07:23:22
- [PROTOCOL.certkeys]
- explain certificate extensions/crit split rationale. Mention requirement
- that each appear at most once per cert.
- - dtucker@cvs.openbsd.org 2012/03/29 23:54:36
- [channels.c channels.h servconf.c]
- Add PermitOpen none option based on patch from Loganaden Velvindron
- (bz #1949). ok djm@
- - djm@cvs.openbsd.org 2012/04/11 13:16:19
- [channels.c channels.h clientloop.c serverloop.c]
- don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
- while; ok deraadt@ markus@
- - djm@cvs.openbsd.org 2012/04/11 13:17:54
- [auth.c]
- Support "none" as an argument for AuthorizedPrincipalsFile to indicate
- no file should be read.
- - djm@cvs.openbsd.org 2012/04/11 13:26:40
- [sshd.c]
- don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
- while; ok deraadt@ markus@
- - djm@cvs.openbsd.org 2012/04/11 13:34:17
- [ssh-keyscan.1 ssh-keyscan.c]
- now that sshd defaults to offering ECDSA keys, ssh-keyscan should also
- look for them by default; bz#1971
- - djm@cvs.openbsd.org 2012/04/12 02:42:32
- [servconf.c servconf.h sshd.c sshd_config sshd_config.5]
- VersionAddendum option to allow server operators to append some arbitrary
- text to the SSH-... banner; ok deraadt@ "don't care" markus@
- - djm@cvs.openbsd.org 2012/04/12 02:43:55
- [sshd_config sshd_config.5]
- mention AuthorizedPrincipalsFile=none default
- - djm@cvs.openbsd.org 2012/04/20 03:24:23
- [sftp.c]
- setlinebuf(3) is more readable than setvbuf(.., _IOLBF, ...)
- - jmc@cvs.openbsd.org 2012/04/20 16:26:22
- [ssh.1]
- use "brackets" instead of "braces", for consistency;
+20120504
+ - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>
+ to fix building on some plaforms. Fom bowman at math utah edu and
+ des at des no.
20120420
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
diff --git a/configure.ac b/configure.ac
index 1457b8a8..920d3119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.489 2012/04/19 11:46:38 djm Exp $
+# $Id: configure.ac,v 1.489.2.1 2012/05/04 01:05:24 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.489 $)
+AC_REVISION($Revision: 1.489.2.1 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@@ -3234,7 +3234,7 @@ fi
AC_MSG_CHECKING([if struct statvfs.f_fsid is integral type])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/types.h>
+#include <sys/param.h>
#include <sys/stat.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>