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 -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 ---- - 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-3.20.1.tar.xz b/logrotate-3.20.1.tar.xz deleted file mode 100644 index 6548d85..0000000 Binary files a/logrotate-3.20.1.tar.xz and /dev/null differ diff --git a/logrotate-3.21.0.tar.xz b/logrotate-3.21.0.tar.xz new file mode 100644 index 0000000..59a6bf5 Binary files /dev/null and b/logrotate-3.21.0.tar.xz differ diff --git a/logrotate.spec b/logrotate.spec index da183eb..f3a1bbb 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -1,14 +1,13 @@ %global _configure ../configure Name: logrotate -Version: 3.20.1 -Release: 3 +Version: 3.21.0 +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 + Patch6001: backport-do-not-rotate-old-logs-on-prerotate-failure.patch BuildRequires: acl gcc automake libacl-devel libselinux-devel popt-devel @@ -76,6 +75,9 @@ fi %{_mandir}/man5/logrotate.conf.5* %changelog +* Sun Feb 4 2024 hanhuihui - 3.21.0-1 +- upgrade version to 3.21.0 + * Thu Jan 11 2024 hanhuihui - 3.20.1-3 - do not pack directories belonging to other packages