import OL fence-agents-4.10.0-62.el9_4.5

.fence-agents.metadata

@@ -30,6 +30,7 @@ a8ee91adf4644bbdccfc73ead88f4cd0df7e3552 SOURCES/colorama-0.3.3.tar.gz
 4b50bebad4c5036c030a78cbb869d039bc91c4ec SOURCES/distro-1.5.0-py2.py3-none-any.whl
 aafeddc912b74557754b2aaece3f1364be8e9f6a SOURCES/docutils-0.15.2-py3-none-any.whl
 1ec823f807b73a377cdd47d12e2e34f046bfc889 SOURCES/fence-agents-4.10.0.tar.gz
+05d6d7a3df5bdbd9df1b37a65662e5dbe94f23fd SOURCES/flit_core-3.9.0.tar.gz
 f4e578dc0ed68d6667d7b36cdfc2647d55e9858f SOURCES/google-auth-2.3.0.tar.gz
 ac160113ba8b78b0688edda9f9a088c0b4b5ded2 SOURCES/google_api_core-1.30.0-py2.py3-none-any.whl
 4fd1eb2b927767158e91e369de441fd9221a82d9 SOURCES/google_api_python_client-1.12.8-py2.py3-none-any.whl
@@ -86,13 +87,13 @@ abf532a0cc31ea224e3895f60025e7466b16d7ae SOURCES/ruamel.yaml-0.15.100.tar.gz
 d1011ff44cd5a045de0460c1b79ec65592e86860 SOURCES/ruamel.yaml-0.17.16.tar.gz
 27de97227bbbde5a9f571f9fad223578d7bdf7cc SOURCES/ruamel.yaml.clib-0.2.6.tar.gz
 d7eb0ced8b9f12005ad6f13035689d5611f8a81a SOURCES/s3transfer-0.4.2-py2.py3-none-any.whl
-0b0fcb339be89ae1b6360dbfb2be2075ae9f84c9 SOURCES/setuptools-57.0.0-py3-none-any.whl
+54a0d57b77b6030aaca8992282189f4b7b627bc0 SOURCES/setuptools-71.1.0.tar.gz
-d5354718cb8c9330d3abc27445467ce8a5ed9d70 SOURCES/setuptools-58.3.0.tar.gz
+749fa3bff5be78c80ac6d6d313c38c73d679542c SOURCES/setuptools_scm-8.1.0.tar.gz
-a4f02fddae697614e356cadfddb6241cc7737f38 SOURCES/setuptools_scm-6.3.2.tar.gz
 79e6f2e4f9e24898f1896df379871b9c9922f147 SOURCES/six-1.16.0-py2.py3-none-any.whl
 06fa0bb50f2a4e2917fd14c21e9d2d5508ce0163 SOURCES/six-1.16.0.tar.gz
 47a980b20875d1a1714e921552b5bb0eda190f37 SOURCES/suds_community-0.8.5-py3-none-any.whl
-b42b7960047441db7dc021cc20e14279bd836f8d SOURCES/tomli-1.0.1.tar.gz
+3eae299137c59d6d6d30be01417366c57dd1adf5 SOURCES/tomli-2.0.1.tar.gz
+1389615a3f0bd216e7db4440985d51fb3f2ea2c6 SOURCES/typing_extensions-4.12.2.tar.gz
 83be56610e5f824bb05ff7a5618d6d4df9b6cc08 SOURCES/uritemplate-3.0.1-py2.py3-none-any.whl
 84e2852d8da1655373f7ce5e7d5d3e256b62b4e4 SOURCES/urllib3-1.26.18.tar.gz
 7126323614cada181bc8b06436e80ef372ff8656 SOURCES/wcwidth-0.1.9-py2.py3-none-any.whl

.gitignore

@@ -30,6 +30,7 @@ SOURCES/cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl
 SOURCES/distro-1.5.0-py2.py3-none-any.whl
 SOURCES/docutils-0.15.2-py3-none-any.whl
 SOURCES/fence-agents-4.10.0.tar.gz
+SOURCES/flit_core-3.9.0.tar.gz
 SOURCES/google-auth-2.3.0.tar.gz
 SOURCES/google_api_core-1.30.0-py2.py3-none-any.whl
 SOURCES/google_api_python_client-1.12.8-py2.py3-none-any.whl
@@ -86,13 +87,13 @@ SOURCES/ruamel.yaml-0.15.100.tar.gz
 SOURCES/ruamel.yaml-0.17.16.tar.gz
 SOURCES/ruamel.yaml.clib-0.2.6.tar.gz
 SOURCES/s3transfer-0.4.2-py2.py3-none-any.whl
-SOURCES/setuptools-57.0.0-py3-none-any.whl
+SOURCES/setuptools-71.1.0.tar.gz
-SOURCES/setuptools-58.3.0.tar.gz
+SOURCES/setuptools_scm-8.1.0.tar.gz
-SOURCES/setuptools_scm-6.3.2.tar.gz
 SOURCES/six-1.16.0-py2.py3-none-any.whl
 SOURCES/six-1.16.0.tar.gz
 SOURCES/suds_community-0.8.5-py3-none-any.whl
-SOURCES/tomli-1.0.1.tar.gz
+SOURCES/tomli-2.0.1.tar.gz
+SOURCES/typing_extensions-4.12.2.tar.gz
 SOURCES/uritemplate-3.0.1-py2.py3-none-any.whl
 SOURCES/urllib3-1.26.18.tar.gz
 SOURCES/wcwidth-0.1.9-py2.py3-none-any.whl

SOURCES/RHEL-43956-fix-bundled-urllib3-CVE-2024-37891.patch

@@ -0,0 +1,96 @@
+From accff72ecc2f6cf5a76d9570198a93ac7c90270e Mon Sep 17 00:00:00 2001
+From: Quentin Pradet <quentin.pradet@gmail.com>
+Date: Mon, 17 Jun 2024 11:09:06 +0400
+Subject: [PATCH] Merge pull request from GHSA-34jh-p97f-mpxf
+
+* Strip Proxy-Authorization header on redirects
+
+* Fix test_retry_default_remove_headers_on_redirect
+
+* Set release date
+---
+ CHANGES.rst                               |  5 +++++
+ src/urllib3/util/retry.py                 |  4 +++-
+ test/test_retry.py                        |  6 ++++-
+ test/with_dummyserver/test_poolmanager.py | 27 ++++++++++++++++++++---
+ 4 files changed, 37 insertions(+), 5 deletions(-)
+
+diff --git a/awscli/urllib3/util/retry.py b/awscli/urllib3/util/retry.py
+index 7a76a4a6ad..0456cceba4 100644
+--- a/awscli/urllib3/util/retry.py
++++ b/awscli/urllib3/util/retry.py
+@@ -189,7 +189,9 @@ class Retry:
+     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
+ 
+     #: Default headers to be used for ``remove_headers_on_redirect``
+-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
++    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
++        ["Cookie", "Authorization", "Proxy-Authorization"]
++    )
+ 
+     #: Default maximum backoff time.
+     DEFAULT_BACKOFF_MAX = 120
+
+diff --git a/aws/urllib3/util/retry.py b/aws/urllib3/util/retry.py
+index 7a76a4a6ad..0456cceba4 100644
+--- a/aws/urllib3/util/retry.py
++++ b/aws/urllib3/util/retry.py
+@@ -189,7 +189,9 @@ class Retry:
+     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
+ 
+     #: Default headers to be used for ``remove_headers_on_redirect``
+-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
++    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
++        ["Cookie", "Authorization", "Proxy-Authorization"]
++    )
+ 
+     #: Default maximum backoff time.
+     DEFAULT_BACKOFF_MAX = 120
+
+diff --git a/azure/urllib3/util/retry.py b/azure/urllib3/util/retry.py
+index 7a76a4a6ad..0456cceba4 100644
+--- a/azure/urllib3/util/retry.py
++++ b/azure/urllib3/util/retry.py
+@@ -189,7 +189,9 @@ class Retry:
+     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
+ 
+     #: Default headers to be used for ``remove_headers_on_redirect``
+-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
++    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
++        ["Cookie", "Authorization", "Proxy-Authorization"]
++    )
+ 
+     #: Default maximum backoff time.
+     DEFAULT_BACKOFF_MAX = 120
+
+diff --git a/google/urllib3/util/retry.py b/google/urllib3/util/retry.py
+index 7a76a4a6ad..0456cceba4 100644
+--- a/google/urllib3/util/retry.py
++++ b/google/urllib3/util/retry.py
+@@ -189,7 +189,9 @@ class Retry:
+     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
+ 
+     #: Default headers to be used for ``remove_headers_on_redirect``
+-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
++    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
++        ["Cookie", "Authorization", "Proxy-Authorization"]
++    )
+ 
+     #: Default maximum backoff time.
+     DEFAULT_BACKOFF_MAX = 120
+
+diff --git a/kubevirt/urllib3/util/retry.py b/kubevirt/urllib3/util/retry.py
+index 7a76a4a6ad..0456cceba4 100644
+--- a/kubevirt/urllib3/util/retry.py
++++ b/kubevirt/urllib3/util/retry.py
+@@ -189,7 +189,9 @@ class Retry:
+     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
+ 
+     #: Default headers to be used for ``remove_headers_on_redirect``
+-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
++    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
++        ["Cookie", "Authorization", "Proxy-Authorization"]
++    )
+ 
+     #: Default maximum backoff time.
+     DEFAULT_BACKOFF_MAX = 120

SPECS/fence-agents.spec

@@ -53,13 +53,11 @@
 %global reqstsoauthlib_version	1.3.0
 %global ruamelyaml		ruamel.yaml
 %global ruamelyaml_version	0.17.16
-%global setuptools		setuptools
-%global setuptools_version	58.3.0
 
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.10.0
-Release: 62%{?alphatag:.%{alphatag}}%{?dist}.3
+Release: 62%{?alphatag:.%{alphatag}}%{?dist}.5
 License: GPLv2+ and LGPLv2+
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@@ -145,7 +143,7 @@ Source1060: pyroute2.nftables-0.6.13.tar.gz
 Source1061: pyroute2.nslink-0.6.13.tar.gz
 Source1062: pytz-2021.1-py2.py3-none-any.whl
 Source1063: rsa-4.7.2-py3-none-any.whl
-Source1064: setuptools-57.0.0-py3-none-any.whl
+Source1064: setuptools-71.1.0.tar.gz
 Source1065: uritemplate-3.0.1-py2.py3-none-any.whl
 # common (pexpect / suds)
 Source1066: pexpect-4.8.0-py2.py3-none-any.whl
@@ -178,14 +176,15 @@ Source1086: %{chrstnormalizer}-%{chrstnormalizer_version}.tar.gz
 Source1087: %{idna}-%{idna_version}.tar.gz
 Source1088: %{reqstsoauthlib}-%{reqstsoauthlib_version}.tar.gz
 Source1089: %{ruamelyaml}-%{ruamelyaml_version}.tar.gz
-Source1090: %{setuptools}-%{setuptools_version}.tar.gz
 ## required for installation
-Source1091: setuptools_scm-6.3.2.tar.gz
+Source1090: setuptools_scm-8.1.0.tar.gz
-Source1092: packaging-21.2-py3-none-any.whl
+Source1091: packaging-21.2-py3-none-any.whl
-Source1093: poetry-core-1.0.7.tar.gz
+Source1092: poetry-core-1.0.7.tar.gz
-Source1094: pyparsing-3.0.1.tar.gz
+Source1093: pyparsing-3.0.1.tar.gz
-Source1095: tomli-1.0.1.tar.gz
+Source1094: tomli-2.0.1.tar.gz
-Source1096: wheel-0.37.0-py2.py3-none-any.whl
+Source1095: flit_core-3.9.0.tar.gz
+Source1096: typing_extensions-4.12.2.tar.gz
+Source1097: wheel-0.37.0-py2.py3-none-any.whl
 ### END
 
 Patch0: ha-cloud-support-aliyun.patch
@@ -249,6 +248,7 @@ Patch1000: bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch
 Patch1001: RHEL-36482-kubevirt-fix-bundled-jinja2-CVE-2024-34064.patch
 # cloud (x86_64 only)
 Patch2000: bz2217902-2-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch
+Patch2001: RHEL-43956-fix-bundled-urllib3-CVE-2024-37891.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 redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
 %ifarch x86_64
@@ -450,11 +450,12 @@ rm -rf kubevirt/rsa*
 
 # regular patch doesnt work in build-section
 pushd support
-/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1000}
+/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH1000}
 /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1001}
 
 %ifarch x86_64
-/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH2000}
+/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH2000}
+/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH2001}
 %endif
 popd
 
@@ -647,7 +648,7 @@ Provides: bundled(python-pyroute2-nftables) = 0.6.13
 Provides: bundled(python-pyroute2-nslink) = 0.6.13
 Provides: bundled(python-pytz) = 2021.1
 Provides: bundled(python-rsa) = 4.7.2
-Provides: bundled(python-setuptools) = 57.0.0
+Provides: bundled(python3-setuptools) = 71.1.0
 Provides: bundled(python-uritemplate) = 3.0.1
 %description -n ha-cloud-support
 Support libraries for Fence Agents.
@@ -1184,7 +1185,7 @@ Provides: bundled(python3-%{idna}) = %{idna_version}
 Provides: bundled(python3-%{reqstsoauthlib}) = %{reqstsoauthlib_version}
 Provides: bundled(python3-%{oauthlib}) = %{oauthlib_version}
 Provides: bundled(python3-%{ruamelyaml}) = %{ruamelyaml_version}
-Provides: bundled(python3-%{setuptools}) = %{setuptools_version}
+Provides: bundled(python3-setuptools) = 71.1.0
 %description kubevirt
 Fence agent for KubeVirt platform.
 %files kubevirt
@@ -1490,6 +1491,15 @@ are located on corosync cluster nodes.
 %endif
 
 %changelog
+* Mon Aug 19 2024 Diaa Sami <disami@redhat.com> - 4.10.0-62.5
+- bundled setuptools: fix CVE-2024-6345
+
+  Resolves: RHEL-49657
+
+* Mon Jun 24 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-62.4
+- bundled urllib3: fix CVE-2024-37891
+  Resolves: RHEL-43956
+
 * Thu May 16 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-62.3
 - bundled jinja2: fix CVE-2024-34064
   Resolves: RHEL-36482