From 8dedbcad794e3b539f2df202feb8a15b50e6e75a Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Sat, 26 May 2012 21:30:50 -0400
Subject: [PATCH] removed legacy psadwatchd.conf file references

---
 packaging/psad-nodeps.spec            |    4 +---
 packaging/psad-require-makemaker.spec |    4 +---
 packaging/psad.spec                   |    4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packaging/psad-nodeps.spec b/packaging/psad-nodeps.spec
index 2334e9c..0642f0a 100644
--- a/packaging/psad-nodeps.spec
+++ b/packaging/psad-nodeps.spec
@@ -100,7 +100,6 @@ install -m 644 nf2csv.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 ### put the current hostname into the psad C binaries
 ### (kmsgsd and psadwatchd).
 perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psad.conf
-perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psadwatchd.conf
 
 /bin/touch %psadlogdir/fwdata
 chown root.root %psadlogdir/fwdata
@@ -119,8 +118,7 @@ chmod 0600 %psadvarlibdir/psadfifo
 if grep -q "EMAIL.*root.*localhost" /etc/psad/psad.conf;
 then
 echo "[+] You can edit the EMAIL_ADDRESSES variable in /etc/psad/psad.conf"
-echo "    /etc/psad/psadwatchd.conf to have email alerts sent to an address"
-echo "    other than root\@localhost"
+echo "    to have email alerts sent to an address other than root\@localhost"
 fi
 
 if grep -q "HOME_NET.*CHANGEME" /etc/psad/psad.conf;
diff --git a/packaging/psad-require-makemaker.spec b/packaging/psad-require-makemaker.spec
index 4beab78..7a6fdcb 100644
--- a/packaging/psad-require-makemaker.spec
+++ b/packaging/psad-require-makemaker.spec
@@ -243,7 +243,6 @@ cp -r deps/snort_rules $RPM_BUILD_ROOT%_sysconfdir/%name
 ### put the current hostname into the psad C binaries
 ### (kmsgsd and psadwatchd).
 perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psad.conf
-perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psadwatchd.conf
 
 /bin/touch %psadlogdir/fwdata
 chown root.root %psadlogdir/fwdata
@@ -262,8 +261,7 @@ chmod 0600 %psadvarlibdir/psadfifo
 if grep -q "EMAIL.*root.*localhost" /etc/psad/psad.conf;
 then
 echo "[+] You can edit the EMAIL_ADDRESSES variable in /etc/psad/psad.conf"
-echo "    /etc/psad/psadwatchd.conf to have email alerts sent to an address"
-echo "    other than root\@localhost"
+echo "    to have email alerts sent to an address other than root\@localhost"
 fi
 
 if grep -q "HOME_NET.*CHANGEME" /etc/psad/psad.conf;
diff --git a/packaging/psad.spec b/packaging/psad.spec
index b6c2a20..b10207b 100644
--- a/packaging/psad.spec
+++ b/packaging/psad.spec
@@ -242,7 +242,6 @@ cp -r deps/snort_rules $RPM_BUILD_ROOT%_sysconfdir/%name
 ### put the current hostname into the psad C binaries
 ### (kmsgsd and psadwatchd).
 perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psad.conf
-perl -p -i -e 'use Sys::Hostname; my $hostname = hostname(); s/HOSTNAME(\s+)_?CHANGE.?ME_?/HOSTNAME${1}$hostname/' %_sysconfdir/%name/psadwatchd.conf
 
 /bin/touch %psadlogdir/fwdata
 chown root.root %psadlogdir/fwdata
@@ -261,8 +260,7 @@ chmod 0600 %psadvarlibdir/psadfifo
 if grep -q "EMAIL.*root.*localhost" /etc/psad/psad.conf;
 then
 echo "[+] You can edit the EMAIL_ADDRESSES variable in /etc/psad/psad.conf"
-echo "    /etc/psad/psadwatchd.conf to have email alerts sent to an address"
-echo "    other than root\@localhost"
+echo "    to have email alerts sent to an address other than root\@localhost"
 fi
 
 if grep -q "HOME_NET.*CHANGEME" /etc/psad/psad.conf;
-- 
1.7.5.4