rpms/snort/F-7 sysconfig.snort, NONE, 1.1 snort.spec, 1.24, 1.25 snortd, 1.1, 1.2

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	snort.spec snortd 
Added Files:
	sysconfig.snort 
Log Message:
fix path for alternatives and make interfaces live in /etc/sysconfig/snort



--- NEW FILE sysconfig.snort ---
# define the interface we listen on
INTERFACE=eth0


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/F-7/snort.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- snort.spec	1 Sep 2007 16:54:38 -0000	1.24
+++ snort.spec	17 Nov 2007 23:48:26 -0000	1.25
@@ -1,12 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.7.0.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
+Source3:        sysconfig.snort
 Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -317,6 +318,8 @@
 install snort.8 %{buildroot}%{_mandir}/man8
 install etc/generators  etc/gen-msg.map  etc/sid 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
+mkdir -p %{buildroot}/etc/sysconfig/
+install -p -m 644 %{SOURCE3} %{buildroot}/etc/sysconfig/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
@@ -332,8 +335,8 @@
 /sbin/chkconfig --add snortd
 /sbin/ldconfig
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-plain 10
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-plain 10
 fi
 
 
@@ -341,103 +344,103 @@
 /etc/rc.d/init.d/snortd stop
 if [ $1 = 0 ] ; then
    /sbin/chkconfig --del snortd
-   %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-plain
+   %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-plain
 fi
 
 
 %post plain+flexresp
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-plain+flexresp 20
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-plain+flexresp 20
 fi
 
 %postun plain+flexresp
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-plain+flexresp 
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-plain+flexresp 
 fi
 
 
 %post mysql
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-mysql 30
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-mysql 30
 fi
 
 %postun mysql
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-mysql
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-mysql
 fi
 
 
 %post mysql+flexresp
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-mysql+flexresp 40
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-mysql+flexresp 40
 fi
 
 %postun mysql+flexresp
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-mysql+flexresp
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-mysql+flexresp
 fi
 
 
 %post postgresql
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-postgresql 50
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-postgresql 50
 fi
 
 %postun postgresql
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-postgresql
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-postgresql
 fi
 
 
 %post postgresql+flexresp
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-postgresql+flexresp 60
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-postgresql+flexresp 60
 fi
 
 %postun postgresql+flexresp
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-postgresql+flexresp
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-postgresql+flexresp
 fi
 
 
 %post snmp
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-snmp 60
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-snmp 60
 fi
 
 %postun snmp
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-snmp 
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-snmp 
 fi
 
 
 %post snmp+flexresp
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-snmp+flexresp 70
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-snmp+flexresp 70
 fi
 
 %postun snmp+flexresp
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-snmp+flexresp 
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-snmp+flexresp 
 fi
 
 
 %post bloat
 if [ $1 -eq 1 ] ; then
-  %{_sbindir}/update-alternatives --install %{_bindir}/snort \
-    snort %{_bindir}/snort-bloat 80
+  %{_sbindir}/update-alternatives --install %{_sbindir}/snort \
+    snort %{_sbindir}/snort-bloat 80
 fi
 
 %postun bloat
 if [ $1 -eq 0 ] ; then
-  %{_sbindir}/update-alternatives --remove snort %{_bindir}/snort-bloat 
+  %{_sbindir}/update-alternatives --remove snort %{_sbindir}/snort-bloat 
 fi
 
 
@@ -452,6 +455,7 @@
 %attr(644,root,root) %config %{_sysconfdir}/snort
 %attr(755,root,root) /etc/rc.d/init.d/snortd
 %{_libdir}/snort
+%config(noreplace)%{_sysconfdir}/sysconfig/snort
 
 %files plain+flexresp
 %attr(755,root,root) %{_sbindir}/snort-plain+flexresp
@@ -479,6 +483,13 @@
 
 
 %changelog
+* Sat Nov 17 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-5
+- fix install command for /etc/sysconfig/snort
+
+* Sat Nov 17 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-4
+- fix paths for alternatives  binaries are in %%{_sbindir} not %%{_bindir}
+- move the interfaces definition out of the init script and into /etc/sysconfig/snort
+
 * Fri Aug 31 2007 Dennis Gilmore <dennis at ausil.us> - 2.7.0.1-3
 - fix for glibc open
 


Index: snortd
===================================================================
RCS file: /cvs/extras/rpms/snort/F-7/snortd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snortd	8 Nov 2004 05:21:56 -0000	1.1
+++ snortd	17 Nov 2007 23:48:26 -0000	1.2
@@ -19,8 +19,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Specify your network interface here
-INTERFACE=eth0
+# source the interface to listen on
+. /etc/sysconfig/snort
 
 # See how we were called.
 case "$1" in