Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2018-11-01 14:34:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog" Thu Nov 1 14:34:35 2018 rev:141 rq:644714 version:8.38.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2018-10-11 11:40:37.491155471 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2018-11-01 14:34:53.614934004 +0100 @@ -1,0 +2,7 @@ +Tue Oct 16 14:07:14 UTC 2018 - [email protected] + +- rsyslog configuration cleanup by filter rules in separate files (bug#1102720) + * add parsing of additional filter rules in /etc/rsyslog.d/*.frule + * add acpid.frule, firewall.frule, NetworkManager.frule + +------------------------------------------------------------------- New: ---- NetworkManager.frule acpid.frule firewall.frule ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.z5yHrK/_old 2018-11-01 14:34:58.034933575 +0100 +++ /var/tmp/diff_new_pack.z5yHrK/_new 2018-11-01 14:34:58.038933575 +0100 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -232,6 +232,9 @@ Source14: http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-%{version}.tar.gz Source15: rsyslog.firewall Source16: journald-rsyslog.conf +Source17: acpid.frule +Source18: firewall.frule +Source19: NetworkManager.frule # PATCH-FIX-OPENSUSE rsyslog-unit.patch [email protected] Customize upstream systemd unit for openSUSE needs. Patch0: rsyslog-unit.patch @@ -823,6 +826,10 @@ chmod 644 %{buildroot}%{rsyslog_sockets_cfg} mkdir -p %{buildroot}%{APPARMOR_PROFILE_PATH}/rsyslog.d/ install -m0640 %{SOURCE6} %{buildroot}%{APPARMOR_PROFILE_PATH}/ +install -m0600 %{SOURCE17} %{buildroot}%{_sysconfdir}/rsyslog.d/ +install -m0600 %{SOURCE18} %{buildroot}%{_sysconfdir}/rsyslog.d/ +install -m0600 %{SOURCE19} %{buildroot}%{_sysconfdir}/rsyslog.d/ + %if %{with mysql} install -m0640 %{SOURCE7} %{buildroot}%{APPARMOR_PROFILE_PATH}/rsyslog.d/ %endif @@ -969,6 +976,7 @@ %dir %{_sysconfdir}/rsyslog.d %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf +%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/*.frule %{_sbindir}/rsyslogd %if "%{_sbindir}" != "/sbin" /sbin/rsyslogd ++++++ NetworkManager.frule ++++++ # # NetworkManager into separate file and stop their further processing # if ($programname == 'NetworkManager') or \ ($programname startswith 'nm-') \ then { -/var/log/NetworkManager stop } ++++++ acpid.frule ++++++ # # acpid messages into separate file and stop their further processing # # => all acpid messages for debuging (uncomment if needed): #if ($programname == 'acpid' or $syslogtag == '[acpid]:') then \ # -/var/log/acpid # # => up to notice (skip info and debug) if ($programname == 'acpid' or $syslogtag == '[acpid]:') and \ ($syslogseverity <= 5 /* notice */) \ then { -/var/log/acpid stop } ++++++ firewall.frule ++++++ # # firewall messages into separate file and stop their further processing # if ($syslogfacility-text == 'kern') and \ ($msg contains 'IN=' and $msg contains 'OUT=') \ then { -/var/log/firewall stop } ++++++ rsyslog.conf.in ++++++ --- /var/tmp/diff_new_pack.z5yHrK/_old 2018-11-01 14:34:58.150933563 +0100 +++ /var/tmp/diff_new_pack.z5yHrK/_new 2018-11-01 14:34:58.150933563 +0100 @@ -96,41 +96,9 @@ # -# firewall messages into separate file and stop their further processing +# Additional filter rules # -if ($syslogfacility-text == 'kern') and \ - ($msg contains 'IN=' and $msg contains 'OUT=') \ -then { - -/var/log/firewall - stop -} - - -# -# acpid messages into separate file and stop their further processing -# -# => all acpid messages for debuging (uncomment if needed): -#if ($programname == 'acpid' or $syslogtag == '[acpid]:') then \ -# -/var/log/acpid -# -# => up to notice (skip info and debug) -if ($programname == 'acpid' or $syslogtag == '[acpid]:') and \ - ($syslogseverity <= 5 /* notice */) \ -then { - -/var/log/acpid - stop -} - - -# -# NetworkManager into separate file and stop their further processing -# -if ($programname == 'NetworkManager') or \ - ($programname startswith 'nm-') \ -then { - -/var/log/NetworkManager - stop -} +$IncludeConfig /etc/rsyslog.d/*.frule #
