Merge pull request firnsy#164 from pecastro/master

Some fixes to be able to create an RPM off the current head.

configure.ac

@@ -16,10 +16,10 @@ ADD_WERROR="no"
 # Test for -Werror and sed it out for now since some of the auto tests,
 # for example AC_CHECK_LIB, will fail because of
 # warning: conflicting types for built-in function <func>
-if eval "echo $CFLAGS | grep -e -Werror"; then
-    CFLAGS=`echo $CFLAGS | sed -e "s/-Werror//g"`
-    ADD_WERROR="yes"
-fi
+#if eval "echo $CFLAGS | grep -e -Werror"; then
+#    CFLAGS=`echo $CFLAGS | sed -e "s/-Werror//g"`
+#    ADD_WERROR="yes"
+#fi
 
 # Disable annoying practice of recursively re-running the autotools
 AM_MAINTAINER_MODE

rpm/barnyard2.spec

@@ -43,7 +43,7 @@
 
 Summary: Snort Log Backend 
 Name: barnyard2
-Version: 1.13
+Version: 1.14
 Source0: https://github.com/firnsy/barnyard2/archive/barnyard2-%{version}.tar.gz
 Release: 1%{?dist}
 License: GPL

src/Makefile.am

@@ -23,6 +23,7 @@ sf_types.h \
 spooler.c spooler.h \
 strlcatu.c strlcatu.h \
 strlcpyu.c strlcpyu.h \
+sf_protocols.h \
 timersub.h \
 twofish.c twofish.h \
 unified2.h \

src/output-plugins/Makefile.am

@@ -21,7 +21,7 @@ spo_log_null.c spo_log_null.h \
 spo_log_tcpdump.c spo_log_tcpdump.h \
 spo_sguil.c spo_sguil.h \
 spo_echidna.c spo_echidna.h \
-spo_syslog_full.c spo_syslog.full.h \
+spo_syslog_full.c spo_syslog_full.h \
 spo_database.c spo_database.h \
 spo_database_cache.c spo_database_cache.h