rpms/snort/devel snort.spec,1.35,1.36 sysconfig.snort,1.2,1.3

[Steve Grubb (sgrubb)]

Author: sgrubb

Update of /cvs/pkgs/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14988

Modified Files:
	snort.spec sysconfig.snort 
Log Message:
* Wed Jun 25 2008 Steve Grubb <sgrubb at redhat.com> - 2.8.1-5
- Fix bz 452736, 452737, & 452763



Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/snort.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- snort.spec	25 Jun 2008 13:50:57 -0000	1.35
+++ snort.spec	2 Jul 2008 17:06:27 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -12,6 +12,8 @@
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
+Prereq:         /sbin/chkconfig
+Requires(pre):  shadow-utils
 BuildRequires:  libpcap-devel >= 0.4
 BuildRequires:  perl
 BuildRequires:  pcre-devel
@@ -308,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
@@ -318,14 +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
 
-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
@@ -333,6 +336,11 @@
 fi
 
 
+%pre
+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
 /sbin/ldconfig
@@ -452,13 +460,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
+%attr(755,root,root) %{_initrddir}/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 +495,9 @@
 
 
 %changelog
+* Wed Jun 25 2008 Steve Grubb <sgrubb at redhat.com> - 2.8.1-5
+- Fix bz 452736, 452737, & 452763
+
 * Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 2.8.1-4
 - rebuild with new gnutls
 


Index: sysconfig.snort
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/sysconfig.snort,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sysconfig.snort	15 May 2008 22:11:19 -0000	1.2
+++ sysconfig.snort	2 Jul 2008 17:06:27 -0000	1.3
@@ -1,8 +1,8 @@
 # What user account should we run under.
-USER="root"
+USER="snortd"
 
 # What group account should we run under. 
-GROUP="root"
+GROUP="snortd"
 
 # define the interface we listen on
 INTERFACE="eth0"