!17 fix CVE-2022-1348 and upgrade to 3.20.1

From: @duyiwei7w 
Reviewed-by: @overweight 
Signed-off-by: @overweight

0001-logrotate-3.20.1-lock-state-msg.patch

@@ -0,0 +1,31 @@
+From e509c7db71cefd150e9c4360b8abd3b378b129b2 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Fri, 27 May 2022 09:56:07 +0200
+Subject: [PATCH] lockState: do not print `error:` when exit code is unaffected
+
+Closes: https://github.com/logrotate/logrotate/pull/448
+
+Upstream-commit: 31cf1099ab8514dfcae5a980bc77352edd5292f8
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ logrotate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index 2350672..6188a35 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -3050,8 +3050,8 @@ static int lockState(const char *stateFilename, int skip_state_lock)
+     }
+ 
+     if (sb.st_mode & S_IROTH) {
+-        message(MESS_ERROR, "state file %s is world-readable and thus can"
+-                " be locked from other unprivileged users."
++        message(MESS_NORMAL, "warning: state file %s is world-readable"
++                " and thus can be locked from other unprivileged users."
+                 " Skipping lock acquisition...\n",
+                 stateFilename);
+         close(lockFd);
+-- 
+2.35.3
+

logrotate.spec

@@ -1,12 +1,14 @@
 %global _configure ../configure
 
 Name: logrotate
-Version: 3.18.1
+Version: 3.20.1
 Release: 1
 Summary: simplify the administration of log files
 License: GPLv2+
 Url: https://github.com/logrotate/logrotate
 Source0: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
+# lockState: do not print `error:` when exit code is unaffected
+Patch0: 0001-logrotate-3.20.1-lock-state-msg.patch 
 BuildRequires: acl gcc automake libacl-devel libselinux-devel popt-devel
 Requires: coreutils
 
@@ -73,6 +75,9 @@ fi
 %{_mandir}/man5/logrotate.conf.5*
 
 %changelog
+* Fri Jun 10 2022 duyiwei <duyiwei@kylinos.cn> - 3.20.1-1
+- upgrade version to 3.20.1 and fix CVE-2022-1348
+
 * Sat Nov 20 2021 xiechengliang <xiechengliang1@huawei.com> - 3.18.1-1
 - update upstream to 3.18.1