diff --git a/logwatch-7.3.6-iptables.patch b/logwatch-7.3.6-iptables.patch new file mode 100644 index 0000000..e08ba82 --- /dev/null +++ b/logwatch-7.3.6-iptables.patch @@ -0,0 +1,12 @@ +diff -up logwatch-7.3.6/scripts/services/iptables.iptables logwatch-7.3.6/scripts/services/iptables +--- logwatch-7.3.6/scripts/services/iptables.iptables 2007-02-16 04:27:05.000000000 +0100 ++++ logwatch-7.3.6/scripts/services/iptables 2009-12-02 16:20:20.446263041 +0100 +@@ -120,7 +120,7 @@ while (defined($ThisLine = )) { + $ipt2{$actionType}{$if}{$toport}{$proto}{$fromip}{$toip}{"$chain,$if"}++; + } + # IPTABLES +- elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=(\w*).*?OUT=(\w*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) { ++ elsif (($chain,$ifin,$ifout,$fromip,$toip,$proto,$rest) = ($ThisLine =~ /^(.*?)\s*IN=([\w\.]*).*?OUT=([\w\.]*).*?SRC=([\w\.:]+).*?DST=([\w\.:]+).*?PROTO=(\w+)(.*)/ )) { + + # get a destination port number (or icmp type) if there is one + if (! ( ($toport) = ( $rest =~ /TYPE=(\w+)/ ) ) ) { diff --git a/logwatch.spec b/logwatch.spec index 1894756..415b9d5 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 48%{?dist} +Release: 49%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -54,6 +54,7 @@ Patch54: logwatch-7.3.6-exim2.patch Patch55: logwatch-7.3.6-removeservice.patch Patch56: logwatch-7.3.6-cron_conf.patch Patch57: logwatch-7.3.6-named5.patch +Patch58: logwatch-7.3.6-iptables.patch Requires: textutils sh-utils grep mailx Requires: perl(Date::Manip) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -115,6 +116,7 @@ of the package on many systems. %patch55 -p1 %patch56 -p1 %patch57 -p1 +%patch58 -p1 rm -f scripts/services/*.orig %build @@ -238,6 +240,9 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Wed Dec 2 2009 Karel Klic 7.3.6-49 +- Add 802.1q subinterface support to iptables report (#507743) + * Tue Aug 11 2009 Ivana Varekova 7.3.6-48 - parse a few unmatched entries in named script (#513853)