summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac8
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 19734bdc6..357d7a8cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (tim) [session.c] Logout records were not updated on systems with 2 - (tim) [session.c] Logout records were not updated on systems with
3 post auth privsep disabled due to bug 1086 changes. Analysis and patch 3 post auth privsep disabled due to bug 1086 changes. Analysis and patch
4 by vinschen at redhat.com. OK tim@, dtucker@. 4 by vinschen at redhat.com. OK tim@, dtucker@.
5 - (dtucker) [configure.ac] Typo in Ultrix and NewsOS sections (NEED_SETPRGP
6 -> NEED_SETPGRP), reported by Berhard Simon. ok tim@
5 7
620060206 820060206
7 - (tim) [configure.ac] Remove unnecessary tests for net/if.h and 9 - (tim) [configure.ac] Remove unnecessary tests for net/if.h and
@@ -3845,4 +3847,4 @@
3845 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3847 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3846 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3848 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3847 3849
3848$Id: ChangeLog,v 1.4124 2006/02/07 23:17:44 tim Exp $ 3850$Id: ChangeLog,v 1.4125 2006/02/08 11:11:27 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index f27320e56..ca381c770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.327 2006/02/05 19:27:10 tim Exp $ 1# $Id: configure.ac,v 1.328 2006/02/08 11:11:28 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.327 $) 18AC_REVISION($Revision: 1.328 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -345,7 +345,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
345 fi 345 fi
346 ;; 346 ;;
347mips-sony-bsd|mips-sony-newsos4) 347mips-sony-bsd|mips-sony-newsos4)
348 AC_DEFINE(NEED_SETPRGP, 1, [Need setpgrp to acquire controlling tty]) 348 AC_DEFINE(NEED_SETPGRP, 1, [Need setpgrp to acquire controlling tty])
349 SONY=1 349 SONY=1
350 ;; 350 ;;
351*-*-netbsd*) 351*-*-netbsd*)
@@ -589,7 +589,7 @@ mips-sony-bsd|mips-sony-newsos4)
589*-*-ultrix*) 589*-*-ultrix*)
590 AC_DEFINE(BROKEN_GETGROUPS, 1, [getgroups(0,NULL) will return -1]) 590 AC_DEFINE(BROKEN_GETGROUPS, 1, [getgroups(0,NULL) will return -1])
591 AC_DEFINE(BROKEN_MMAP, 1, [Ultrix mmap can't map files]) 591 AC_DEFINE(BROKEN_MMAP, 1, [Ultrix mmap can't map files])
592 AC_DEFINE(NEED_SETPRGP) 592 AC_DEFINE(NEED_SETPGRP)
593 AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix]) 593 AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix])
594 ;; 594 ;;
595 595