[logwatch] Added fetchmail service (rhbz#528838), Removed BuildRoot tag and %%clean section, Deleted trailing w
Karel Klíč
kklic at fedoraproject.org
Thu Aug 19 16:31:00 UTC 2010
commit b781d1e4d10103638a5109fa53a26b697b5872fc
Author: Karel Klic <kklic at redhat.com>
Date: Thu Aug 19 18:30:49 2010 +0200
Added fetchmail service (rhbz#528838), Removed BuildRoot tag and %%clean section, Deleted trailing whitespaces in the spec file, Updated patch upstream status
logwatch-7.3.6-fetchmail.patch | 154 ++++++++++++++++++++++++++++++++++++++++
logwatch.spec | 105 ++++++++++++++-------------
2 files changed, 209 insertions(+), 50 deletions(-)
---
diff --git a/logwatch-7.3.6-fetchmail.patch b/logwatch-7.3.6-fetchmail.patch
new file mode 100644
index 0000000..c5b3c89
--- /dev/null
+++ b/logwatch-7.3.6-fetchmail.patch
@@ -0,0 +1,154 @@
+diff -up logwatch-7.3.6/conf/services/fetchmail.conf.fetchmail logwatch-7.3.6/conf/services/fetchmail.conf
+--- logwatch-7.3.6/conf/services/fetchmail.conf.fetchmail 2010-08-19 18:24:37.307903687 +0200
++++ logwatch-7.3.6/conf/services/fetchmail.conf 2010-08-19 18:24:30.163903629 +0200
+@@ -0,0 +1,31 @@
++###########################################################################
++# $Id: fetchmail $
++###########################################################################
++
++# You can put comments anywhere you want to. They are effective for the
++# rest of the line.
++
++# this is in the format of <name> = <value>. Whitespace at the beginning
++# and end of the lines is removed. Whitespace before and after the = sign
++# is removed. Everything is case *insensitive*.
++
++# Yes = True = On = 1
++# No = False = Off = 0
++
++Title = "Fetchmail"
++
++# Which logfile group...
++LogFile = maillog
++
++*OnlyService = fetchmail
++*RemoveHeaders
++
++#Fetchmail Global ENV Variables
++
++########################################################
++# This was written and is maintained by:
++# Oron Peled <oron \@\ actcom.net.il>
++#
++########################################################
++
++# vi: shiftwidth=3 tabstop=3 et
+diff -up logwatch-7.3.6/scripts/services/fetchmail.fetchmail logwatch-7.3.6/scripts/services/fetchmail
+--- logwatch-7.3.6/scripts/services/fetchmail.fetchmail 2010-08-19 18:24:04.172902531 +0200
++++ logwatch-7.3.6/scripts/services/fetchmail 2010-08-19 18:23:52.676902323 +0200
+@@ -0,0 +1,115 @@
++##########################################################################
++# $Id: fetchmail $
++##########################################################################
++
++########################################################
++# This was written and is maintained by:
++# Oron Peled <oron \@\ actcom.net.il>
++#
++########################################################
++
++########################################################
++## Copyright (c) 2010 Oron Peled
++## Covered under the included MIT/X-Consortium License:
++## http://www.opensource.org/licenses/mit-license.php
++## All modifications and contributions by other persons to
++## this script are assumed to have been donated to the
++## Logwatch project and thus assume the above copyright
++## and licensing terms. If you want to make contributions
++## under your own copyright or a different license this
++## must be explicitly stated in the contribution an the
++## Logwatch project reserves the right to not accept such
++## contributions. If you have made significant
++## contributions to this script and want to claim
++## copyright please contact logwatch-devel at lists.sourceforge.net.
++#########################################################
++
++
++my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
++
++my %no_mail;
++my %messages_for;
++my %auth_fail;
++my %conn_fail;
++
++#Inits
++
++while (defined($ThisLine = <STDIN>)) {
++ chomp($ThisLine);
++ $ThisLine =~ s/^[a-zA-Z0-9]+: //;
++ if($ThisLine =~ s/^No mail for (\S+) at (\S+)//) {
++ $no_mail{"${1} at ${2}"}++;
++ } elsif($ThisLine =~ /^reading message /) {
++ # ignore
++ } elsif($ThisLine =~ s/^Query status=[23]//) {
++ # ignore. Counted below (Authorization, Connection)
++ } elsif($ThisLine =~ s/^Authorization failure on (\S+)//) {
++ $auth_fail{"${1}"}++;
++ } elsif($ThisLine =~ s/^\S+ connection to \S+ failed: .*//) {
++ # ignore. Counted below
++ } elsif($ThisLine =~ s/^connection to (\S+) \[[^]]+\] failed: (.*).//) {
++ $conn_fail{"${1} -- ${2}"}++;
++ } elsif($ThisLine =~ s/^(\d+) messages? for (\S+) at (\S+).*.//) {
++ $messages_for{"${2} at ${3}"} += $1;
++ } else {
++ chomp($ThisLine);
++ # Report any unmatched entries...
++ $OtherList{$ThisLine}++;
++ }
++}
++
++if (keys %messages_for) {
++ my $total;
++ print "\nMessages\n";
++ foreach my $who (sort keys %messages_for) {
++ print " $who: $messages_for{$who}\n";
++ $total += $messages_for{$who};
++ }
++ print " Total: $total\n";
++}
++
++if (keys %conn_fail) {
++ my $total;
++ print "\nConnection failures\n";
++ foreach my $who (sort keys %conn_fail) {
++ print " $who: $conn_fail{$who} Time(s)\n";
++ $total += $conn_fail{$who};
++ }
++ print " Total: $total\n";
++}
++
++if (keys %auth_fail) {
++ my $total;
++ print "\nAuthorization failures\n";
++ foreach my $who (sort keys %auth_fail) {
++ print " $who: $auth_fail{$who} Time(s)\n";
++ $total += $auth_fail{$who};
++ }
++ print " Total: $total\n";
++}
++
++if (keys %no_mail) {
++ my $total;
++ print "\nNo Mail\n";
++ foreach my $who (sort keys %no_mail) {
++ print " $who: $no_mail{$who} Time(s)\n";
++ $total += $no_mail{$who};
++ }
++ print " Total: $total\n";
++}
++
++if (keys %OtherList) {
++ print "\n**Unmatched Entries**\n";
++ foreach $line (sort {$OtherList{$b}<=>$OtherList{$a} } keys %OtherList) {
++ print " $line: $OtherList{$line} Time(s)\n";
++ }
++}
++
++exit(0);
++
++# vi: shiftwidth=3 tabstop=3 syntax=perl et
++# Local Variables:
++# mode: perl
++# perl-indent-level: 3
++# indent-tabs-mode: nil
++# End:
diff --git a/logwatch.spec b/logwatch.spec
index fbfbf15..e1a95a8 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
-Release: 54%{?dist}
+Release: 55%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@@ -73,7 +73,7 @@ Patch36: logwatch-7.3.6-openvpn2.patch
Patch37: logwatch-7.3.6-sendmail.patch
# Applied by upstream.
Patch38: logwatch-7.3.6-audit3.patch
-# Not fully applied by upstream (upstream catches only the TERM signal).
+# Applied by upstream.
Patch39: logwatch-7.3.6-init.patch
# Applied by upstream.
Patch40: logwatch-7.3.6-cron5.patch
@@ -97,52 +97,54 @@ Patch51: logwatch-7.3.6-openvpn3.patch
Patch52: logwatch-7.3.6-smartd.patch
# Applied by upstream.
Patch53: logwatch-7.3.6-sshd2.patch
-# Sent. Not applied by upstream.
+# Applied by upstream.
Patch54: logwatch-7.3.6-exim2.patch
# Applied by upstream.
Patch55: logwatch-7.3.6-removeservice.patch
# Fedora-specific change. It must be decided
# whether it is right. Not applied to upstream.
Patch56: logwatch-7.3.6-cron_conf.patch
-# Sent. Not applied by the upstream.
+# Applied by upstream.
Patch57: logwatch-7.3.6-named5.patch
-# Sent to upstream.
+# Applied by upstream.
Patch58: logwatch-7.3.6-iptables.patch
-# Sent to upstream.
+# Applied by upstream.
Patch59: logwatch-7.3.6-lost-connection.patch
-# Not applied by upstream. Sent.
+# Applied by upstream.
Patch60: logwatch-7.3.6-secure3.patch
-# Sent to upstream.
+# Applied by upstream.
Patch61: logwatch-7.3.6-audit4.patch
-# Not applied by upstream. Sent.
+# Applied by upstream.
Patch62: logwatch-7.3.6-dovecot2.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch63: logwatch-7.3.6-openvpn4.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch64: logwatch-7.3.6-pam_unix4.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch66: logwatch-7.3.6-named6.patch
-# Sent, not applied by upstream.
+# Applied by upstream.
Patch67: logwatch-7.3.6-sshd3.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch68: logwatch-7.3.6-dhcpd2.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch69: logwatch-7.3.6-named7.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch70: logwatch-7.3.6-dovecot3.patch
-# Sent, not applied yet.
+# Applied by upstream.
Patch71: logwatch-7.3.6-sendmail2.patch
-# Sent to upstream.
+# Applied by upstream.
# Adds manpages for configuration files.
# rhbz#525644
Patch73: logwatch-7.3.6-manpages.patch
+# Applied by upstream.
# Ignore broken trust chain messages in named service
# rhbz#581186
Patch74: logwatch-7.3.6-named8.patch
+# Applied by upstream.
+Patch75: logwatch-7.3.6-fetchmail.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArchitectures: noarch
%description
@@ -216,6 +218,7 @@ of the package on many systems.
%patch71 -p1
%patch73 -p1
%patch74 -p1
+%patch75 -p1
rm -f scripts/services/*.orig
%build
@@ -231,7 +234,7 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles
install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/services
-install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/html
+install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/html
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/services
@@ -252,7 +255,7 @@ install -m 0644 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0644 conf/logwatch.conf %{buildroot}%{_datadir}/logwatch/default.conf/logwatch.conf
install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
install -m 0644 conf/services/* %{buildroot}%{_datadir}/logwatch/default.conf/services
-install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html
+install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html
install -m 0644 lib/Logwatch.pm %{buildroot}%{_datadir}/logwatch/lib/Logwatch.pm
@@ -294,10 +297,6 @@ echo "# Local configuration options go here (defaults are in %{_datadir}/logwatc
echo "# Configuration overrides for specific logfiles/services may be placed here." > %{buildroot}%{_sysconfdir}/logwatch/conf/override.conf
-%clean
-rm -rf %{buildroot}
-
-
%files
%defattr(-,root,root)
%doc README HOWTO-Customize-LogWatch
@@ -332,13 +331,19 @@ rm -rf %{buildroot}
%{_datadir}/logwatch/lib/Logwatch.pm
%{_datadir}/logwatch/default.conf/services/*.conf
%{_datadir}/logwatch/default.conf/logfiles/*.conf
-%{_datadir}/logwatch/default.conf/html/*.html
+%{_datadir}/logwatch/default.conf/html/*.html
%{_sysconfdir}/cron.daily/0logwatch
%doc %{_mandir}/man8/logwatch.8*
%doc License project/CHANGES
%changelog
+* Thu Aug 19 2010 Karel Klic <kklic at redhat.com> 7.3.6-55
+- Removed BuildRoot tag and %%clean section
+- Deleted trailing whitespaces in the spec file
+- Updated patch upstream status
+- Added fetchmail service (rhbz#528838)
+
* Mon Apr 19 2010 Karel Klic <kklic at redhat.com> 7.3.6-54
- Do not install zz-fortune service when %%{rhel} is defined.
@@ -350,7 +355,7 @@ rm -rf %{buildroot}
- Updated the previously added patches to apply with --fuzz=0
* Wed Apr 14 2010 Karel Klic <kklic at redhat.com> 7.3.6-51
-- Re-enabled zz-fortune with a patch that prevents sending reports
+- Re-enabled zz-fortune with a patch that prevents sending reports
containing zz-fortune only (rhbz#573450)
- Removed obsolete chmod and touch calls from the spec file
- Added manpages for configuration files (rhbz#525644)
@@ -369,7 +374,7 @@ rm -rf %{buildroot}
- Add 802.1q subinterface support to iptables report; iptables.patch (#507743)
- Fixed error in the RE that matches "lost connection" lines in postfix script; lost-connection.patch (#525903)
- Added patches parsing several unmatched entries (from F-10);
- audit4.patch modified to make ppid optional;
+ audit4.patch modified to make ppid optional;
openvpn4.patch modified to make "semi-" optional;
pam_unix4.patch modified (user name matched by \S+)
@@ -389,7 +394,7 @@ rm -rf %{buildroot}
- add the possibility to switch of cron job (#493063)
* Mon Jun 15 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-43
-- fix removeservice script - to decrease the number of
+- fix removeservice script - to decrease the number of
perl instances running simultaneously
* Tue Mar 31 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-42
@@ -460,7 +465,7 @@ rm -rf %{buildroot}
Logwatch doesn't show any usable sendmail section
* Fri Apr 4 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-21
-- Resolves: #440534
+- Resolves: #440534
Some unmatched OpenVPN log lines
- add parsing of new logw to audit and cron service
@@ -550,8 +555,8 @@ rm -rf %{buildroot}
- add named and sshd service patches
* Fri Apr 20 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-7
-- Resolves: 236618
- (add anacron setting of mailto accept)
+- Resolves: 236618
+ (add anacron setting of mailto accept)
thanks Todd Denniston
* Fri Apr 13 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-6
@@ -592,7 +597,7 @@ rm -rf %{buildroot}
* Mon Feb 5 2007 Ivana Varekova <varekova at redhat.com> 7.3.2-6
- Resolves: 226999
- fix audit script
+ fix audit script
* Fri Jan 26 2007 Ivana Varekova <varekova at redhat.com> 7.3.2-5
- add sendmail, automount, amvais and cron patch
@@ -616,7 +621,7 @@ rm -rf %{buildroot}
- add cron, pam_unix, audit, init service patches
* Wed Dec 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-8
-- add dovecot, amavis and init patch
+- add dovecot, amavis and init patch
- cleanup spec file
* Wed Nov 29 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-7
@@ -628,11 +633,11 @@ rm -rf %{buildroot}
* Wed Nov 1 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-5
- fix named patch (#213267)
-- add openvpn patch
+- add openvpn patch
* Mon Oct 30 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-4
- fix #209405 - another sendmail service problem
-- fix #212812 - add service script patch
+- fix #212812 - add service script patch
patch created by Russell Coker
* Mon Oct 23 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-3
@@ -641,13 +646,13 @@ rm -rf %{buildroot}
* Fri Oct 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-2
- fix #204078 - missing /etc/logwatch/scripts/services
- add yum service patch
-- fix #209554 - automount service problem
+- fix #209554 - automount service problem
* Fri Oct 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-1
- update to 7.3.1
* Tue Aug 29 2006 Ivana Varekova <varekova at redhat.com> 7.3-5
-- fix amavis problem #204432
+- fix amavis problem #204432
* Mon Aug 14 2006 Marcela Maslanova <mmaslano at redhat.com> 7.3-4
- add audit patch for SElinux (#200116)
@@ -658,8 +663,8 @@ rm -rf %{buildroot}
- added secure-service patch
* Fri May 5 2006 Ivana Varekova <varekova at redhat.com> 7.3-2
-- added tests to file creation and access, clean up
-resulting files when logwatch fails (upstream change)
+- added tests to file creation and access, clean up
+resulting files when logwatch fails (upstream change)
(#190498)
* Mon Mar 27 2006 Ivana Varekova <varekova at redhat.com> 7.3-1
@@ -693,7 +698,7 @@ resulting files when logwatch fails (upstream change)
* Tue Nov 29 2005 Ivana Varekova <varekova at redhat.com> 7.1-3
- add secure service patch
-- add iptables patch created by Allen Kistler (bug 174954)
+- add iptables patch created by Allen Kistler (bug 174954)
- add audit service patch
* Wed Nov 24 2005 Ivana Varekova <varekova at redhat.com> 7.1-2
@@ -705,10 +710,10 @@ resulting files when logwatch fails (upstream change)
- added sshd and samba patches
* Wed Nov 2 2005 Ivana Varekova <varekova at redhat.com> 7.0-2
-- fix zz-disk_space problem (bug 172230)
+- fix zz-disk_space problem (bug 172230)
used michal at harddata.com patch
- fix a few inconsistencies with new directory structure
-- changed previous zz-disk_space
+- changed previous zz-disk_space
- add secure sript patch allow case insensitivity for GID, UID)
* Thu Oct 13 2005 Ivana Varekova <varekova at redhat.com> 7.0-1
@@ -717,7 +722,7 @@ resulting files when logwatch fails (upstream change)
* Mon Oct 3 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-7
- add audit script patch recognized other unmatched logs
-- add cron script patch
+- add cron script patch
- change sshd script patch
* Fri Sep 30 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-6
@@ -725,20 +730,20 @@ resulting files when logwatch fails (upstream change)
* Mon Sep 26 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-5
- change secure script patch
-- add sshd script patch (sshd part should not display 0.0.0.0
+- add sshd script patch (sshd part should not display 0.0.0.0
in "Failed to bind" column)
- add one unmatch line to named script
* Mon Sep 19 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-4
-- fixed secure script (part of bug 141116, added a few
+- fixed secure script (part of bug 141116, added a few
unknown logs)
-- bug 168469 - fixed up2date script
+- bug 168469 - fixed up2date script
* Mon Jul 25 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-3
- bug 162689 - add noreplace option
* Wed Jun 29 2005 Ivana Varekova <varekova at redhat.com> 6.1.2-2
-- fix bug 161973 - The logwatch yum service doesn't properly
+- fix bug 161973 - The logwatch yum service doesn't properly
show removed entries
- used patch created by Dean Earley (patch5)
@@ -814,7 +819,7 @@ show removed entries
* Thu Jun 27 2002 Elliot Lee <sopwith at redhat.com> 2.6-5
- logwatch-2.6-applydate-65655.patch to fix xferlog date parsing
- logwatch-2.6-xinetd_match-65856.patch to match more xinetd lines properly
-- logwatch-2.6-confparse-65937.patch to properly parse lines with multiple
+- logwatch-2.6-confparse-65937.patch to properly parse lines with multiple
= chars in them
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -840,7 +845,7 @@ show removed entries
- Fix #53077
* Thu Aug 09 2001 Elliot Lee <sopwith at redhat.com> 2.1.1-2
-- Fix warning in services/init (#51305) and don't include fortune module
+- Fix warning in services/init (#51305) and don't include fortune module
(#51093).
* Mon May 21 2001 Tim Powers <timp at redhat.com>
More information about the scm-commits
mailing list