Changeset 469 for trunk

Timestamp:

Mar 26, 2015, 12:01:16 AM (10 years ago)

Author:

katerina

Message:

Fix for ticket #367 (testing scripts). Also update version and changelog.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• test/testrc_2.in (modified) (2 diffs)
• test/testrun_2c.sh (modified) (3 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.1.4)
+AM_INIT_AUTOMAKE(samhain, 3.1.5)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ -1 @@
-3.1.4:
+3.1.5:
+        * Fix IPv6 issue with portcheck (need to be able to specify
+          IPv6 interfaces).
+        * Fix minor issues with bugs in testing code
+        * Add command line option '--server-host' to set the log server
+        * In samhain.startLinux.in start script template, add code to read
+          options from /etc/sysconfig/${NAME} for RedHat
+
+3.1.4 (17-02-2015):
         * Add non-existent file to the regression test config
         * Fix erroneous call to sh_hash_init when a missing file

trunk/test/testrc_2.in

@@ -1 +1 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
+NotDashEscaped: You need GnuPG to verify this message
 
 #####################################################################
@@ -208 +209 @@
 [Clients]
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFFsTXBGq0myA9XH2wRAju6AKDsNT3cVYHVs4z+ZHdFgPwOdvESewCfcIAY
-RsnSZyhwBGtlA+rf35/gcQw=
-=Rb0p
+Version: GnuPG v1
+
+iEYEARECAAYFAlUTGCcACgkQGq0myA9XH2zINACfQb/Wfa19OBbHVkw9uBNMB+lF
+cwUAnR0Geb+sFDcv7JsrrTjY8htjPHd2
+=7wXO
 -----END PGP SIGNATURE-----

trunk/test/testrun_2c.sh

@@ -378 +378 @@
     fi
     #
+    cp ${SCRIPTDIR}/testrc_2.in testrc_2
+    #
     GPG=`find_path gpg`
     if [ -z "$GPG" ]; then
@@ -387 +389 @@
         else
             testrun_threesockets "$GPG"
-
+            #
+            cp ${SCRIPTDIR}/testrc_2.in testrc_2
+            #
             if [ -f ./yule ]; then
-                ./yule -D >/dev/null 2>>test_log 
+                ./yule -D --set-database-severity=warn >/dev/null 2>>test_log 
                 five_sec_sleep
                 netstat -pant 2>/dev/null | grep 49777 | grep yule >/dev/null 2>&1
                 if [ $? -ne 0 ]; then
-                    [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg)";
+                    [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg) - 1";
                 else
                     NSOCK=`netstat -pand 2>/dev/null | grep STREAM | grep yule | wc -l`
                     if [ $NSOCK -ne 2 ]; then
-                        [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg)";
+                        [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg) - 2";
                         netstat -pand 2>/dev/null | grep yule 
                     else
@@ -406 +410 @@
                 kill $PID
             else
-                log_fail 4 ${MAXTEST} "Three sockets open (gpg)";
+                log_fail 4 ${MAXTEST} "Three sockets open (gpg) - 3";
             fi
         fi