From 8c73a65a9255b74d8df0639d14af4e993d3b47ee Mon Sep 17 00:00:00 2001
From: 19909236985 <wuchaochao4@huawei.com>
Date: Fri, 11 Feb 2022 15:35:45 +0800
Subject: [PATCH] update  timezone

(cherry picked from commit 1505957cbf0f0a9f2dfd007b0ccbd93846a6bb60)
---
 os_check_timezone_for_rsyslog.sh |  1 +
 rsyslog.service                  |  1 +
 rsyslog.spec                     | 10 ++++++++--
 timezone_update.sh               |  4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 timezone_update.sh

diff --git a/os_check_timezone_for_rsyslog.sh b/os_check_timezone_for_rsyslog.sh
index a286b49..75e7e40 100644
--- a/os_check_timezone_for_rsyslog.sh
+++ b/os_check_timezone_for_rsyslog.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+umask 0077
 LOCK_FILE=/var/lock/os_check_timezone_change.lock
 exec 200<>$LOCK_FILE
 flock -nx 200
diff --git a/rsyslog.service b/rsyslog.service
index c7d2ee3..94f6652 100644
--- a/rsyslog.service
+++ b/rsyslog.service
@@ -10,6 +10,7 @@ Documentation=https://www.rsyslog.com/doc/
 Type=notify
 EnvironmentFile=-/etc/sysconfig/rsyslog
 ExecStart=/usr/sbin/rsyslogd -n -i/var/run/rsyslogd.pid  $SYSLOGD_OPTIONS
+ExecStartPost=/bin/bash /usr/bin/timezone_update.sh
 UMask=0066
 StandardOutput=null
 Restart=on-failure
diff --git a/rsyslog.spec b/rsyslog.spec
index 9136039..ee9c0d9 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -4,7 +4,7 @@
 
 Name:           rsyslog
 Version:        8.2110.0
-Release:        2
+Release:        3
 Summary:        The rocket-fast system for log processing
 License:        (GPLv3+ and ASL 2.0)
 URL:            http://www.rsyslog.com/
@@ -17,6 +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
 
 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
@@ -322,6 +323,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/cron.d/
 install -m 0600 %{_sourcedir}/timezone.cron $RPM_BUILD_ROOT/etc/cron.d/
 install -m 0500 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/os_rotate_and_save_log.sh
 install -m 0500 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/os_check_timezone_for_rsyslog.sh
+install -m 0500 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/timezone_update.sh
 
 cp -r doc/* $RPM_BUILD_ROOT%{rsyslog_docdir}/html
 
@@ -357,6 +359,7 @@ done
 %{_sbindir}/rsyslogd
 %attr(500,root,root) %{_bindir}/os_rotate_and_save_log.sh
 %attr(500,root,root) %{_bindir}/os_check_timezone_for_rsyslog.sh
+%attr(500,root,root) %{_bindir}/timezone_update.sh
 /etc/cron.d/timezone.cron
 %{_unitdir}/rsyslog.service
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
@@ -472,7 +475,10 @@ done
 %{_mandir}/man1/rscryutil.1.gz
 
 %changelog
-* Tue Dec 2021 wuchaochao <wuchaochao4@huawei.com> - 8.2110.0-2
+* Fri Feb 11 2022 wuchaochao <cyanrose@yeah.net> - 8.2110.0-3
+- update timezone when restart rsyslog
+
+* Tue Dec 14  2021 wuchaochao <wuchaochao4@huawei.com> - 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 <wuchaochao4@huawei.com> - 8.2110.0-1
diff --git a/timezone_update.sh b/timezone_update.sh
new file mode 100644
index 0000000..f423a36
--- /dev/null
+++ b/timezone_update.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+umask 0066
+/usr/bin/date +%Z%z > /etc/localtime_tmp
\ No newline at end of file
-- 
Gitee