!31 upgrade version to 3.21.0

From: @han_hui_hui 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-02-04 09:37:22 +00:00 committed by Gitee
commit 13407db945
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 6 additions and 35 deletions

View File

@ -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

Binary file not shown.

BIN
logrotate-3.21.0.tar.xz Normal file

Binary file not shown.

View File

@ -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 <hanhuihui5@huawei.com> - 3.21.0-1
- upgrade version to 3.21.0
* Thu Jan 11 2024 hanhuihui <hanhuihui5@huawei.com> - 3.20.1-3
- do not pack directories belonging to other packages