diff --git a/download b/download index 36347074dbd216b05d4446225cde858874970865..c2993cc03a5e2bf2842942e21688b1f64ba4f17a 100644 --- a/download +++ b/download @@ -5,6 +5,7 @@ c64f38a505b122a2ecf2b7d93c0ec4b7 cachetools-4.2.4.tar.gz b28e4463613ff3911d5a2dc62b96233f charset-normalizer-2.0.7.tar.gz a56b8dc55158a41ab3c89c4c8feb8824 colorama-0.3.3.tar.gz 62655d4b45872572f243d0eb7e9dd1f9 fence-agents-4.10.0.tar.gz +3bc52f1952b9a78361114147da63c35b flit_core-3.9.0.tar.gz a61b1015a213f1a9cf27252fbac579ee google-auth-2.3.0.tar.gz 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz a66396e3080a68928ff98276d6809138 Jinja2-3.1.3.tar.gz @@ -36,9 +37,10 @@ c21701cdd75c170f8d690f704a362c44 rsa-4.7.2.tar.gz dd811a8f09dc0e622ad19a42508da7c1 ruamel.yaml-0.15.100.tar.gz ef2af87b5f265163700b12165a541406 ruamel.yaml-0.17.16.tar.gz e2397bedcd1f40b2f22b3696175082aa ruamel.yaml.clib-0.2.6.tar.gz -7a2c32ef46b0f91acc8c2756af56a711 setuptools-58.3.0.tar.gz -32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz +2d7f698adca86005a771f8709686d5e4 setuptools-71.1.0.tar.gz +d8046dce093a94dc382b68b45f6a6257 setuptools_scm-8.1.0.tar.gz a7c927740e4964dd29b72cebfc1429bb six-1.16.0.tar.gz -36fd182000c721cf495d4dc673a6f9e9 tomli-1.0.1.tar.gz +d4341621d423a7ca6822e23d6d52bb9a tomli-2.0.1.tar.gz +cf64c2313f5fa5eb04c1deb3fc93abe9 typing_extensions-4.12.2.tar.gz f986d8e9616d2a43389f678d5dad9893 urllib3-1.26.18.tar.gz a043b9a04dc10a7c9f333cf55f6222df websocket-client-1.2.1.tar.gz diff --git a/fence-agents.spec b/fence-agents.spec index c4b690f17987be1be71b8b9eb7350426dce901ac..adf3a96c481c4319b7b236aa927e32a3de99eb60 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -54,13 +54,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}}%{anolis_release}%{?dist}.4 +Release: 62%{?alphatag:.%{alphatag}}%{anolis_release}%{?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 @@ -146,7 +144,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,24 +176,25 @@ 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 -Source1092: packaging-21.2-py3-none-any.whl -Source1093: poetry-core-1.0.7.tar.gz -Source1094: pyparsing-3.0.1.tar.gz -Source1095: tomli-1.0.1.tar.gz -Source1096: wheel-0.37.0-py2.py3-none-any.whl +Source1090: setuptools_scm-8.1.0.tar.gz +Source1091: packaging-21.2-py3-none-any.whl +Source1092: poetry-core-1.0.7.tar.gz +Source1093: pyparsing-3.0.1.tar.gz +Source1094: tomli-2.0.1.tar.gz +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 Source2000: pycryptodome-3.10.1.tar.gz Source2001: cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl Source2002: awscrt-0.11.13-cp36-cp36m-manylinux1_x86_64.whl -Source2003: cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl +Source2003: cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl Source2004: urllib3-1.24.3-py2.py3-none-any.whl -Source2005: importlib_metadata-4.8.1-py3-none-any.whl +Source2005: importlib_metadata-4.8.1-py3-none-any.whl Source2006: protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl Source2007: zipp-3.5.0-py3-none-any.whl Source2008: typing_extensions-3.10.0.2-py3-none-any.whl -Source2009: importlib_resources-5.2.2-py3-none-any.whl +Source2009: importlib_resources-5.2.2-py3-none-any.whl Source2010: MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl ### END @@ -464,11 +463,11 @@ 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 @@ -662,7 +661,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. @@ -1199,7 +1198,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 @@ -1505,11 +1504,16 @@ are located on corosync cluster nodes. %endif %changelog -* Wed Sep 11 2024 Chang Gao - 4.10.0-62.0.1.4 +* Thu Sep 19 2024 Chang Gao - 4.10.0-62.0.1.5 - Replace some packages with build env - Update CVE-2007-4559 patches - Change Jinja2 require python version +* Mon Aug 19 2024 Diaa Sami - 4.10.0-62.5 +- bundled setuptools: fix CVE-2024-6345 + + Resolves: RHEL-49657 + * Mon Jun 24 2024 Oyvind Albrigtsen - 4.10.0-62.4 - bundled urllib3: fix CVE-2024-37891 Resolves: RHEL-43956 diff --git a/setuptools-57.0.0-py3-none-any.whl b/setuptools-57.0.0-py3-none-any.whl deleted file mode 100644 index f704306d4566efdd0cc6a62d45659d15672989f9..0000000000000000000000000000000000000000 Binary files a/setuptools-57.0.0-py3-none-any.whl and /dev/null differ