import UBI dnf-plugins-core-4.3.0-13.el9

This commit is contained in:
eabdullin 2024-04-30 15:56:04 +00:00
parent bca22ae3ae
commit c1a6132b0c
4 changed files with 152 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 824aee8b6ace0df2fedc2cbee1dff4a0c0bc51b1 Mon Sep 17 00:00:00 2001
From: Marek Blaha <mblaha@redhat.com>
Date: Fri, 22 Sep 2023 08:36:59 +0200
Subject: [PATCH] RHEL-6394: Fix incorrect spanish translation file
Resolves: https://issues.redhat.com/browse/RHEL-6394
---
po/es.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/es.po b/po/es.po
index c0268e5..ae4ad0a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -150,7 +150,7 @@ msgstr "Registros de cambios para {}"
#: plugins/config_manager.py:38
#, python-brace-format
msgid "manage {prog} configuration options and repositories"
-msgstr "Dirige {*prog} opciones de configuración y repositorios"
+msgstr "Dirige {prog} opciones de configuración y repositorios"
#: plugins/config_manager.py:45
msgid "repo to modify"
--
libgit2 1.6.4

View File

@ -0,0 +1,75 @@
From a8f5a8e7a33e39c393fb94cc47f65d46907b4261 Mon Sep 17 00:00:00 2001
From: Andy Baugh <thomas.baugh@cpanel.net>
Date: Tue, 6 Jun 2023 16:37:42 +0000
Subject: [PATCH] Fix for strange issue with binary garbage in smaps files
= changelog =
msg: Avoid issue with garbage smaps chars in needs-restarting.py
type: bugfix
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2212953
related: None
---
plugins/needs_restarting.py | 2 +-
tests/test_needs_restarting.py | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/plugins/needs_restarting.py b/plugins/needs_restarting.py
index 8dbc965..baadde0 100644
--- a/plugins/needs_restarting.py
+++ b/plugins/needs_restarting.py
@@ -74,7 +74,7 @@ def list_opened_files(uid):
try:
if uid is not None and uid != owner_uid(smaps):
continue
- with open(smaps, 'r') as smaps_file:
+ with open(smaps, 'r', errors='replace') as smaps_file:
lines = smaps_file.readlines()
except EnvironmentError:
logger.warning("Failed to read PID %d's smaps.", pid)
diff --git a/tests/test_needs_restarting.py b/tests/test_needs_restarting.py
index 7b629b4..d7dd6d5 100644
--- a/tests/test_needs_restarting.py
+++ b/tests/test_needs_restarting.py
@@ -1,3 +1,4 @@
+# coding: utf-8
# Copyright (C) 2014 Red Hat, Inc.
#
# This copyrighted material is made available to anyone wishing to use,
@@ -15,15 +16,15 @@
# Red Hat, Inc.
#
-
from __future__ import absolute_import
from __future__ import print_function
from __future__ import unicode_literals
from unittest.mock import patch, Mock
import dbus
import needs_restarting
import tests.support
+import tempfile
DEL_FILE = '3dcf000000-3dcf032000 r-xp 00000000 08:02 140759 ' \
' /usr/lib64/libXfont.so.1.4.1;5408628d (deleted)'
@@ -58,6 +59,17 @@ class NeedsRestartingTest(tests.support.TestCase):
patch( "dbus.bus.BusConnection.__new__", side_effect=dbus.DBusException("Never should hit this exception if mock above works")):
self.assertIsNone(func(1234))
+ def test_list_opened_files_garbage_filename(self):
+ tempObj = tempfile.NamedTemporaryFile()
+ tempFile = tempObj.name
+ with open(tempFile, 'wb') as bogusFile:
+ bogusFile.write(b'151e7f7b7000-151e7f7b8000 r--p 00006000 fd:01 14744 /usr/lib64/lib\xe5Evil-13.37.so')
+ smaps = [[1234,tempObj.name]]
+ with patch("needs_restarting.list_smaps", return_value=smaps):
+ ofiles = list(needs_restarting.list_opened_files(None));
+ self.assertEqual(ofiles[0].presumed_name, '/usr/lib64/lib<69>Evil-13.37.so')
+
+
class OpenedFileTest(tests.support.TestCase):
def test_presumed_name(self):
ofile = needs_restarting.OpenedFile(
--
libgit2 1.6.4

View File

@ -0,0 +1,40 @@
From b4b3affd654f53d5f1a808e1ed7ea004fe875f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 23 Nov 2023 16:26:06 +0100
Subject: [PATCH] needs-restarting: Add microcode_ctl to a reboot list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
commit 9f46488c6b1ac553989a3fd8a9ea18271451c5e8 upstream.
To fully update CPU microcode, a reboot is needed because the
microcode update should be applied before starting a kernel and other
process.
Therefore recommend a reboot after installing or updating
microcode_ctl package.
https://issues.redhat.com/browse/RHEL-4600
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
plugins/needs_restarting.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/plugins/needs_restarting.py b/plugins/needs_restarting.py
index baadde0..309a216 100644
--- a/plugins/needs_restarting.py
+++ b/plugins/needs_restarting.py
@@ -40,7 +40,8 @@ import time
# For which package updates we should recommend a reboot
# Mostly taken from https://access.redhat.com/solutions/27943
NEED_REBOOT = ['kernel', 'kernel-rt', 'glibc', 'linux-firmware',
- 'systemd', 'dbus', 'dbus-broker', 'dbus-daemon']
+ 'systemd', 'dbus', 'dbus-broker', 'dbus-daemon',
+ 'microcode_ctl']
def get_options_from_dir(filepath, base):
"""
--
2.43.0

View File

@ -34,7 +34,7 @@
Name: dnf-plugins-core
Version: 4.3.0
Release: 11%{?dist}
Release: 13%{?dist}
Summary: Core Plugins for DNF
License: GPLv2+
URL: https://github.com/rpm-software-management/dnf-plugins-core
@ -50,6 +50,9 @@ Patch8: 0008-Doc-update-for-reposync-RhBug-2132383-2182004.patch
Patch9: 0009-Add-fix-and-test-assertion-for-no-systemd-unit-exist.patch
Patch10: 0010-sys-upgrade_Wait_until_upgrade_done_before_poweoff.patch
Patch11: 0011-Update-translations-RHEL-9.3.patch
Patch12: 0012-RHEL-6394-Fix-incorrect-spanish-translation-file.patch
Patch13: 0013-Fix-for-issue-with-binary-garbage-in-smaps-files.patch
Patch14: 0014-needs-restarting-Add-microcode_ctl-to-a-reboot-list.patch
BuildArch: noarch
BuildRequires: cmake
@ -797,6 +800,13 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
%endif
%changelog
* Mon Jan 15 2024 Petr Pisar <ppisar@redhat.com> - 4.3.0-13
- Add microcode_ctl to a reboot list (RHEL-4600)
* Wed Oct 25 2023 Jaroslav Rohel <jrohel@redhat.com> - 4.3.0-12
- Fix incorrect spanish translation file (RHEL-6394)
- Fix for strange issue with binary garbage in smaps files (RHEL-6420, RhBug:2231923)
* Fri Sep 08 2023 Marek Blaha <mblaha@redhat.com> - 4.3.0-11
- Rebuild in correct target