Changeset 447 for trunk

Timestamp:

Mar 29, 2014, 7:16:01 AM (11 years ago)

Author:

katerina

Message:

Fix for ticket #349 (no inline asm for cygwin).

Location:

trunk

Files:

• configure.ac (modified) (4 diffs)
• docs/Changelog (modified) (8 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.1.0)
+AM_INIT_AUTOMAKE(samhain, 3.1.1)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -56 +56 @@
 dnmalloc_ok=yes
 sh_use_pie=yes
+enable_asm_ok=yes
 
 case "$host_os" in
@@ -92 +93 @@
         AC_DEFINE([USE_REGISTRY_CHECK], 1, [Define for registry check])
         dnmalloc_ok=no
-        AC_MSG_RESULT([no trusted paths and no dnmalloc])
+        enable_asm_ok=no
+        AC_MSG_RESULT([no trusted paths, no dnmalloc. no asm optimize])
         ;;
 
@@ -1655 +1657 @@
 AC_SUBST(mydebugdef)
 
-sh_enable_asm=yes
+if test "x${enable_asm_ok}" = "xyes"; then
+   sh_enable_asm=yes
+else
+   sh_enable_asm=no
+fi
 AC_ARG_ENABLE(asm,
         [  --disable-asm                        disable asm inline code],

trunk/docs/Changelog

@@ +1 @@
+3.1.1:
+        * Disable inline asm on Cygwin (issue reported by Erik)
+
+3.1.0 (31-10-2013):
         * Add support for SHA2-256 checksum function
         * Drop support for --enable-khide on kernel version 3.x and above
@@ -15 +19 @@
           by N. Kerski)
 
-3.0.13:
+3.0.13 (11-06-2013):
         * Fix detection of nonfunctional /dev/kmem
         * Fix race condition in GrowingLogfiles policy that
           causes spurious reports (problem noticed by J. Daubert)
 
-3.0.12:
+3.0.12 (16-05-2013):
         * Fix compiler warning in bignum.c (unused parameter)
         * Detect if /var/run is a symlink and /run exists
@@ -32 +36 @@
           (reported by M. Ward)
 
-3.0.11:
+3.0.11 (08-04-2013):
         * Fix for compile error on HP-UX (reported by P. Alves)
         * Propagate ERANGE error from getgrxxx_r (issue raised by C. Feikes)
@@ -44 +48 @@
           not only get added/deleted but also modified
 
-3.0.10:
+3.0.10 (13-01-2013):
         * Revert to previous logic in samhain.c because it will block
           otherwise (reported by Alexandr Sabitov)
 
-3.0.9:
+3.0.9 (21-12-2012):
         * Fixed a Cygwin compile warning
         * Change logic in samhain.c to make sure inotify doesn't cause
@@ -61 +65 @@
         * Fix detection of utmpx.h (reported by D. Thiel)
 
-3.0.8:
+3.0.8 (01-11-2012):
         * rename to 3.0.8 for release
         * useful exit status for samhainadmin.pl --examine
 
-3.0.7a:
+3.0.7a (25-12-2012):
         * add ability to create RPM with preset password (use
           env var PASSWORD)
@@ -71 +75 @@
         * fix minor bug in samhain_setpwd.c (incorrect error message)
 
-3.0.7:
+3.0.7 (25-10-2012):
         * update documentation for prelude
         * fix configure to properly search for Oracle Instantclient SDK
@@ -79 +83 @@
         * don't check for assembly optimization unless linux or *BSD
 
-3.0.6:
+3.0.6 (01-09-2012):
         * install logrotate script if /etc/logrotate.d is detected
         * new option --enable-suid for nagios
@@ -90 +94 @@
         * option SetReportFile for writing out summary after file check
 
-3.0.5:
+3.0.5 (11-07-2012):
         * fix xml format templates for registry check
         * fix database download on registry check init (reported by ldieu)
 
-3.0.4:
+3.0.4 (01-05-2012):
         * fix verbosity of message for alerts on already deleted watches
           (set it to debug - suggested by xrx)