From c1bf48aa8ec2c7b36532e0bae6b5dde3c0a29e37 Mon Sep 17 00:00:00 2001
From: Andy Hassall <andy.hassall@trustnetworks.com>
Date: Wed, 21 Feb 2018 21:15:55 +0000
Subject: [PATCH 1/2] version bump

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2c46d29..a571149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([cyberprobe], [1.9.4], [cyberprobe@trustnetworks.com])
+AC_INIT([cyberprobe], [1.9.5], [cyberprobe@trustnetworks.com])
 AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_CONFIG_SRCDIR([src/target.h])
 AC_CONFIG_HEADERS([config.h])

From 9b747239684968902289ad47cf07b0a1b3ad4052 Mon Sep 17 00:00:00 2001
From: Andy Hassall <andy.hassall@trustnetworks.com>
Date: Wed, 21 Feb 2018 21:31:03 +0000
Subject: [PATCH 2/2] [ch2833] temporarily disable tcp dns tests

---
 tests/testsuite.at | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 42f187b..81bf9ab 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -22,13 +22,14 @@ sort < $abs_srcdir/samples/dns2.pcap.monitor > output2
 AT_CHECK([diff output1 output2],,[])
 AT_CLEANUP
 
-AT_SETUP([dnstcp.pcap])
-cat $abs_srcdir/samples/dnstcp.pcap | \
-    $abs_top_builddir/src/cybermon -f - -c $abs_top_srcdir/config/monitor.lua | \
-    sort > output1
-sort < $abs_srcdir/samples/dnstcp.pcap.monitor > output2
-AT_CHECK([diff -B output1 output2],,[])
-AT_CLEANUP
+# disabled whilst dns over tcp processing is disabled
+#AT_SETUP([dnstcp.pcap])
+#cat $abs_srcdir/samples/dnstcp.pcap | \
+#    $abs_top_builddir/src/cybermon -f - -c $abs_top_srcdir/config/monitor.lua | \
+#    sort > output1
+#sort < $abs_srcdir/samples/dnstcp.pcap.monitor > output2
+#AT_CHECK([diff -B output1 output2],,[])
+#AT_CLEANUP
 
 AT_SETUP([ether.pcap])
 cat $abs_srcdir/samples/ether.pcap | \
@@ -130,13 +131,14 @@ cat $abs_srcdir/samples/dns2.pcap.model > output2
 AT_CHECK([diff output1 output2],,[])
 AT_CLEANUP
 
-AT_SETUP([dnstcp.pcap])
-cat $abs_srcdir/samples/dnstcp.pcap | \
-    $abs_top_builddir/src/cybermon -f - -c $abs_top_srcdir/config/json.lua | \
-    $abs_top_srcdir/tests/summarise_json > output1
-cat $abs_srcdir/samples/dnstcp.pcap.model > output2
-AT_CHECK([diff output1 output2],,[])
-AT_CLEANUP
+# disabled whilst dns over tcp processing is disabled
+#AT_SETUP([dnstcp.pcap])
+#cat $abs_srcdir/samples/dnstcp.pcap | \
+#    $abs_top_builddir/src/cybermon -f - -c $abs_top_srcdir/config/json.lua | \
+#    $abs_top_srcdir/tests/summarise_json > output1
+#cat $abs_srcdir/samples/dnstcp.pcap.model > output2
+#AT_CHECK([diff output1 output2],,[])
+#AT_CLEANUP
 
 AT_SETUP([ether.pcap])
 cat $abs_srcdir/samples/ether.pcap | \
@@ -252,4 +254,3 @@ Stop lion resource lioness
 Stop tiger resource tiger
 ])
 AT_CLEANUP
-