From 957685bb485782be2edea200b4d91f23ed106609 Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Wed, 30 Mar 2022 10:37:16 +0800 Subject: [PATCH] sync 22.03-LTS --- rsyslog.spec | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index 40a9f36..9375a7b 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -4,7 +4,7 @@ Name: rsyslog Version: 8.2110.0 -Release: 3 +Release: 7 Summary: The rocket-fast system for log processing License: (GPLv3+ and ASL 2.0) URL: http://www.rsyslog.com/ @@ -17,7 +17,7 @@ Source5: os_rotate_and_save_log.sh Source6: os_check_timezone_for_rsyslog.sh Source7: timezone.cron Source8: rsyslog.service -Source9: timezone_update.sh +Source9: timezone_update.sh Patch9000: rsyslog-8.24.0-ensure-parent-dir-exists-when-writting-log-file.patch Patch9001: bugfix-rsyslog-7.4.7-imjournal-add-monotonic-timestamp.patch @@ -476,19 +476,38 @@ done %{_mandir}/man1/rscryutil.1.gz %changelog -* Thu Mar 03 2022 wangkerong - 8.2110.0-3 +* Mon Mar 14 2022 wuchaochao - 8.2110.0-7 +- change startlimitburst spelling errors + +* Feb Mon 28 2022 wangkerong - 8.2110.0-6 - Increase the limit on restart frequency -* Thu Feb 17 2022 wuchaochao - 8.2110.0-2 -- change patch and update timezone when restart rsyslog +* Feb Mon 28 2022 wangkerong - 8.2110.0-5 +- update timezone when restart rsyslog -* Wed Feb 09 2022 wuchaochao - 8.2110.0-1 -- update version to 8.2110.0 and move rsyslog-crypto rsyslog-doc rsyslog-elasticsearch rsyslog-mmjsonparse syslog-mm -audit rsyslog-mmsnmptrapd rsyslog-mysql syslog-gssapi rsyslog-gnutls rsyslog-updspoof -from rsyslog +* Wed Feb 23 2022 wuchaochao - 8.2110.0-4 +- delete rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch -* Mon Aug 30 2021 wuchaochao - 8.2012.0-3 -- Sync update 21.09 branch code patch +* Sat Feb 19 2022 liuyumeng - 8.2110.0-3 +- print main queue info to journal + +* Tue Dec 14 2021 wuchaochao - 8.2110.0-2 +- move rsyslog-crypto rsyslog-doc rsyslog-elasticsearch rsyslog-mmjsonparse syslog-mmaudit rsyslog-mmsnmptrapd rsyslog-mysql syslog-gssapi rsyslog-gnutls rsyslog-updspoof from rsyslog + +* Thu Dec 09 2021 wuchaochao - 8.2110.0-1 +- update version to 8.2110.0 + +* Thu Aug 26 2021 wuchaochao - 8.2012.0-4 +- Type:NA +- ID:NA +- SUG:restart +- DESC:remove RSYSLOG_OPTIONS and change rsyslog.service files + +* Wed Aug 25 2021 wuchaochao - 8.2012.0-3 +- Type:NA +- ID:NA +- SUG:restart +- DESC:add RSYSLOG_OPTIONS and organize rsyslog.service files * Fri Jun 11 2021 shangyibin - 8.2012.0-2 - Type:NA