summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 88b46a19d..29c894bcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
6 Tru64. readv doesn't seem to be a comparable object there. 6 Tru64. readv doesn't seem to be a comparable object there.
7 bz#1386, patch from dtucker@ ok me 7 bz#1386, patch from dtucker@ ok me
8 - (djm) [Makefile.in] Pass though pass to conch for interop tests 8 - (djm) [Makefile.in] Pass though pass to conch for interop tests
9 - (djm) [configure.ac] unbreak: remove extra closing brace
9 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
10 - djm@cvs.openbsd.org 2008/07/04 23:08:25 11 - djm@cvs.openbsd.org 2008/07/04 23:08:25
11 [packet.c] 12 [packet.c]
@@ -4591,4 +4592,4 @@
4591 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4592 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4592 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4593 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4593 4594
4594$Id: ChangeLog,v 1.5063 2008/07/04 23:50:23 djm Exp $ 4595$Id: ChangeLog,v 1.5064 2008/07/04 23:52:03 djm Exp $
diff --git a/configure.ac b/configure.ac
index 330b0eb5e..33e138ab1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.407 2008/07/04 23:36:58 djm Exp $ 1# $Id: configure.ac,v 1.408 2008/07/04 23:52:03 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.407 $) 18AC_REVISION($Revision: 1.408 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -841,7 +841,7 @@ mips-sony-bsd|mips-sony-newsos4)
841 AC_DEFINE(SETEUID_BREAKS_SETUID) 841 AC_DEFINE(SETEUID_BREAKS_SETUID)
842 AC_DEFINE(BROKEN_SETREUID) 842 AC_DEFINE(BROKEN_SETREUID)
843 AC_DEFINE(BROKEN_SETREGID) 843 AC_DEFINE(BROKEN_SETREGID)
844 AC_DEFINE(BROKEN_READV_COMPARISON, 1, [Can't do comparisons on readv])) 844 AC_DEFINE(BROKEN_READV_COMPARISON, 1, [Can't do comparisons on readv])
845 ;; 845 ;;
846 846
847*-*-nto-qnx*) 847*-*-nto-qnx*)