summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 06046bebd..8f568e959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120120519
2 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
3 from cjwatson at debian org.
4
120120504 520120504
2 - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> 6 - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>
3 to fix building on some plaforms. Fom bowman at math utah edu and 7 to fix building on some plaforms. Fom bowman at math utah edu and
diff --git a/configure.ac b/configure.ac
index 6ece6e18b..bdf1d12c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.490 2012/05/04 01:05:45 dtucker Exp $ 1# $Id: configure.ac,v 1.491 2012/05/19 04:25:42 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.490 $) 18AC_REVISION($Revision: 1.491 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2591,7 +2591,7 @@ elif test "x$sandbox_arg" = "xdarwin" || \
2591 AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)]) 2591 AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)])
2592elif test "x$sandbox_arg" = "xseccomp_filter" || \ 2592elif test "x$sandbox_arg" = "xseccomp_filter" || \
2593 ( test -z "$sandbox_arg" && \ 2593 ( test -z "$sandbox_arg" && \
2594 test "x$have_seccomp_filter" == "x1" && \ 2594 test "x$have_seccomp_filter" = "x1" && \
2595 test "x$ac_cv_header_linux_audit_h" = "xyes" && \ 2595 test "x$ac_cv_header_linux_audit_h" = "xyes" && \
2596 test "x$have_seccomp_audit_arch" = "x1" && \ 2596 test "x$have_seccomp_audit_arch" = "x1" && \
2597 test "x$have_linux_no_new_privs" = "x1" && \ 2597 test "x$have_linux_no_new_privs" = "x1" && \