Add x86_64_v2 to _BASEARCH_MAP
Add link to AlmaLinux bugtracker
This commit is contained in:
commit
6a94a66797
64
0042-Preserve-ACL-when-rotating-logs.patch
Normal file
64
0042-Preserve-ACL-when-rotating-logs.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From 5759ab2835f585b8d2143a712a38eb3ab967123d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Wed, 19 Nov 2025 16:05:25 +0100
|
||||
Subject: [PATCH] Preserve ACL when rotating logs
|
||||
|
||||
Upstream commit: 4324b297da2fd6a15670241398a31e7f462e44e4
|
||||
|
||||
When DNF rotated /var/log/dnf.log, it preserved a file mode, but it
|
||||
lost an access control list:
|
||||
|
||||
# getfacl -c /var/log/dnf.log
|
||||
getfacl: Removing leading '/' from absolute path names
|
||||
user::rw-
|
||||
user:root:r--
|
||||
group::r--
|
||||
mask::r--
|
||||
other::r--
|
||||
|
||||
# dnf4 --setopt log_rotate=4 --setopt log_size=1 upgrade --assumeno
|
||||
|
||||
# getfacl -c /var/log/dnf.log
|
||||
getfacl: Removing leading '/' from absolute path names
|
||||
user::rw-
|
||||
group::r--
|
||||
other::r--
|
||||
|
||||
This patch fixes it by copying an extended attribute which stores the access
|
||||
control list. (Python does not have an interface for handling the access
|
||||
control lists.)
|
||||
|
||||
Resolve: #2279
|
||||
Resolve: https://redhat.atlassian.net/browse/RHEL-123670
|
||||
---
|
||||
dnf/logging.py | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnf/logging.py b/dnf/logging.py
|
||||
index ef0b25f33..7dc655932 100644
|
||||
--- a/dnf/logging.py
|
||||
+++ b/dnf/logging.py
|
||||
@@ -125,10 +125,19 @@ class MultiprocessRotatingFileHandler(logging.handlers.RotatingFileHandler):
|
||||
try:
|
||||
if self.shouldRollover(record):
|
||||
with self.rotate_lock:
|
||||
- # Do rollover while preserving the mode of the new log file
|
||||
+ # Do rollover while preserving the mode and ACL of the new log file
|
||||
mode = os.stat(self.baseFilename).st_mode
|
||||
+ acl = None
|
||||
+ try:
|
||||
+ acl = os.getxattr(self.baseFilename, "system.posix_acl_access")
|
||||
+ except:
|
||||
+ # The extended attribute does not exist or the
|
||||
+ # file system does not support them.
|
||||
+ pass
|
||||
self.doRollover()
|
||||
os.chmod(self.baseFilename, mode)
|
||||
+ if acl is not None:
|
||||
+ os.setxattr(self.baseFilename, "system.posix_acl_access", acl)
|
||||
logging.FileHandler.emit(self, record)
|
||||
return
|
||||
except (dnf.exceptions.ProcessLockError, dnf.exceptions.ThreadLockError):
|
||||
--
|
||||
2.53.0
|
||||
|
||||
8
dnf.spec
8
dnf.spec
@ -72,7 +72,7 @@ It supports RPMs, modules and comps groups & environments.
|
||||
|
||||
Name: dnf
|
||||
Version: 4.20.0
|
||||
Release: 22%{?dist}.alma.1
|
||||
Release: 23%{?dist}.alma.1
|
||||
Summary: %{pkg_summary}
|
||||
# For a breakdown of the licensing, see PACKAGE-LICENSING
|
||||
License: GPL-2.0-or-later AND GPL-1.0-only
|
||||
@ -119,6 +119,7 @@ Patch38: 0038-rpmkeys-Ignore-untrusted-signatures-if-there-is-trus.patch
|
||||
Patch39: 0039-autoremove-warn-and-skip-dangling-protected-dependen.patch
|
||||
Patch40: 0040-bootc-unlock-only-if-usr-is-read-only.patch
|
||||
Patch41: 0041-bootc-Call-make_writable-when-DeploymentUnlockedStat.patch
|
||||
Patch42: 0042-Preserve-ACL-when-rotating-logs.patch
|
||||
|
||||
# AlmaLinux Patch
|
||||
Patch1001: 0001-Add-link-to-AlmaLinux-bugtracker.patch
|
||||
@ -484,10 +485,13 @@ popd
|
||||
# bootc subpackage does not include any files
|
||||
|
||||
%changelog
|
||||
* Fri Mar 27 2026 Eduard Abdullin <eabdullin@almalinux.org> - 4.20.0-22.alma.1
|
||||
* Wed Apr 01 2026 Eduard Abdullin <eabdullin@almalinux.org> - 4.20.0-23.alma.1
|
||||
- Add x86_64_v2 to _BASEARCH_MAP
|
||||
- Add link to AlmaLinux bugtracker
|
||||
|
||||
* Wed Mar 25 2026 Petr Pisar <ppisar@redhat.com> - 4.20.0-23
|
||||
- Preserve ACL when rotating logs (RHEL-123670)
|
||||
|
||||
* Wed Mar 25 2026 Evan Goode <egoode@redhat.com> - 4.20.0-22
|
||||
- bootc: unlock only if /usr is read-only (RHEL-145780)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user