Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	barnyard2.changes
@@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat May 12 15:57:25 UTC 2012 - cs@linux-administrator.com + +- initscript fixes +- sysconfig fixes & additions +- default config patch +- specfile fixes + +------------------------------------------------------------------- Sat Jan 28 13:18:55 UTC 2012 - cs@linux-administrator.com - initial build of version 1.9
[-] [+]	Changed	barnyard2.spec ^
@@ -55,6 +55,7 @@ %else Source3: %{name}-rh.init %endif +Patch0: %{name}-config.patch Url: http://www.securixlive.com/barnyard2/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libpcap-devel @@ -105,7 +106,7 @@ %prep %setup -q -n %{name}-%{version} - +%patch0 %build @@ -134,6 +135,7 @@ %{__install} -D -m 644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/barnyard2 %{__install} -D -m 755 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/barnyard2 %endif +%{__install} -d -m 755 $RPM_BUILD_ROOT/var/log/%{name} %clean if [ -d $RPM_BUILD_ROOT ] && [ "$RPM_BUILD_ROOT" != "/" ] ; then @@ -160,6 +162,7 @@ %doc LICENSE doc/README* %attr(755,root,root) %{_bindir}/barnyard2 %dir %{_sysconfdir}/snort +%dir /var/log/%{name} %attr(640,root,root) %config %{_sysconfdir}/snort/barnyard2.conf %if 0%{?suse_version} %attr(755,root,root) %config %{_sysconfdir}/init.d/barnyard2
[-] [+]	Added	barnyard2-config.patch ^
@@ -0,0 +1,11 @@ +--- etc/barnyard2.conf.orig 2012-05-12 17:01:12.364616819 +0200 ++++ etc/barnyard2.conf 2012-05-12 17:54:07.493267242 +0200 +@@ -29,7 +29,7 @@ + config reference_file: /etc/snort/reference.config + config classification_file: /etc/snort/classification.config + config gen_file: /etc/snort/gen-msg.map +-config sid_file: /etc/snort/sid-msg.map ++config sid_file: /etc/snort/rules/sid-msg.map + + # define dedicated references similar to that of snort. + #
[-] [+]	Changed	barnyard2-rh.init ^
@@ -36,7 +36,9 @@ PIDFILE="/var/lock/subsys/barnyard2-$INT.pid" ARCHIVEDIR="$SNORTDIR/$INT/archive" WALDO_FILE="$SNORTDIR/$INT/barnyard2.waldo" - BARNYARD_OPTS="-D -c $CONF -d $SNORTDIR/${INT} -w $WALDO_FILE -L $SNORTDIR/${INT} -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE $EXTRA_ARGS" + mkdir -p ${ARCHIVEDIR} `dirname ${WALDO_FILE}` + chown -R ${UID}:${GID} ${ARCHIVEDIR} `dirname ${WALDO_FILE} + BARNYARD_OPTS="-D -c $CONF -d ${SNORTDIR}/${INT} -w $WALDO_FILE -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE $EXTRA_ARGS" daemon $prog $BARNYARD_OPTS done RETVAL=$?
[-] [+]	Changed	barnyard2-suse.init ^
@@ -48,7 +48,9 @@ for INT in ${INTERFACES} ; do ARCHIVEDIR="${SNORTDIR}/${INT}/archive" WALDO_FILE="${SNORTDIR}/${INT}/barnyard2.waldo" - BARNYARD_OPTS="-D -c ${CONF} -d $SNORTDIR/${INT} -w ${WALDO_FILE} -L ${SNORTDIR}/${INT} -a ${ARCHIVEDIR} -f ${LOG_FILE} -X ${PIDFILE} ${EXTRA_ARGS}" + mkdir -p ${ARCHIVEDIR} `dirname ${WALDO_FILE}` + chown -R ${UID}:${GID} ${ARCHIVEDIR} `dirname ${WALDO_FILE}` + BARNYARD_OPTS="-D -c ${CONF} -d ${SNORTDIR}/${INT} -w ${WALDO_FILE} -a ${ARCHIVEDIR} -f ${LOG_FILE} -X ${PIDFILE} ${EXTRA_ARGS}" /sbin/startproc $barnyard2_BIN ${BARNYARD_OPTS} done # Remember status and be verbose
[-] [+]	Changed	barnyard2.sysconfig ^
@@ -1,11 +1,14 @@ # Config file for /etc/init.d/barnyard2 -LOG_FILE="snort_unified.log" +LOG_FILE="/var/log/snort/snort_unified.log" # You probably don't want to change this, but in case you do SNORTDIR="/var/log/snort" INTERFACES="eth0" # Probably not this either -CONF=/etc/snort/barnyard.conf +CONF=/etc/snort/barnyard2.conf EXTRA_ARGS="" + +UID="snort" +GID="snort"