summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-06-27 11:20:28 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-06-27 11:20:28 +1000
commit8b272ab09b722222cc4d6bb79fe6d7812c0b2f7f (patch)
tree7fe0a0f756ecb4af05b09fce59f848530cb5f18a
parent144e8d60cd3dcfdbf23c6df06617adf28b1235b8 (diff)
- (dtucker) [configure.ac] Bug #1203: Add missing '[', which causes problems
with autoconf 2.60. Patch from vapier at gentoo.org.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 10ffed226..01fa36e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060627
2 - (dtucker) [configure.ac] Bug #1203: Add missing '[', which causes problems
3 with autoconf 2.60. Patch from vapier at gentoo.org.
4
120060625 520060625
2 - (dtucker) [channels.c serverloop.c] Apply the bug #1102 workaround to ptys 6 - (dtucker) [channels.c serverloop.c] Apply the bug #1102 workaround to ptys
3 only, otherwise sshd can hang exiting non-interactive sessions. 7 only, otherwise sshd can hang exiting non-interactive sessions.
@@ -4708,4 +4712,4 @@
4708 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4712 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4709 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4713 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4710 4714
4711$Id: ChangeLog,v 1.4349 2006/06/24 22:25:25 dtucker Exp $ 4715$Id: ChangeLog,v 1.4350 2006/06/27 01:20:28 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index f6cd7bb95..3179ff3e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.342 2006/06/24 02:10:07 dtucker Exp $ 1# $Id: configure.ac,v 1.343 2006/06/27 01:20:29 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.342 $) 18AC_REVISION($Revision: 1.343 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1623,6 +1623,7 @@ main(void)
1623 AC_MSG_RESULT(no) 1623 AC_MSG_RESULT(no)
1624 AC_DEFINE(BROKEN_GETADDRINFO) 1624 AC_DEFINE(BROKEN_GETADDRINFO)
1625 ], 1625 ],
1626 [
1626 AC_MSG_RESULT(cross-compiling, assuming no) 1627 AC_MSG_RESULT(cross-compiling, assuming no)
1627 ] 1628 ]
1628 ) 1629 )