Hello community,

here is the log from the commit of package logwatch.1788 for 
openSUSE:12.3:Update checked in at 2013-06-24 11:52:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/logwatch.1788 (Old)
 and      /work/SRC/openSUSE:12.3:Update/.logwatch.1788.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "logwatch.1788"

Changes:
--------
New Changes file:

--- /dev/null   2013-06-21 10:50:32.496031756 +0200
+++ /work/SRC/openSUSE:12.3:Update/.logwatch.1788.new/logwatch.changes  
2013-06-24 11:52:03.000000000 +0200
@@ -0,0 +1,104 @@
+-------------------------------------------------------------------
+Mon Jun 17 12:53:01 CEST 2013 - [email protected]
+
+- Add patch from redhat to parse rsyslog timestamps (bnc#818842).
+  + added logwatch-parse_rsyslog_timestamps.patch
+
+-------------------------------------------------------------------
+Tue Dec 18 12:04:36 UTC 2012 - [email protected]
+
+- Added logwatch-dmeventd-reduce_frequency.patch to reduce false
+  positives from dmeventd when a long logwatch run is in progress 
+
+-------------------------------------------------------------------
+Mon Oct 17 13:08:25 CEST 2011 - [email protected]
+
+- Update to 7.4.0 which is the official release with the fix for
+  CVE-2011-1018.
+- Fix cron.d file to state the user to run dmeventd as (bnc#724164).
+- Fix file list for 7.4.0.
+
+-------------------------------------------------------------------
+Sun Feb 27 22:39:50 CET 2011 - [email protected]
+
+- Fix CVE-2011-1018 patch (missing parenthesis)
+
+-------------------------------------------------------------------
+Fri Feb 25 12:36:14 CET 2011 - [email protected]
+
+- Add patch to fix the handling of special characters in log files
+  (CVE-2011-1018, bnc#674984).
+- Make files in Logwatch_Dmeventd_Setup_Files tarball 644 and
+  repack with bzip2.
+
+-------------------------------------------------------------------
+Tue Feb  1 12:24:42 CET 2011 - [email protected]
+
+- Fix Requires for SLE10.
+
+-------------------------------------------------------------------
+Mon May 10 10:22:41 UTC 2010 - [email protected]
+
+- Require perl-Date-Manip (bnc#603959).
+
+-------------------------------------------------------------------
+Tue Dec  1 16:20:57 CET 2009 - [email protected]
+
+- --print was set by default and in that case redirection to file
+  never happened (bnc#450413).
+
+-------------------------------------------------------------------
+Sun Aug 30 20:06:21 CEST 2009 - [email protected]
+
+- use %patch0 for Patch0
+
+-------------------------------------------------------------------
+Mon Jan 19 14:44:28 CET 2009 - [email protected]
+
+- Log timestamp of dmeventd in /var/lib/logwatch not
+  /etc/logwatch/scripts/services.
+- Add /var/lib/logwatch to file list (bnc#467272)
+
+-------------------------------------------------------------------
+Fri Jan 16 13:18:48 CET 2009 - [email protected]
+
+- Fix a few typos in logwatch.conf
+
+-------------------------------------------------------------------
+Tue Jan 13 12:15:35 CET 2009 - [email protected]
+
+- Call sendmail with full path (bnc#465127).
+
+-------------------------------------------------------------------
+Mon Oct 13 16:47:05 CEST 2008 - [email protected]
+
+- Add files to let logwatch capture DM events (fate#304214, bnc#434254)
+
+-------------------------------------------------------------------
+Tue Apr  8 09:33:47 CEST 2008 - [email protected]
+
+- logwatch does not watch anything without cron 
+
+-------------------------------------------------------------------
+Mon Nov 12 14:47:17 CET 2007 - [email protected]
+
+- Patch iptables.conf to also monitor the SUSE firewall logs (#334167)
+- Update to 7.3.6:
+   - Fixed bug with --mailto not working with printing now enabled by default
+   - Fixed problem with the Samba filter
+   - New services bfd, zz-runtime, evtsystem, evtsecurity, and evtapplication.
+   - Default behavior is now to print output which means you will see the
+     report if you run it from the command-line and when run from cron it will
+     be emailed to you by the cron daemon.  You can change this through config
+     or command-line options.
+   - Substantial Postfix improvements and other minor changes and fixes
+   - Numerous other filter improvements
+   - Added dpkg, pix, denyhosts, and php services
+
+-------------------------------------------------------------------
+Thu Nov 23 15:02:31 CET 2006 - [email protected]
+
+- check into autobuild
+- update to 7.3.1
+- FATE #300526
+

New:
----
  Logwatch_Dmeventd_Setup_Files.tar.xz
  logwatch-7.4.0.tar.bz2
  logwatch-dmeventd-reduce_frequency.patch
  logwatch-firewall.patch
  logwatch-parse_rsyslog_timestamps.patch
  logwatch-rpmlintrc
  logwatch-timestamp_in_var.patch
  logwatch.changes
  logwatch.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ logwatch.spec ++++++
#
# spec file for package logwatch
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


#package changed name with SLE11
%if 0%suse_version < 1100
%define date_manip_pkg perl-DateManip
%else
%define date_manip_pkg perl-Date-Manip
%endif

Name:           logwatch
Summary:        Analyzes and Reports on system logs
License:        MIT
Group:          System/Monitoring
Version:        7.4.0
Release:        0
Url:            http://www.logwatch.org
BuildArch:      noarch
Source0:        logwatch-%{version}.tar.bz2
Source1:        %{name}-rpmlintrc
Source2:        Logwatch_Dmeventd_Setup_Files.tar.xz
Patch0:         logwatch-firewall.patch
Patch2:         logwatch-timestamp_in_var.patch
Patch3:         logwatch-dmeventd-reduce_frequency.patch
Patch4:         logwatch-parse_rsyslog_timestamps.patch
Requires:       %date_manip_pkg
Requires:       cron
Requires:       grep
Requires:       mailx
Requires:       perl
Requires:       sh-utils
Requires:       textutils
BuildRequires:  dos2unix
BuildRequires:  xz
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildArch:      noarch

%description
Logwatch is a customizable, pluggable log-monitoring system. It will go
through your logs for a given period of time and make a report in the
areas that you wish with the detail that you wish.



Authors:
--------
    Kirk Bauer <[email protected]>

%prep
%setup -q -a 2
chmod u+w Logwatch_Setup_Files/*
%patch0
%patch2
%patch3
%patch4
dos2unix scripts/services/courier

%build

%install
install -m 0755 -d %{buildroot}%{_var}/cache/logwatch
install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/scripts
install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf
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/dist.conf/logfiles
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/lib
install -m 0755 -d %{buildroot}/var/lib/logwatch
install -m 0755 scripts/logwatch.pl 
%{buildroot}%{_datadir}/logwatch/scripts/logwatch.pl
for i in scripts/logfiles/* ; do
   if [ $(ls $i | wc -l) -ne 0 ] ; then
      install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
      install -m 0755 $i/* %{buildroot}%{_datadir}/logwatch/$i
   fi
done
install -m 0755 scripts/services/* 
%{buildroot}%{_datadir}/logwatch/scripts/services
install -m 0755 Logwatch_Setup_Files/dmeventd 
%{buildroot}%{_datadir}/logwatch/scripts/services
install -m 0755 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0755 lib/* %{buildroot}%{_datadir}/logwatch/lib
install -m 0644 conf/*.conf %{buildroot}%{_datadir}/logwatch/default.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 Logwatch_Setup_Files/dmeventd.conf 
%{buildroot}%{_datadir}/logwatch/default.conf/services
install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html
install -m 0755 -d %{buildroot}%{_mandir}/man8
install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8
rm -f   %{buildroot}%{_sysconfdir}/cron.daily/logwatch \
   %{buildroot}%{_sbindir}/logwatch
install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily
ln -s %{_datadir}/logwatch/scripts/logwatch.pl 
%{buildroot}%{_sysconfdir}/cron.daily/0logwatch
install -m 0755 -d %{buildroot}%{_sbindir}
install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.d
install -m 0644 Logwatch_Setup_Files/dmeventd_cronjob.txt 
%{buildroot}%{_sysconfdir}/cron.d/dmeventd
ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sbindir}/logwatch
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
#
rpm -qa --queryformat='%%{name}/%%{version}/%%{release}/%%{arch}\n'| sort | 
bzip2 -9 > USEDFORBUILD.bz2
#

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README HOWTO-Customize-LogWatch
%doc USEDFORBUILD.bz2
%dir %{_var}/cache/logwatch
%dir %{_sysconfdir}/logwatch
%dir %{_sysconfdir}/logwatch/scripts
%dir %{_sysconfdir}/logwatch/conf
%dir %{_sysconfdir}/logwatch/conf/logfiles
%dir %{_sysconfdir}/logwatch/conf/services
%dir %{_datadir}/logwatch
%dir %{_datadir}/logwatch/default.conf
%dir %{_datadir}/logwatch/default.conf/services
%dir %{_datadir}/logwatch/default.conf/logfiles
%dir %{_datadir}/logwatch/default.conf/html
%dir %{_datadir}/logwatch/dist.conf
%dir %{_datadir}/logwatch/dist.conf/services
%dir %{_datadir}/logwatch/dist.conf/logfiles
%dir %{_datadir}/logwatch/scripts
%dir %{_datadir}/logwatch/scripts/logfiles
%dir %{_datadir}/logwatch/scripts/services
%dir %{_datadir}/logwatch/scripts/shared
%dir %{_datadir}/logwatch/scripts/logfiles/*
%dir %{_datadir}/logwatch/lib
%dir /var/lib/logwatch
%config %{_sysconfdir}/cron.d/dmeventd
%{_datadir}/logwatch/scripts/logwatch.pl
%{_sbindir}/logwatch
%{_datadir}/logwatch/scripts/shared/*
%{_datadir}/logwatch/scripts/services/*
%{_datadir}/logwatch/scripts/logfiles/*/*
%{_datadir}/logwatch/lib/Logwatch.pm
%{_datadir}/logwatch/default.conf/*.conf
%{_datadir}/logwatch/default.conf/services/*.conf
%{_datadir}/logwatch/default.conf/logfiles/*.conf
%{_datadir}/logwatch/default.conf/html/*.html
%{_sysconfdir}/cron.daily/0logwatch
%doc %{_mandir}/man8/logwatch.8*
%config(noreplace) %{_sysconfdir}/logwatch/conf/*.conf

%changelog
++++++ logwatch-dmeventd-reduce_frequency.patch ++++++
diff -uNr Logwatch_Setup_Files.orig/dmeventd_cronjob.txt 
Logwatch_Setup_Files/dmeventd_cronjob.txt
--- Logwatch_Setup_Files.orig/dmeventd_cronjob.txt      2012-12-18 
13:49:30.898656175 +0200
+++ Logwatch_Setup_Files/dmeventd_cronjob.txt   2012-12-18 13:57:18.645457384 
+0200
@@ -18,5 +18,5 @@
 # every month of the year, every day of the week.
 # (Note: this call also be accomplished with a */1 instead of 0-59)
 
- 0-59 * * * * root /usr/sbin/logwatch --service dmeventd
- 
\ No newline at end of file
+ 30 * * * * root /usr/sbin/logwatch --service dmeventd
+ 
++++++ logwatch-firewall.patch ++++++
Index: conf/logfiles/iptables.conf
===================================================================
--- conf/logfiles/iptables.conf.orig    2010-04-30 23:36:27.000000000 +0200
+++ conf/logfiles/iptables.conf 2011-10-17 12:48:39.746113236 +0200
@@ -6,17 +6,21 @@
 # This was written and is maintained by:
 #    Kirk Bauer <[email protected]>
 #
+# Modified for SLE and openSUSE by Philipp Thomas <[email protected]>
+#
 # Please send all comments, suggestions, bug reports,
 #    etc, to [email protected].
 ########################################################
 
 # What actual file?  Defaults to LogPath if not absolute path....
 LogFile = ulogd/ulogd.syslogemu
+LogFile = firewall
 
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 Archive = ulogd/ulogd.syslogemu.*
 Archive = ulogd/ulogd.syslogemu-*
+Archive = firewall*
 
 # Keep only the lines in the proper date range...
 *ApplyStdDate
++++++ logwatch-parse_rsyslog_timestamps.patch ++++++
---
 scripts/shared/applystddate |    5 +++++
 1 file changed, 5 insertions(+)

Index: scripts/shared/applystddate
===================================================================
--- scripts/shared/applystddate.orig    2010-05-01 04:34:09.000000000 +0200
+++ scripts/shared/applystddate 2013-06-17 12:52:20.949898694 +0200
@@ -23,6 +23,7 @@ use Logwatch ':dates';
 my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
 
 $SearchDate = TimeFilter('%b %e %H:%M:%S');
+$SearchDateRsyslog = 
TimeFilter('%Y-%m-%dT%H:%M:%S\.[0-9]+[+-][0-9]{2}:[0-9]{2}');
 
 # The date might be "Dec 09", but it needs to be "Dec  9"...
 #$SearchDate =~ s/ 0/  /;
@@ -30,11 +31,15 @@ $SearchDate = TimeFilter('%b %e %H:%M:%S
 if ( $Debug > 5 ) {
    print STDERR "DEBUG: Inside ApplyStdDate...\n";
    print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
+   print STDERR "DEBUG: Looking For: " . $SearchDateRsyslog . "\n";
 }
 
 while (defined($ThisLine = <STDIN>)) {
    if ($ThisLine =~ m/^$SearchDate /o) {
       print $ThisLine;
+   } elsif ($ThisLine =~ /^$SearchDateRsyslog /o) {
+      $ThisLine =~ 
s/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.[0-9]+[+-][0-9]{2}:[0-9]{2}
 //o;
+      print POSIX::strftime("%b %e %H:%M:%S", $6, $5, $4, $3+1, $2-1, $1 - 
1900) . " " . $ThisLine;
    } elsif ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate \d{4}/o) {
       print $ThisLine;
    }
++++++ logwatch-rpmlintrc ++++++
# This line is mandatory to access the configuration functions
from Config import *

addFilter("logwatch.noarch: W: script-without-shebang")
++++++ logwatch-timestamp_in_var.patch ++++++
Such data belongs to /var not /etc.

--- Logwatch_Setup_Files/dmeventd
+++ Logwatch_Setup_Files/dmeventd
@@ -31,7 +31,7 @@
 # Set the location of the folder to store last time stamp
 # (This is used to record the last log sent out so repeats 
 #  are not mailed in error.)
-$Storage_file = "/etc/logwatch/scripts/services/timestamp.txt";
+$Storage_file = "/var/lib/logwatch/timestamp.txt";
 $count = 0;
 $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to