summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d6ed13f81..fa793d78a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@
39 - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we 39 - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
40 need them to cut down on the name collisions. 40 need them to cut down on the name collisions.
41 - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types. 41 - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.
42 - (dtucker) [configure.ac] Have --without-hardening not turn off
43 stack-protector since that has a separate flag that's been around a while.
42 44
4320140118 4520140118
44 - (djm) OpenBSD CVS Sync 46 - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 4f40afce3..f9d87e4b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.553 2014/01/17 08:17:35 dtucker Exp $ 1# $Id: configure.ac,v 1.554 2014/01/17 10:54:32 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.553 $) 18AC_REVISION($Revision: 1.554 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -134,7 +134,6 @@ AC_ARG_WITH([stackprotect],
134AC_ARG_WITH([hardening], 134AC_ARG_WITH([hardening],
135 [ --without-hardening Don't use toolchain hardening flags], [ 135 [ --without-hardening Don't use toolchain hardening flags], [
136 if test "x$withval" = "xno"; then 136 if test "x$withval" = "xno"; then
137 use_stack_protector=0
138 use_toolchain_hardening=0 137 use_toolchain_hardening=0
139 fi ]) 138 fi ])
140 139