psad RPM bug fix to include the protocols file

Nicholas-Ritter reported a bug in psad-2.2.1 where the protocols file is not
bundled with the psad RPM's or included in the psad RPM .spec files.

diff --git a/CREDITS b/CREDITS
index f971a61..62a0175 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -494,3 +494,7 @@ Oscar Marley
 Naji Mouawad
     - Suggested the ability to throttle email alerts that psad sends.  The
       This resulted in the implementation of the EMAIL_THROTTLE variable.
+
+Nicholas Ritter
+    - Reported a bug in psad-2.2.1 where the protocols file is not bundled with
+      the psad RPM's or included in the psad RPM .spec files.

diff --git a/ChangeLog b/ChangeLog
index 3d068c2..e081a52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+psad-2.2.2 (//2013):
+    - RPM bug fix to include the protocols file.
+
 psad-2.2.1 (01/02/2013):
     - Added IP protocol scan detection (nmap -sO).  A new psad.conf variable
       PROTOCOL_SCAN_THRESHOLD defines the minimum number of different IP

diff --git a/packaging/psad-nodeps.spec b/packaging/psad-nodeps.spec
index 16c04fc..829fa6d 100644 (file)
--- a/packaging/psad-nodeps.spec
+++ b/packaging/psad-nodeps.spec
@@ -75,6 +75,7 @@ install -m 755 nf2csv $RPM_BUILD_ROOT/usr/bin/nf2csv
 install -m 755 init-scripts/psad-init.redhat $RPM_BUILD_ROOT%_initrddir/psad
 install -m 644 psad.conf $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 signatures $RPM_BUILD_ROOT%_sysconfdir/%name/
+install -m 644 protocols $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 icmp_types $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 icmp6_types $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 ip_options $RPM_BUILD_ROOT%_sysconfdir/%name/
@@ -144,6 +145,7 @@ fi
 %dir %_sysconfdir/%name
 %config(noreplace) %_sysconfdir/%name/*.conf
 %config(noreplace) %_sysconfdir/%name/signatures
+%config(noreplace) %_sysconfdir/%name/protocols
 %config(noreplace) %_sysconfdir/%name/auto_dl
 %config(noreplace) %_sysconfdir/%name/ip_options
 %config(noreplace) %_sysconfdir/%name/snort_rule_dl

diff --git a/packaging/psad-require-makemaker.spec b/packaging/psad-require-makemaker.spec
index 05d2c81..a30668f 100644 (file)
--- a/packaging/psad-require-makemaker.spec
+++ b/packaging/psad-require-makemaker.spec
@@ -125,6 +125,7 @@ install -m 755 nf2csv $RPM_BUILD_ROOT/usr/bin/nf2csv
 install -m 755 init-scripts/psad-init.redhat $RPM_BUILD_ROOT%_initrddir/psad
 install -m 644 psad.conf $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 signatures $RPM_BUILD_ROOT%_sysconfdir/%name/
+install -m 644 protocols $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 icmp_types $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 icmp6_types $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 ip_options $RPM_BUILD_ROOT%_sysconfdir/%name/
@@ -286,6 +287,7 @@ fi
 %dir %_sysconfdir/%name
 %config(noreplace) %_sysconfdir/%name/*.conf
 %config(noreplace) %_sysconfdir/%name/signatures
+%config(noreplace) %_sysconfdir/%name/protocols
 %config(noreplace) %_sysconfdir/%name/auto_dl
 %config(noreplace) %_sysconfdir/%name/ip_options
 %config(noreplace) %_sysconfdir/%name/snort_rule_dl

diff --git a/packaging/psad.ebuild b/packaging/psad.ebuild
index 58530bf..12b6fe1 100644 (file)
--- a/packaging/psad.ebuild
+++ b/packaging/psad.ebuild
@@ -72,7 +72,7 @@ src_install() {
        insinto /etc/psad
        doins *.conf
        doins psad_*
-       doins auto_dl icmp_types posf signatures pf.os
+       doins auto_dl icmp_types posf signatures protocols pf.os
 
        cd ${S}/init-scripts
        exeinto /etc/init.d

diff --git a/packaging/psad.spec b/packaging/psad.spec
index 1d9da6e..964e3aa 100644 (file)
--- a/packaging/psad.spec
+++ b/packaging/psad.spec
@@ -124,6 +124,7 @@ install -m 755 nf2csv $RPM_BUILD_ROOT/usr/bin/nf2csv
 install -m 755 init-scripts/psad-init.redhat $RPM_BUILD_ROOT%_initrddir/psad
 install -m 644 psad.conf $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 signatures $RPM_BUILD_ROOT%_sysconfdir/%name/
+install -m 644 protocols $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 icmp_types $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 icmp6_types $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 ip_options $RPM_BUILD_ROOT%_sysconfdir/%name/
@@ -285,6 +286,7 @@ fi
 %dir %_sysconfdir/%name
 %config(noreplace) %_sysconfdir/%name/*.conf
 %config(noreplace) %_sysconfdir/%name/signatures
+%config(noreplace) %_sysconfdir/%name/protocols
 %config(noreplace) %_sysconfdir/%name/auto_dl
 %config(noreplace) %_sysconfdir/%name/ip_options
 %config(noreplace) %_sysconfdir/%name/snort_rule_dl