rpms/logwatch/F-12 logwatch-7.3.6-manpages.patch, NONE, 1.1 logwatch-7.3.6-named8.patch, NONE, 1.1 logwatch.spec, 1.122, 1.123
Karel Klíč
kklic at fedoraproject.org
Mon Apr 19 16:04:26 UTC 2010
Author: kklic
Update of /cvs/pkgs/rpms/logwatch/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11420
Modified Files:
logwatch.spec
Added Files:
logwatch-7.3.6-manpages.patch logwatch-7.3.6-named8.patch
Log Message:
Backported some updates from Rawhide
logwatch-7.3.6-manpages.patch:
ignore.conf.5 | 1 +
install_logwatch.sh | 30 +++++++++++++++++++++---------
logwatch.conf.5 | 37 +++++++++++++++++++++++++++++++++++++
override.conf.5 | 2 +-
4 files changed, 60 insertions(+), 10 deletions(-)
--- NEW FILE logwatch-7.3.6-manpages.patch ---
>From f995c3a89d66be95959f45dda55d39309f663ac5 Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic at redhat.com>
Date: Tue, 6 Apr 2010 14:52:25 +0200
Subject: [PATCH 18/18] Added manpages for configuration files
---
ignore.conf.5 | 1 +
install_logwatch.sh | 28 ++++++++++++++++++++--------
logwatch.conf.5 | 37 +++++++++++++++++++++++++++++++++++++
override.conf.5 | 1 +
4 files changed, 59 insertions(+), 8 deletions(-)
create mode 100644 ignore.conf.5
mode change 100644 => 100755 install_logwatch.sh
create mode 100644 logwatch.conf.5
create mode 100644 override.conf.5
diff --git a/ignore.conf.5 b/ignore.conf.5
new file mode 100644
index 0000000..f434964
--- /dev/null
+++ b/ignore.conf.5
@@ -0,0 +1 @@
+.so man5/logwatch.conf.5
\ No newline at end of file
diff --git a/install_logwatch.sh b/install_logwatch.sh
old mode 100644
new mode 100755
index 6e4f7c1..3a34ce5
--- a/install_logwatch.sh
+++ b/install_logwatch.sh
@@ -130,7 +130,7 @@ else
fi
printf "Enter the path for the Logwatch ConfigDir [$CONFIGDIR] : "
-read config
+read config
if [ "$config" = "" ]; then
printf "### Using $CONFIGDIR\n"
@@ -263,22 +263,25 @@ for f in `echo $PATH | tr : ' '`; do
done
#Man page
-if [ -d $MANDIR/man8 ] && [ $HAVE_MAKEWHATIS ]; then
+if [ -d $MANDIR/man5 ] && [ -d $MANDIR/man8 ] && [ $HAVE_MAKEWHATIS ]; then
install -m 0644 logwatch.8 $MANDIR/man8
+ install -m 0644 logwatch.conf.5 $MANDIR/man5
+ install -m 0644 override.conf.5 $MANDIR/man5
+ install -m 0644 ignore.conf.5 $MANDIR/man5
#OpenBSD no -s
if [ $OS = "OpenBSD" ]; then
- makewhatis -u $MANDIR/man8
+ makewhatis -u $MANDIR/man5 $MANDIR/man8
else
#FreeBSD and NetBSD no -s no -u
if [ $OS = "FreeBSD" ] || [ $OS = "NetBSD" ]; then
- makewhatis $MANDIR/man8
+ makewhatis $MANDIR/man5 $MANDIR/man8
else
#MacOS X aka Darwin no -u [even thought the manpage says]
if [ $OS = "Darwin" ]; then
- makewhatis -s 8 $MANDIR
+ makewhatis -s "5 8" $MANDIR
else
#Linux
- makewhatis -u -s 8 $MANDIR
+ makewhatis -u -s "5 8" $MANDIR
fi
fi
fi
@@ -287,11 +290,20 @@ else
#Go for the safe install rather then editing man.cf
install -m 0644 logwatch.8 $MANDIR/man1m
+ install -m 0644 logwatch.conf.5 $MANDIR/man1m
+ install -m 0644 override.conf.5 $MANDIR/man1m
+ install -m 0644 ignore.conf.5 $MANDIR/man1m
- catman -w -M /usr/share/man/man1m
+ catman -w -M $MANDIR/man1m
else
+ install -m 0755 -d $MANDIR/man5
+ install -m 0644 logwatch.conf.5 $MANDIR/man5
+ install -m 0644 override.conf.5 $MANDIR/man5
+ install -m 0644 ignore.conf.5 $MANDIR/man5
+
install -m 0755 -d $MANDIR/man8
install -m 0644 logwatch.8 $MANDIR/man8
- printf "Installed manpage in $MANDIR/man8.\n"
- printf "Check your man.cf or man.conf to enable MANSECTS 8\n"
+
+ printf "Installed manpages in $MANDIR/man5 and $MANDIR/man8.\n"
+ printf "Check your man.cf or man.conf to enable MANSECTS 5 and 8\n"
fi
fi
diff --git a/logwatch.conf.5 b/logwatch.conf.5
new file mode 100644
index 0000000..691c533
--- /dev/null
+++ b/logwatch.conf.5
@@ -0,0 +1,37 @@
+.\" Written by Ivana Varekova <varekova at redhat.com>.
+.TH LOGWATCH.CONF 5 2010-02-10 "GNU" "Linux Programmer's Manual"
+.SH NAME
+logwatch.conf, ignore.conf, override.conf - logwatch configuration files
+.SH DESCRIPTION
+
+.BR logwatch.conf
+- (
+.BR /etc/logwatch/conf/logwatch.conf
+)
+- can contain the local configuration options.
+The list of valid settings and their default values are in
+.BR /usr/share/logwatch/default.conf/logwatch.conf.
+
+.BR ignore.conf
+- (
+.BR /etc/logwatch/conf/ignore.conf
+)
+is the list of regular expressions.
+The set of logs decribed by this set is ignored by logwatch.
+
+.BR override.conf
+- (
+.BR /etc/logwatch/conf/override.conf
+)
+contains the settings which overrides the standard configuration
+of specific log files or services. The syntax is the same as in
+log/service files.
+
+.SH FILES
+.I /etc/logwatch/conf/logwatch.conf
+.I /etc/logwatch/conf/logwatch.conf
+.I /etc/logwatch/conf/logwatch.conf
+.I /usr/share/logwatch/default.conf/logwatch.conf
+
+.SH "SEE ALSO"
+.BR logwatch (8)
diff --git a/override.conf.5 b/override.conf.5
new file mode 100644
index 0000000..775458f
--- /dev/null
+++ b/override.conf.5
@@ -0,0 +1 @@
+.so man5/logwatch.conf.5
--
1.6.6.1
logwatch-7.3.6-named8.patch:
named | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE logwatch-7.3.6-named8.patch ---
>From 0848cea632ef7b153bf74fabf6797a37897fc90d Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic at redhat.com>
Date: Mon, 12 Apr 2010 17:06:42 +0200
Subject: [PATCH 1/2] Update for named script to ignore broken trust chain messages (rhbz#581186)
---
scripts/services/named | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/services/named b/scripts/services/named
index 9097a73..811a4b9 100755
--- a/scripts/services/named
+++ b/scripts/services/named
@@ -226,7 +226,8 @@ while (defined($ThisLine = <STDIN>)) {
($ThisLine =~ /^no valid KEY resolving '.*': .*/) or
($ThisLine =~ /^no valid RRSIG resolving '.*': .*/) or
($ThisLine =~ /^not insecure resolving '.*': .*/) or
- ($ThisLine =~ /^validating \@0x[[:xdigit:]]+: .* DS: must be secure failure/)
+ ($ThisLine =~ /^validating \@0x[[:xdigit:]]+: .* DS: must be secure failure/) or
+ ($ThisLine =~ /^broken trust chain resolving '.*': .*/)
# too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
) {
# Don't care about these...
Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-12/logwatch.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- logwatch.spec 3 Feb 2010 19:12:22 -0000 1.122
+++ logwatch.spec 19 Apr 2010 16:04:26 -0000 1.123
@@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
-Release: 50%{?dist}
+Release: 51%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@@ -69,6 +69,14 @@ Patch68: logwatch-7.3.6-dhcpd2.patch
Patch69: logwatch-7.3.6-named7.patch
Patch70: logwatch-7.3.6-dovecot3.patch
Patch71: logwatch-7.3.6-sendmail2.patch
+# Sent to upstream.
+# Adds manpages for configuration files.
+# rhbz#525644
+Patch73: logwatch-7.3.6-manpages.patch
+# Ignore broken trust chain messages in named service
+# rhbz#581186
+Patch74: logwatch-7.3.6-named8.patch
+
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -143,6 +151,8 @@ of the package on many systems.
%patch69 -p1
%patch70 -p1
%patch71 -p1
+%patch73 -p1
+%patch74 -p1
rm -f scripts/services/*.orig
%build
@@ -187,16 +197,7 @@ install -m 0755 -d %{buildroot}%{_mandir
install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8
rm -f %{buildroot}%{_sysconfdir}/cron.daily/logwatch \
- %{buildroot}%{_sbindir}/logwatch \
- %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune* \
- %{buildroot}%{_datadir}/logwatch/conf/services/zz-fortune* \
- %{buildroot}%{_datadir}/logwatch/conf/logfiles/fortune*
-touch %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
-touch %{buildroot}%{_datadir}/logwatch/scripts/services/courier
-touch %{buildroot}%{_datadir}/logwatch/scripts/services/dpkg
-chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
-chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/courier
-chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/dpkg
+ %{buildroot}%{_sbindir}/logwatch
# install cron script
install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily
@@ -266,6 +267,12 @@ rm -rf %{buildroot}
%doc License project/CHANGES
%changelog
+* Mon Apr 19 2010 Karel Klic <kklic at redhat.com> 7.3.6-51
+- Removed obsolete chmod and touch calls from the spec file
+- Added manpages for configuration files (rhbz#525644)
+- Ignore broken trust chain messages in named service (rhbz#581186)
+- Re-enabled zz-fortune service (#573450)
+
* Mon Feb 1 2010 Karel Klic <kklic at redhat.com> 7.3.6-50
- Added patch from #555750: Not all methods to deny login via sshd are reported
- Added patch from #555735: DHCPDv6 messages are not recognised
More information about the scm-commits
mailing list