- bundled pkg_resources: suppress UserWarning

Resolves: RHEL-95901
This commit is contained in:
Oyvind Albrigtsen 2025-06-12 12:18:28 +02:00
parent fbc76281c2
commit dea3c5bc1c
2 changed files with 42 additions and 2 deletions

View File

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

View File

@ -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 <oalbrigt@redhat.com> - 4.10.0-94
* Thu Jun 12 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-95
- fence_kubevirt: use hard poweroff
Resolves: RHEL-82193
- bundled setuptools: fix CVE-2025-47273