rpms/snort/F-9 snort.spec,1.32,1.33 sysconfig.snort,1.1,1.2

[Steve Grubb (sgrubb)]

Author: sgrubb

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

Modified Files:
	snort.spec sysconfig.snort 
Log Message:
* 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
- Fix bz 452736, 452737, & 452763



Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-9/snort.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- snort.spec	25 Jun 2008 03:35:17 -0000	1.32
+++ snort.spec	2 Jul 2008 18:18:41 -0000	1.33
@@ -12,7 +12,8 @@
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
-Prereq:         /sbin/chkconfig, /usr/sbin/useradd
+Prereq:         /sbin/chkconfig
+Requires(pre):  shadow-utils
 BuildRequires:  libpcap-devel >= 0.4
 BuildRequires:  perl
 BuildRequires:  pcre-devel
@@ -309,7 +310,7 @@
 install libsf_engine.so.0 %{buildroot}%{_libdir}/snort/dynamicengine
 install libsf_engine.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicengine
 
-for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns'; do
+for i in 'dcerpc' 'ssh' 'ftptelnet' 'smtp' 'dns' 'ssl'; do
        install snort_dynamicpreprocessor/libsf_${i}_preproc.so %{buildroot}%{_libdir}/snort/dynamicpreprocessor
        install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
        install snort_dynamicpreprocessor/libsf_${i}_preproc.so.0.0.0 %{buildroot}%{_libdir}/snort/dynamicpreprocessor
@@ -319,15 +320,15 @@
 
 install snort.8 %{buildroot}%{_mandir}/man8
 install etc/gen-msg.map etc/sid-msg.map etc/threshold.conf etc/unicode.map etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort
-install -p -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d
+install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}
 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
+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!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}/snort/rules!'  %{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
-perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf
+perl -pi -e 's!dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so!dynamicengine %{_libdir}/snort/dynamicengine/libsf_engine.so!' %{buildroot}%{_sysconfdir}/snort/snort.conf
 
 %clean
 if [ -d %{buildroot} ]; then
@@ -336,8 +337,9 @@
 
 
 %pre
-/usr/sbin/useradd -M -o -r -d /var/lib/snort -s /bin/false \
-        -c "snortd user" -u 62 snortd > /dev/null 2>&1 || :
+getent passwd snortd >/dev/null || \
+	/usr/sbin/useradd -M -o -r -d /var/lib/snort -s /sbin/nologin \
+	-c "Snort Daemon" -u 62 snortd > /dev/null 2>&1 || :
 
 %post
 /sbin/chkconfig --add snortd
@@ -462,10 +464,10 @@
 %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
+%attr(755,root,root) %{_initrddir}/snortd
 %{_libdir}/snort
 %config(noreplace)%{_sysconfdir}/sysconfig/snort
-%attr(0755,snortd,snortd) %dir /var/lib/snort
+%attr(0755,snortd,snortd) %dir %{_var}/lib/snort
 
 %files plain+flexresp
 %attr(755,root,root) %{_sbindir}/snort-plain+flexresp
@@ -495,6 +497,7 @@
 %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
+- Fix bz 452736, 452737, & 452763
 
 * Thu May 15 2008 Dennis Gilmore <dennis at ausil.us> - 2.8.1-3
 - make rules dir


Index: sysconfig.snort
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-9/sysconfig.snort,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysconfig.snort	17 Nov 2007 23:46:17 -0000	1.1
+++ sysconfig.snort	2 Jul 2008 18:18:41 -0000	1.2
@@ -1,2 +1,11 @@
+# What user account should we run under.
+USER="root"
+
+# What group account should we run under. 
+GROUP="root"
+
 # define the interface we listen on
-INTERFACE=eth0
+INTERFACE="eth0"
+
+# If you are using prelude, delete the '-A fast' option
+SNORT_OPTIONS="-A fast -b -l /var/log/snort -d"