rpms/snort/F-9 snort.spec,1.31,1.32 snortd,1.2,1.3

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/snort/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv640

Modified Files:
	snort.spec snortd 
Log Message:
make sure we have to correct initscript and create a snortd user to run snort as



Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/F-9/snort.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- snort.spec	4 Jun 2008 20:05:17 -0000	1.31
+++ snort.spec	25 Jun 2008 03:35:17 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
+Prereq:         /sbin/chkconfig, /usr/sbin/useradd
 BuildRequires:  libpcap-devel >= 0.4
 BuildRequires:  perl
 BuildRequires:  pcre-devel
@@ -322,6 +323,7 @@
 mkdir -p %{buildroot}/etc/sysconfig/
 install -p -m 644 %{SOURCE3} %{buildroot}/etc/sysconfig/snort
 mkdir -p %{buildroot}%{_sysconfdir}/snort/rules/
+mkdir -p %{buildroot}/var/lib/snort
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort/snort.conf
 perl -pi -e 's!dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/!dynamicpreprocessor directory %{_libdir}/snort/dynamicpreprocessor/!' %{buildroot}%{_sysconfdir}/snort/snort.conf
@@ -333,6 +335,10 @@
 fi
 
 
+%pre
+/usr/sbin/useradd -M -o -r -d /var/lib/snort -s /bin/false \
+        -c "snortd user" -u 62 snortd > /dev/null 2>&1 || :
+
 %post
 /sbin/chkconfig --add snortd
 /sbin/ldconfig
@@ -452,13 +458,14 @@
 
 %attr(755,root,root) %{_sbindir}/snort-plain
 # handle compressed man pages.
-%attr(755,root,root) %{_mandir}/man8/snort.8*
-%attr(755,root,root) %dir /var/log/snort
+%attr(644,root,root) %{_mandir}/man8/snort.8*
+%attr(755,snortd,snortd) %dir /var/log/snort
 %attr(755,root,root) %dir %{_sysconfdir}/snort/rules
 %attr(644,root,root) %config %{_sysconfdir}/snort
 %attr(755,root,root) /etc/rc.d/init.d/snortd
 %{_libdir}/snort
 %config(noreplace)%{_sysconfdir}/sysconfig/snort
+%attr(0755,snortd,snortd) %dir /var/lib/snort
 
 %files plain+flexresp
 %attr(755,root,root) %{_sbindir}/snort-plain+flexresp
@@ -486,6 +493,9 @@
 
 
 %changelog
+* Tue Jun 24 2008 Dennis Gilmore <dennis at ausil.us> - 2.8.1-4
+- make sure we have the right initscript  and create a snortd user
+
 * Thu May 15 2008 Dennis Gilmore <dennis at ausil.us> - 2.8.1-3
 - make rules dir
 


Index: snortd
===================================================================
RCS file: /cvs/extras/rpms/snort/F-9/snortd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snortd	17 Nov 2007 23:46:17 -0000	1.2
+++ snortd	25 Jun 2008 03:35:17 -0000	1.3
@@ -27,7 +27,7 @@
   start)
 	echo -n "Starting snort: "
         cd /var/log/snort
-	daemon /usr/sbin/snort -A fast -b -l /var/log/snort -d -D \
+	daemon /usr/sbin/snort -D $SNORT_OPTIONS -u $USER -g $GROUP \
 		 -i $INTERFACE -c /etc/snort/snort.conf
 	touch /var/lock/subsys/snort
 	echo