[logwatch/f15/master] Added -sshd patch and revert to older conf file creations

Frank Crawford frankcrawford at fedoraproject.org
Sat Apr 30 15:01:00 UTC 2011


commit 522d3f220c7ed92351717332ac069b0fdb0e19b3
Author: Frank Crawford <frank at crawford.emu.id.au>
Date:   Sun May 1 01:00:39 2011 +1000

    Added -sshd patch and revert to older conf file creations

 logwatch.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/logwatch.spec b/logwatch.spec
index 19855c4..f3ee826 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 69.20110203svn25%{?dist}
+Release: 70.20110203svn25%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -31,6 +31,7 @@ Patch5: logwatch-manpage.patch
 Patch6: logwatch-xntpd.patch
 Patch7: logwatch-smartd.patch
 Patch8: logwatch-dovecot.patch
+Patch9: logwatch-sshd.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildArchitectures: noarch
@@ -52,6 +53,7 @@ of the package on many systems.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -90,8 +92,6 @@ install -m 0644 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/serv
 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/logwatch.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
-install -m 0644 conf/ignore.conf %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf
 
 install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
 install -m 0644 conf/services/* %{buildroot}%{_datadir}/logwatch/default.conf/services
@@ -117,6 +117,8 @@ touch %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
 chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
 %endif
 
+echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT #####" > %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf
+echo "# Local configuration options go here (defaults are in %{_datadir}/logwatch/default.conf/logwatch.conf)" > %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
 echo "# Configuration overrides for specific logfiles/services may be placed here." > %{buildroot}%{_sysconfdir}/logwatch/conf/override.conf
 
 %files
@@ -146,6 +148,10 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 %doc LICENSE
 
 %changelog
+* Sat Apr 30 2011 Frank Crawford <frank at crawford.emu.id.au> - 7.3.6-70.20110203svn25
+- Added -sshd patch to match more pam_systemd messages (rhbz#699558)
+- Updated logwatch.spec to create empty files in /etc/logwatch/conf
+
 * Tue Apr 26 2011 Frank Crawford <frank at crawford.emu.id.au> - 7.3.6-69.20110203svn25
 - Updated -secure patch for pam_systemd messages (rhbz#699558)
 - Updated -dovecot patch for extended starting message from upstream


More information about the scm-commits mailing list