From 3680d4354460351342871b5bab3d5d6fe8fda4f5 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 13 Dec 2022 18:39:03 +0100
Subject: [PATCH] new upstream version 3.21.0

---
 0001-logrotate-3.20.1-lock-state-msg.patch | 31 ----------------------
 logrotate.spec                             | 10 +++----
 sources                                    |  4 +--
 3 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 0001-logrotate-3.20.1-lock-state-msg.patch

diff --git a/0001-logrotate-3.20.1-lock-state-msg.patch b/0001-logrotate-3.20.1-lock-state-msg.patch
deleted file mode 100644
index a472d11..0000000
--- a/0001-logrotate-3.20.1-lock-state-msg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
diff --git a/logrotate.spec b/logrotate.spec
index a4e4396..7f1c01b 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
-Version: 3.20.1
-Release: 3%{?dist}
+Version: 3.21.0
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://github.com/logrotate/logrotate
 Source0: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
@@ -13,9 +13,6 @@ Source2: kdudka.pgp
 
 Source3: rwtab
 
-# lockState: do not print `error:` when exit code is unaffected (#2090926)
-Patch:   0001-logrotate-3.20.1-lock-state-msg.patch
-
 BuildRequires: acl
 BuildRequires: automake
 BuildRequires: gcc
@@ -118,6 +115,9 @@ fi
 %config(noreplace) %{_sysconfdir}/rwtab.d/logrotate
 
 %changelog
+* Tue Dec 13 2022 Kamil Dudka <kdudka@redhat.com> - 3.21.0-1
+- new upstream version 3.21.0
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 131a001..a6dad6f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (logrotate-3.20.1.tar.xz) = a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092
-SHA512 (logrotate-3.20.1.tar.xz.asc) = 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029
+SHA512 (logrotate-3.21.0.tar.xz) = c576df7d2bc1a1db2f99befdd0ea627aef2d97bdcd4a7cdea76870623ba92fb1f04f1af6d15b75e4a9085f4aef2ae5e9843c4094cdd01e24d89872ccaf9c0d4a
+SHA512 (logrotate-3.21.0.tar.xz.asc) = 8f4c1853cd84f85c796b72b43048f4cf04e3409703e7669ee91e1d1aa5e9e5c04261fac1cdf85ec303508d5b6dbf126a44eb9ec819bcc772c664830d39e1068c