Changeset 79fe0ad

Timestamp:

Feb 13, 2009, 12:11:56 PM (16 years ago)

Author:

Sam Hartman <hartmans@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

23e1110

Parents:

308ace3 (diff), 87afe92 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'support_stack_protector'

Files:

• configure.ac (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• owl.h (modified) (1 diff)

configure.ac

@@ -45 +45 @@
         AC_MSG_RESULT(no)
 fi
+PROTECT_CFLAGS=${PROTECT_CFLAGS-"-fstack-protector"}
+SAVE_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS $PROTECT_CFLAGS"
+AC_MSG_CHECKING(whether protection cflags work)
+AC_COMPILE_IFELSE(int i;,
+    [AC_MSG_RESULT(yes)],
+    [AC_MSG_RESULT(no)
+    CFLAGS=$SAVE_CFLAGS])
 
+
+AC_CHECK_LIB(ssp, __stack_chk_guard)
 AC_CHECK_LIB(ncursesw, initscr,, AC_MSG_ERROR(No libncursesw found.))
 AC_CHECK_LIB(com_err, com_err)

ChangeLog

@@ +1 @@
+1.0.6
+
 1.0.5
  * Implement initial support for real timers. -nelhage

owl.h

@@ -52 +52 @@
 
 #ifndef OWL_VERSION_STRING
-#define OWL_VERSION_STRING "1.0.5"
+#define OWL_VERSION_STRING "1.0.6"
 #endif