forked from rpms/dnf-plugins-core
import UBI dnf-plugins-core-4.0.21-25.el8
This commit is contained in:
parent
bdaa80f344
commit
f9f0130c81
@ -0,0 +1,75 @@
|
||||
From 1a29f3ab2f4719f40510dc08f12f4795ad358e93 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 3197fe1..64d4d0f 100644
|
||||
--- a/plugins/needs_restarting.py
|
||||
+++ b/plugins/needs_restarting.py
|
||||
@@ -76,7 +76,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
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
From e1af3642a7811229567284f6901d393a6ce28b62 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-17356
|
||||
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 64d4d0f..92cde0a 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']
|
||||
|
||||
NEED_REBOOT_DEPENDS_ON_DBUS = ['zlib']
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
Name: dnf-plugins-core
|
||||
Version: 4.0.21
|
||||
Release: 23%{?dist}
|
||||
Release: 25%{?dist}
|
||||
Summary: Core Plugins for DNF
|
||||
License: GPLv2+
|
||||
URL: https://github.com/rpm-software-management/dnf-plugins-core
|
||||
@ -73,6 +73,8 @@ Patch31: 0031-Fix-boot-time-derivation-for-systems-with-no-rtc.patch
|
||||
Patch32: 0032-Doc-update-for-reposync-RhBug-2132383-2182004.patch
|
||||
Patch33: 0033-Add-fix-and-test-assertion-for-no-systemd-unit-exist.patch
|
||||
Patch34: 0034-Fix-zlib-reboot-requirement-RhBug-2092033.patch
|
||||
Patch35: 0035-Fix-for-issue-with-binary-garbage-in-smaps-files.patch
|
||||
Patch36: 0036-needs-restarting-Add-microcode_ctl-to-a-reboot-list.patch
|
||||
|
||||
|
||||
BuildArch: noarch
|
||||
@ -849,6 +851,12 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 15 2024 Petr Pisar <ppisar@redhat.com> - 4.0.21-25
|
||||
- Add microcode_ctl to a reboot list (RHEL-17356)
|
||||
|
||||
* Mon Oct 16 2023 Jaroslav Rohel <jrohel@redhat.com> - 4.0.21-24
|
||||
- Fix for strange issue with binary garbage in smaps files (RHEL-6392, RhBug:2212953)
|
||||
|
||||
* Tue Jun 27 2023 Jaroslav Rohel <jrohel@redhat.com> - 4.0.21-23
|
||||
- Add patch: Fix zlib reboot requirement (RhBug:2092033)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user