From dea3c5bc1c3de41a37cf6081b45569992fd478bc Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Thu, 12 Jun 2025 12:18:28 +0200 Subject: [PATCH] - bundled pkg_resources: suppress UserWarning Resolves: RHEL-95901 --- ...1-pkg_resources-suppress-UserWarning.patch | 38 +++++++++++++++++++ fence-agents.spec | 6 ++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 RHEL-95901-pkg_resources-suppress-UserWarning.patch diff --git a/RHEL-95901-pkg_resources-suppress-UserWarning.patch b/RHEL-95901-pkg_resources-suppress-UserWarning.patch new file mode 100644 index 0000000..d1972fd --- /dev/null +++ b/RHEL-95901-pkg_resources-suppress-UserWarning.patch @@ -0,0 +1,38 @@ +--- a/google/pkg_resources/__init__.py 2025-06-12 09:41:54.535219946 +0000 ++++ b/google/pkg_resources/__init__.py 2025-06-12 09:42:07.508276281 +0000 +@@ -95,16 +95,6 @@ + from _typeshed.importlib import LoaderProtocol + from typing_extensions import Self, TypeAlias + +-warnings.warn( +- "pkg_resources is deprecated as an API. " +- "See https://setuptools.pypa.io/en/latest/pkg_resources.html. " +- "The pkg_resources package is slated for removal as early as " +- "2025-11-30. Refrain from using this package or pin to " +- "Setuptools<81.", +- UserWarning, +- stacklevel=2, +-) +- + _T = TypeVar("_T") + _DistributionT = TypeVar("_DistributionT", bound="Distribution") + # Type aliases +--- a/kubevirt/pkg_resources/__init__.py 2025-06-12 09:41:54.535219946 +0000 ++++ b/kubevirt/pkg_resources/__init__.py 2025-06-12 09:42:07.508276281 +0000 +@@ -95,16 +95,6 @@ + from _typeshed.importlib import LoaderProtocol + from typing_extensions import Self, TypeAlias + +-warnings.warn( +- "pkg_resources is deprecated as an API. " +- "See https://setuptools.pypa.io/en/latest/pkg_resources.html. " +- "The pkg_resources package is slated for removal as early as " +- "2025-11-30. Refrain from using this package or pin to " +- "Setuptools<81.", +- UserWarning, +- stacklevel=2, +-) +- + _T = TypeVar("_T") + _DistributionT = TypeVar("_DistributionT", bound="Distribution") + # Type aliases diff --git a/fence-agents.spec b/fence-agents.spec index 6449382..8436453 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -57,7 +57,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 94%{?alphatag:.%{alphatag}}%{?dist} +Release: 95%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -260,6 +260,7 @@ Patch1000: bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch # cloud (x86_64 only) Patch2000: bz2217902-2-aws-azure-fix-bundled-dateutil-CVE-2007-4559.patch Patch2001: RHEL-43562-fix-bundled-urllib3-CVE-2024-37891.patch +Patch2002: RHEL-95901-pkg_resources-suppress-UserWarning.patch %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath nutanix_ahv redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti %ifarch x86_64 @@ -503,6 +504,7 @@ pushd support %ifarch x86_64 /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH2000} /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH2001} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH2002} %endif popd @@ -1563,7 +1565,7 @@ are located on corosync cluster nodes. %endif %changelog -* Wed Jun 11 2025 Oyvind Albrigtsen - 4.10.0-94 +* Thu Jun 12 2025 Oyvind Albrigtsen - 4.10.0-95 - fence_kubevirt: use hard poweroff Resolves: RHEL-82193 - bundled setuptools: fix CVE-2025-47273