[psad/f14/master] upgrade

[Peter Vrabec]

commit 68acd0484cc8dcfe1917fa7cd6e2c9600129c0d2
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Thu Nov 25 12:10:55 2010 +0100

    upgrade

 .gitignore               |    1 +
 psad-2.1.7-archive.patch |   12 ++++++++++++
 psad.spec                |   17 +++++++++++------
 sources                  |    2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1786d38..074534d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 psad-2.1.3.tar.bz2
+/psad-2.1.7.tar.bz2
diff --git a/psad-2.1.7-archive.patch b/psad-2.1.7-archive.patch
new file mode 100644
index 0000000..499cef6
--- /dev/null
+++ b/psad-2.1.7-archive.patch
@@ -0,0 +1,12 @@
+diff -up psad-2.1.7/psad.conf.archive psad-2.1.7/psad.conf
+--- psad-2.1.7/psad.conf.archive	2010-11-24 17:56:37.365943093 +0100
++++ psad-2.1.7/psad.conf	2010-11-24 17:59:48.381681578 +0100
+@@ -451,7 +451,7 @@ PSAD_FIFO_DIR               /var/lib/psa
+ PSAD_LIBS_DIR               /usr/lib/psad;
+ PSAD_CONF_DIR               /etc/psad;
+ PSAD_ERR_DIR                $PSAD_DIR/errs;
+-CONF_ARCHIVE_DIR            $PSAD_CONF_DIR/archive;
++CONF_ARCHIVE_DIR            $PSAD_DIR/archive;
+ SCAN_DATA_ARCHIVE_DIR       $PSAD_DIR/scan_archive;
+ ANALYSIS_MODE_DIR           $PSAD_DIR/ipt_analysis;
+ SNORT_RULES_DIR             $PSAD_CONF_DIR/snort_rules;
diff --git a/psad.spec b/psad.spec
index fcbaf6c..bc406ab 100644
--- a/psad.spec
+++ b/psad.spec
@@ -4,13 +4,14 @@
 
 Summary: Port Scan Attack Detector (psad) watches for suspect traffic
 Name: psad
-Version: 2.1.3
-Release: 4%{?dist}
+Version: 2.1.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/psad/
 Source: http://www.cipherdyne.org/psad/download/%name-%version.tar.bz2
 Patch1: psad-2.1.2-initscript.patch
+Patch2: psad-2.1.7-archive.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: iptables
 Requires(post): chkconfig
@@ -45,6 +46,7 @@ iptables string match module to detect application layer signatures.
 %prep
 %setup -q
 %patch1 -p1 -b .init 
+%patch2 -p1 -b .archive
 sed -i 's,_CHANGEME_,localhost,' psad.conf
 
 %build
@@ -52,7 +54,7 @@ sed -i 's,_CHANGEME_,localhost,' psad.conf
 make OPTS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 ### build the whois client
-make OPTS="$RPM_OPT_FLAGS" -C whois
+make OPTS="$RPM_OPT_FLAGS" -C deps/whois
 
 
 %install
@@ -80,10 +82,10 @@ install -p -m 755 psad $RPM_BUILD_ROOT%{_sbindir}/
 install -p -m 755 kmsgsd $RPM_BUILD_ROOT%{_sbindir}/
 install -p -m 755 psadwatchd $RPM_BUILD_ROOT%{_sbindir}/
 install -p -m 755 fwcheck_psad.pl $RPM_BUILD_ROOT%{_sbindir}/fwcheck_psad
-install -p -m 755 whois/whois $RPM_BUILD_ROOT/%{_bindir}/whois_psad
+install -p -m 755 deps/whois/whois $RPM_BUILD_ROOT/%{_bindir}/whois_psad
 install -p -m 755 nf2csv $RPM_BUILD_ROOT/%{_bindir}/nf2csv
 install -p -m 755 init-scripts/psad-init.fedora $RPM_BUILD_ROOT/etc/rc.d/init.d/psad
-install -p -m 644  logrotate.psad $RPM_BUILD_ROOT/etc/logrotate.d/psad
+install -p -m 644 logrotate.psad $RPM_BUILD_ROOT/etc/logrotate.d/psad
 install -p -m 644 psad.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 install -p -m 644 signatures $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 install -p -m 644 icmp_types $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
@@ -96,7 +98,7 @@ install -p -m 644 *.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 install -p -m 644 nf2csv.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 ### install snort rules files
-cp -r snort_rules $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+cp -r deps/snort_rules $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +142,9 @@ fi
 %dir %psadrundir
 
 %changelog
+* Thu Nov 25 2010 Peter Vrabec <pvrabec at redhat.com>  2.1.7-1
+- upgrade
+
 * Tue Aug 11 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.1.3-4
 - Use bzipped upstream tarball.
 
diff --git a/sources b/sources
index a8fef1a..a95dc9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23c62a7502c4defa6f5f88342b0f60e6  psad-2.1.3.tar.bz2
+e5359c7f02babbb39d14decece1a94dd  psad-2.1.7.tar.bz2