rpms/logwatch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to the latest svn revision, removed dhcpd patch merged by upstream; added LICENSE

Browse Source
This commit is contained in:
Karel Klic 2011-02-03 13:42:50 +01:00
parent ee71123cb4
commit 88bdbae7a2
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
logwatch-dhcpd.patch
View File

@ -1,14 +0,0 @@
--- logwatch-20110113/scripts/services/dhcpd.orig 2010-09-18 17:54:13.000000000 +0200
+++ logwatch-20110113/scripts/services/dhcpd 2011-01-13 15:57:00.131382686 +0100
@@ -188,9 +188,9 @@ while (my $line = <STDIN>) {
if ($Detail >= 3) {
$data{'Warnings'}{$line}++;
}
- } elsif ($line =~ s/^uid lease ([\da-fA-F\.:]+) for client ([\da-fA-F\.:]+) is duplicate on ([\da-fA-F\.:\/]+)/Host $2: duplicate $1 (range $3)\n - probably both static and dynamic leases/) {
+ } elsif ($line =~ s/^uid lease ([\da-fA-F\.:]+) for client ([^ ]*) is duplicate on ([^ ]*)/uid lease $1 for client $2 is duplicate/) {
if ($Detail >= 3) {
- $data{'Warnings'}{$line}++;
+ $data{'Duplicate lease'}{$line}++;
}
} elsif ($line =~ /^DHCPDISCOVER from .* via \S+: (.*): no free leases/) {
$data{'No Free Leases'}{$1}++;

20
logwatch.spec
View File

@ -1,15 +1,15 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
Release: 63.20110201svn23%{?dist}
Release: 64.20110203svn25%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# svn export -r 23 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-20110201
# tar cJvf logwatch-20110201.tar.xz logwatch-20110201
Source0: logwatch-20110201.tar.xz
# svn export -r 25 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn25
# tar cJvf logwatch-svn25.tar.xz logwatch-svn25
Source0: logwatch-svn25.tar.xz
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Needs proper fix. Not applied by the upstream.
Patch0: logwatch-vsftpd.patch
@ -19,8 +19,6 @@ Patch1: logwatch-oldfiles.patch
# older version by upstream due to licensing issues. Some parts are
# solved by upstream.
#Patch2: logwatch-postfix.patch
# Sent to upstream.
Patch4: logwatch-dhcpd.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
BuildArchitectures: noarch
@ -32,10 +30,9 @@ that you wish with the detail that you wish. Easy to use - works right out
of the package on many systems.
%prep
%setup -q -n logwatch-20110201
%setup -q -n logwatch-svn25
%patch0 -p1
%patch1 -p1
%patch4 -p1
rm -f scripts/services/*.orig
%build
@ -127,9 +124,14 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%{_datadir}/logwatch/default.conf/logfiles/*.conf
%{_datadir}/logwatch/default.conf/html/*.html
%{_mandir}/man*/*
#%doc License project/CHANGES
%doc LICENSE
%changelog
* Wed Feb 3 2011 Karel Klic <kklic@redhat.com> - 7.3.6-64.20110203svn25
- Updated to the latest svn revision, removed dhcpd patch merged by
upstream
- Added LICENSE file, which became available in this revision
* Wed Feb 2 2011 Karel Klic <kklic@redhat.com> - 7.3.6-63.20110201svn23
- Updated to the latest svn revision, removed patches merged by upstream