summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6377c49a6..b1faab391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120070302
2 - (dtucker) [configure.ac] For Cygwin, read files in textmode (which allows
3 CRLF as well as LF lineendings) and write in binary mode. Patch from
4 vinschen at redhat.com.
5
120070301 620070301
2 - (dtucker) OpenBSD CVS Sync 7 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2007/03/01 10:28:02 8 - dtucker@cvs.openbsd.org 2007/03/01 10:28:02
@@ -2784,4 +2789,4 @@
2784 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2789 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2785 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2790 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2786 2791
2787$Id: ChangeLog,v 1.4626 2007/03/01 17:34:52 tim Exp $ 2792$Id: ChangeLog,v 1.4627 2007/03/02 06:50:03 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index c596a7bd9..b6a25c9e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.370 2006/10/06 23:07:21 dtucker Exp $ 1# $Id: configure.ac,v 1.371 2007/03/02 06:50:04 dtucker 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.370 $) 18AC_REVISION($Revision: 1.371 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -360,7 +360,7 @@ int main(void) { exit(0); }
360 ;; 360 ;;
361*-*-cygwin*) 361*-*-cygwin*)
362 check_for_libcrypt_later=1 362 check_for_libcrypt_later=1
363 LIBS="$LIBS /usr/lib/textmode.o" 363 LIBS="$LIBS /usr/lib/textreadmode.o"
364 AC_DEFINE(HAVE_CYGWIN, 1, [Define if you are on Cygwin]) 364 AC_DEFINE(HAVE_CYGWIN, 1, [Define if you are on Cygwin])
365 AC_DEFINE(USE_PIPES, 1, [Use PIPES instead of a socketpair()]) 365 AC_DEFINE(USE_PIPES, 1, [Use PIPES instead of a socketpair()])
366 AC_DEFINE(DISABLE_SHADOW, 1, 366 AC_DEFINE(DISABLE_SHADOW, 1,