From 28194cfb3add6541df3e01f7dda3967a2e643cce6f6fcd1dbb6a6ab013926a81 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 17 Oct 2012 13:34:57 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=85 --- logrotate.syslog | 41 ++++++---------------------------------- syslog-service-generator | 1 + syslogd-rpmlintrc | 9 +++++++++ syslogd.changes | 5 +++++ syslogd.spec | 31 +++++++++++++----------------- 5 files changed, 34 insertions(+), 53 deletions(-) create mode 100644 syslogd-rpmlintrc diff --git a/logrotate.syslog b/logrotate.syslog index 0904cb2..bda3dce 100644 --- a/logrotate.syslog +++ b/logrotate.syslog @@ -9,7 +9,12 @@ # the firewall,acpid,NetworkManager log files # are used by syslog-ng and rsyslog only, the # other by all syslog daemons. -/var/log/warn /var/log/messages /var/log/allmessages /var/log/localmessages /var/log/firewall /var/log/acpid /var/log/NetworkManager { +# the mail log files are used by all syslog daemons +# the news log files are used by all syslog daemons +/var/log/warn /var/log/messages /var/log/allmessages /var/log/localmessages /var/log/firewall /var/log/acpid /var/log/NetworkManager +/var/log/mail /var/log/mail.info /var/log/mail.warn /var/log/mail.err +/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice +{ compress dateext maxage 365 @@ -23,37 +28,3 @@ /etc/init.d/syslog reload > /dev/null endscript } - -# used by all syslog daemons -/var/log/mail /var/log/mail.info /var/log/mail.warn /var/log/mail.err { - compress - dateext - maxage 365 - rotate 99 - missingok - notifempty - size +4096k - create 640 root root - sharedscripts - postrotate - /etc/init.d/syslog reload > /dev/null - endscript -} - -# used by all syslog daemons -/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice { - compress - dateext - maxage 365 - rotate 99 - missingok - notifempty - size +4096k - su news news - create 640 news news - sharedscripts - postrotate - /etc/init.d/syslog reload > /dev/null - endscript -} - diff --git a/syslog-service-generator b/syslog-service-generator index 35c3aab..5d11e5d 100644 --- a/syslog-service-generator +++ b/syslog-service-generator @@ -205,6 +205,7 @@ tmpcore=$(/bin/mktemp $RUN_PATH/syslog.XXXXXXXX) || exit 1 StandardOutput=null ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service ExecStartPre=-$socksdir/addsockets + ExecReload=/bin/kill -HUP \$MAINPID EOF # diff --git a/syslogd-rpmlintrc b/syslogd-rpmlintrc new file mode 100644 index 0000000..a9d58ba --- /dev/null +++ b/syslogd-rpmlintrc @@ -0,0 +1,9 @@ +addFilter(".*incoherent-logrotate-file.*") +addFilter(".*init-script-non-var-dependency.*") +addFilter(".*dangling-symlink.*/lib/systemd/system/earlysyslog\.service.*/dev/null.*") +addFilter(".*no-reload-entry.*/etc/init\.d/early.*") +addFilter(".*no-status-entry.*/etc/init\.d/early.*") +addFilter(".*no-url-tag.*") +addFilter(".*non-etc-or-var-file-marked-as-conffile.*/lib/systemd/system/.*") +addFilter(".*suse-logrotate-log-dir-not-packaged.*/var/log/news.*") +addFilter(".*suse-missing-rclink.*early.*") diff --git a/syslogd.changes b/syslogd.changes index 9a0363d..4204aa0 100644 --- a/syslogd.changes +++ b/syslogd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 17 13:33:09 UTC 2012 - werner@suse.de + +- Avoid logrotate to exec for similar entries several times (bnc#713584) + ------------------------------------------------------------------- Wed Mar 7 14:22:13 UTC 2012 - werner@suse.de diff --git a/syslogd.spec b/syslogd.spec index ae8270c..544193b 100644 --- a/syslogd.spec +++ b/syslogd.spec @@ -15,29 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: syslogd %define omc_prefix /usr/share/omc %define omc_svcdir %{omc_prefix}/svcinfo.d -License: GPL-2.0+ -Group: System/Daemons -BuildRequires: pkg-config systemd-devel -Requires(post): %fillup_prereq +BuildRequires: pkg-config +BuildRequires: systemd-devel +Requires(post): %fillup_prereq Requires(post): %insserv_prereq -Requires(post): permissions +Requires(post): permissions Requires(postun): %insserv_prereq Requires(prereq): coreutils Requires(prereq): klogd Requires(prereq): sed Requires(prereq): syslog-service -Provides: syslog Provides: sysklogd -AutoReqProv: on +Provides: syslog Version: 1.4.1 -Release: 747 +Release: 0 Summary: The Syslog daemon +License: GPL-2.0+ +Group: System/Daemons Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog Source2: sysconfig.syslog @@ -99,14 +97,12 @@ Authors: Shane Alderton %package -n klogd -License: GPL-2.0+ Provides: klogd:/sbin/klogd -Requires(post): %fillup_prereq +Requires(post): %fillup_prereq Requires(post): %insserv_prereq Requires(postun): %insserv_prereq Summary: The kernel log daemon Group: System/Daemons -AutoReqProv: on %description -n klogd The klogd daemon 'listens' to kernel log messages, prioritizes them, @@ -125,15 +121,14 @@ Authors: Shane Alderton %package -n syslog-service -License: GPL-2.0+ -Requires(post): %fillup_prereq -Requires(post): %insserv_prereq +Requires(post): %fillup_prereq +Requires(post): %insserv_prereq Requires(postun): %insserv_prereq Provides: klogd:/etc/init.d/syslog -Requires: /etc/init.d/network logrotate +Requires: /etc/init.d/network +Requires: logrotate Summary: Syslog service files & scripts Group: System/Daemons -AutoReqProv: on BuildArch: noarch %description -n syslog-service