From 573e3878b8faa7df21ba265b237b7b394a9fc9a7 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 2 Mar 2007 17:50:03 +1100 Subject: [PATCH] - (dtucker) [configure.ac] For Cygwin, read files in textmode (which allows CRLF as well as LF lineendings) and write in binary mode. Patch from vinschen at redhat.com. --- ChangeLog | 7 ++++++- configure.ac | 6 +++--- 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 @@ +20070302 + - (dtucker) [configure.ac] For Cygwin, read files in textmode (which allows + CRLF as well as LF lineendings) and write in binary mode. Patch from + vinschen at redhat.com. + 20070301 - (dtucker) OpenBSD CVS Sync - dtucker@cvs.openbsd.org 2007/03/01 10:28:02 @@ -2784,4 +2789,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4626 2007/03/01 17:34:52 tim Exp $ +$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 @@ -# $Id: configure.ac,v 1.370 2006/10/06 23:07:21 dtucker Exp $ +# $Id: configure.ac,v 1.371 2007/03/02 06:50:04 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.370 $) +AC_REVISION($Revision: 1.371 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -360,7 +360,7 @@ int main(void) { exit(0); } ;; *-*-cygwin*) check_for_libcrypt_later=1 - LIBS="$LIBS /usr/lib/textmode.o" + LIBS="$LIBS /usr/lib/textreadmode.o" AC_DEFINE(HAVE_CYGWIN, 1, [Define if you are on Cygwin]) AC_DEFINE(USE_PIPES, 1, [Use PIPES instead of a socketpair()]) AC_DEFINE(DISABLE_SHADOW, 1,