Hello community, here is the log from the commit of package logwatch for openSUSE:Factory checked in at 2020-02-18 10:41:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/logwatch (Old) and /work/SRC/openSUSE:Factory/.logwatch.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logwatch" Tue Feb 18 10:41:58 2020 rev:42 rq:774937 version:7.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/logwatch/logwatch.changes 2019-08-28 18:35:10.665286881 +0200 +++ /work/SRC/openSUSE:Factory/.logwatch.new.26092/logwatch.changes 2020-02-18 10:42:24.397189494 +0100 @@ -1,0 +2,11 @@ +Mon Jan 20 13:20:10 UTC 2020 - Christian Vögl <cvo...@suse.de> + +- Remove cron support: + * Add logwatch_dmeventd timer and unit file to + Logwatch_Dmeventd_Setup_Files.tar.xz + The new logwatch_dmeventd timer has to be started manually, + in contrast to the previous cronjob + * Removed logwatch-dmeventd-reduce_frequency.patch: + No longer needed with systemd timers + +------------------------------------------------------------------- Old: ---- logwatch-dmeventd-reduce_frequency.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logwatch.spec ++++++ --- /var/tmp/diff_new_pack.9P3cnE/_old 2020-02-18 10:42:25.281191297 +0100 +++ /var/tmp/diff_new_pack.9P3cnE/_new 2020-02-18 10:42:25.289191314 +0100 @@ -1,7 +1,7 @@ # # spec file for package logwatch # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Group: System/Monitoring Version: 7.5.2 Release: 0 -Url: http://www.logwatch.org +URL: http://www.logwatch.org BuildArch: noarch Source0: http://sourceforge.net/projects/logwatch/files/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc @@ -30,9 +30,6 @@ Source3: ChangeLog Patch0: logwatch-firewall.patch Patch2: logwatch-timestamp_in_var.patch -Patch3: logwatch-dmeventd-reduce_frequency.patch -BuildRequires: cron -Requires: cron Requires: grep Requires: mailx Requires: perl @@ -46,8 +43,7 @@ # does where both use cron.daily. We don't need to use systemd timers on all # distros with systemd, just those with logrotate.timer, which for SUSE is # SLE 12 SP3/Leap 42.3 and newer (including 15.x). -%if 0%{?sle_version} >= 120300 || 0%{?fedora} >= 30 -%bcond_without systemd + %{?systemd_requires} %if 0%{?suse_version} @@ -56,10 +52,6 @@ BuildRequires: systemd %endif -%else -%bcond_with systemd -%endif - %description Logwatch is a customizable, pluggable log-monitoring system. It will go through system logs for a given period of time and make a report for the @@ -70,7 +62,6 @@ chmod u+w Logwatch_Setup_Files/* %patch0 %patch2 -%patch3 cp %{S:3} . # fix package doc dir in man page sed -i -e 's,/usr/share/doc/logwatch-\*,%{_defaultdocdir}/logwatch,' logwatch.8 @@ -126,37 +117,32 @@ done rm -f %{buildroot}%{_sysconfdir}/cron.daily/logwatch \ %{buildroot}%{_sbindir}/logwatch -%if %{with systemd} + install -D -m 644 scheduler/logwatch.service %{buildroot}%{_unitdir}/logwatch.service install -D -m 644 scheduler/logwatch.timer %{buildroot}%{_unitdir}/logwatch.timer - -%else -install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily -ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sysconfdir}/cron.daily/0logwatch -%endif +install -D -m 644 Logwatch_Setup_Files/logwatch_dmeventd.service %{buildroot}%{_unitdir}/logwatch_dmeventd.service +install -D -m 644 Logwatch_Setup_Files/logwatch_dmeventd.timer %{buildroot}%{_unitdir}/logwatch_dmeventd.timer 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 -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rclogwatch +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rclogwatch_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 # -%if %{with systemd} %pre -%service_add_pre %{name}.service %{name}.timer +%service_add_pre %{name}.service %{name}.timer logwatch_dmeventd.service logwatch_dmeventd.timer %post -%service_add_post %{name}.service %{name}.timer +%service_add_post %{name}.service %{name}.timer logwatch_dmeventd.service logwatch_dmeventd.timer # migration: may need to activate the timer, if enabled but not yet started? %preun -%service_del_preun %{name}.service %{name}.timer +%service_del_preun %{name}.service %{name}.timer logwatch_dmeventd.service logwatch_dmeventd.timer %postun -%service_del_postun %{name}.service %{name}.timer -%endif +%service_del_postun %{name}.service %{name}.timer logwatch_dmeventd.service logwatch_dmeventd.timer %files %defattr(-,root,root) @@ -182,7 +168,6 @@ %dir %{_datadir}/logwatch/scripts/logfiles/* %dir %{_datadir}/logwatch/lib %dir /var/lib/logwatch -%config(noreplace) %{_sysconfdir}/cron.d/dmeventd %{_datadir}/logwatch/scripts/logwatch.pl %{_sbindir}/logwatch %{_datadir}/logwatch/scripts/shared/* @@ -195,12 +180,12 @@ %{_datadir}/logwatch/default.conf/html/*.html %{_datadir}/logwatch/dist.conf/services/*.conf %{_datadir}/logwatch/dist.conf/logfiles/*.conf -%if %{with systemd} %{_unitdir}/logwatch.service %{_unitdir}/logwatch.timer -%else -%{_sysconfdir}/cron.daily/0logwatch -%endif +%{_unitdir}/logwatch_dmeventd.service +%{_unitdir}/logwatch_dmeventd.timer +%{_sbindir}/rclogwatch +%{_sbindir}/rclogwatch_dmeventd %doc %{_mandir}/man8/logwatch.8* %doc %{_mandir}/man5/*.conf.5* %config(noreplace) %{_sysconfdir}/logwatch/conf/*.conf ++++++ Logwatch_Dmeventd_Setup_Files.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Logwatch_Setup_Files/logwatch_dmeventd.service new/Logwatch_Setup_Files/logwatch_dmeventd.service --- old/Logwatch_Setup_Files/logwatch_dmeventd.service 1970-01-01 01:00:00.000000000 +0100 +++ new/Logwatch_Setup_Files/logwatch_dmeventd.service 2020-01-28 14:31:04.000000000 +0100 @@ -0,0 +1,27 @@ + +# +# systemd unit file for logwatch --service dmeventd +# this file is required because we run this command every 30 mins, instead of daily +# +# Copyright (c) 2020 SUSE LINUX 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 https://bugs.opensuse.org/ +# + +[Unit] +Description=Log analyzer and reporter, special file for dmeventd +Documentation=man:logwatch(8) man:logwatch.conf(5) + +[Service] +User=root +Type=oneshot +ExecStart=/usr/sbin/logwatch --service dmeventd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Logwatch_Setup_Files/logwatch_dmeventd.timer new/Logwatch_Setup_Files/logwatch_dmeventd.timer --- old/Logwatch_Setup_Files/logwatch_dmeventd.timer 1970-01-01 01:00:00.000000000 +0100 +++ new/Logwatch_Setup_Files/logwatch_dmeventd.timer 2020-01-14 19:01:32.000000000 +0100 @@ -0,0 +1,10 @@ +[Unit] +Description=hourly logwatch dmeventd run +Documentation=man:logwatch(8) man:logwatch.conf(5) + +[Timer] +OnCalendar=*-*-* *:30:00 +Persistent=true + +[Install] +WantedBy=timers.target
