Merge pull request #10 from zestysoft/pull-request-nullglob

debian/patches/Merge-pull-request-#10-from-zestysoftpull-request-nullglob

@@ -0,0 +1,51 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ securityonion-sostat (20120722-0ubuntu0securityonion59) trusty; urgency=medium
+ .
+   * merge fix from Wes Lambert
+Author: Doug Burks <[email protected]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- securityonion-sostat-20120722.orig/bin/sostat
++++ securityonion-sostat-20120722/bin/sostat
+@@ -8,8 +8,12 @@
+ # Stephane Chazelas
+ # Shane Castle
+
+-# Determine if we're running Snort or Suricata
+-source /etc/nsm/securityonion.conf
++# Import settings file
++if [ -f /etc/nsm/securityonion.conf ]; then
++   source /etc/nsm/securityonion.conf
++else
++   echo "Missing /etc/nsm/securityonion.conf file!" && exit 1
++fi
+
+ # make sure if statements using wildcards for filenames don't equal true when no files exist
+ shopt -s nullglob
+@@ -226,7 +230,7 @@ if [ $(/usr/lib/update-notifier/apt-chec
+         echo "Run 'sudo soup' to install the latest updates."
+ fi
+
+-if [ -f /etc/nsm/securityonion.conf ] && source /etc/nsm/securityonion.conf && [ "$ELSA" = "YES" ]; then
++if [ "$ELSA" = "YES" ]; then
+         echo
+         header "ELSA"
+ 	echo "Syslog-ng"

debian/patches/series

@@ -54,3 +54,4 @@ sostat:-output-when-current-monitoring-interval-has-not-completed-#960
 Sostat-cleanup-output:-Suricata-output-when-no-packet-drops-received-and-sostat-interface-formatting-#7
 merge-fix-from-Wes-Lambert
 Merge-pull-request-#9-from-zestysoftpull-request-bugfixes
+Merge-pull-request-#10-from-zestysoftpull-request-nullglob