diff --git a/bz2217902-2-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch b/bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch similarity index 100% rename from bz2217902-2-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch rename to bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch diff --git a/bz2217902-1-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch b/bz2217902-2-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch similarity index 100% rename from bz2217902-1-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch rename to bz2217902-2-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch diff --git a/certifi-2021.5.30-py2.py3-none-any.whl b/certifi-2021.5.30-py2.py3-none-any.whl deleted file mode 100644 index 39a1d3e7bd450194a216f1873331ff07dc38d236..0000000000000000000000000000000000000000 Binary files a/certifi-2021.5.30-py2.py3-none-any.whl and /dev/null differ diff --git a/dist b/dist index 89c1faffc18349bb12eee2371e9dc43bf419b95c..0b1f29d1996a6e51bc20a44b790adcb166a234f4 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9 +an9_3 diff --git a/download b/download index 2e0017294ef5f97982e36142a7639202a6c08d39..b2ce16bfa6e9b71f49f979c81887a300f05ed67b 100644 --- a/download +++ b/download @@ -1,13 +1,13 @@ 832fbc4db8822fcb0099edb7158ddf81 aliyun-python-sdk-core-2.11.5.tar.gz 7c2d43fbfb0faeddec259a7f26adb8dc awscli-2.2.15.tar.gz c64f38a505b122a2ecf2b7d93c0ec4b7 cachetools-4.2.4.tar.gz -880ed9e5d04aff8f46f5ff82a3a3e395 certifi-2021.10.8.tar.gz +10a72845d3fc2c38d212b4b7b1872c76 certifi-2023.7.22.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 a61b1015a213f1a9cf27252fbac579ee google-auth-2.3.0.tar.gz 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz -059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz +caf5418c851eac59e70a78d9730d4cea Jinja2-3.1.3.tar.gz d44bf469fcc16312e12fe8548cb177ee kubernetes-12.0.1.tar.gz 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz e46e2af1ad29245ddbd93972770f528b msal-1.18.0.tar.gz @@ -18,6 +18,7 @@ e46e2af1ad29245ddbd93972770f528b msal-1.18.0.tar.gz 3c4c381a4cecfd21f9f3259b7617efeb portalocker-2.5.1.tar.gz dffae4ff9f997a83324b3f33fe62be54 pyasn1-0.4.8.tar.gz 107e1ece7d0a41d782f69f8a95a4d9bc pyasn1-modules-0.2.8.tar.gz +7d60468c87fbdb1928aa4d8551c4fed1 pycryptodome-3.20.0.tar.gz e1a8c5ecb51dd87472362ff6ce575675 pyparsing-3.0.1.tar.gz fe5b62f042e66f971e527d66beb18267 pyroute2-0.6.4.tar.gz c71887abb338291469aff2ada3384900 pyroute2.core-0.6.4.tar.gz @@ -39,5 +40,5 @@ e2397bedcd1f40b2f22b3696175082aa ruamel.yaml.clib-0.2.6.tar.gz 32918d8ac566360c21411e0b3556c695 setuptools_scm-6.3.2.tar.gz a7c927740e4964dd29b72cebfc1429bb six-1.16.0.tar.gz 36fd182000c721cf495d4dc673a6f9e9 tomli-1.0.1.tar.gz -e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.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 173b359a81c4eede3705a1a618bb4e4ca41f81e0..a6c1d1692931b11b4b49c6ede854e45b3b5ea262 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -18,8 +18,8 @@ %global ruamelyamlclib_version 0.2.6 %global kubernetes kubernetes %global kubernetes_version 12.0.1 -%global certifi certifi -%global certifi_version 2021.10.8 +%global certifi certifi +%global certifi_version 2023.7.22 %global googleauth google-auth %global googleauth_version 2.3.0 %global cachetools cachetools @@ -34,12 +34,12 @@ %global pyyaml_version 5.1 %global six six %global six_version 1.16.0 -%global urllib3 urllib3 -%global urllib3_version 1.26.7 -%global websocketclient websocket-client -%global websocketclient_version 1.2.1 +%global urllib3 urllib3 +%global urllib3_version 1.26.18 +%global websocketclient websocket-client +%global websocketclient_version 1.2.1 %global jinja2 Jinja2 -%global jinja2_version 3.0.2 +%global jinja2_version 3.1.3 %global markupsafe MarkupSafe %global markupsafe_version 2.0.1 %global stringutils string-utils @@ -60,7 +60,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 55%{?alphatag:.%{alphatag}}%{anolis_release}%{?dist} +Release: 55%{?alphatag:.%{alphatag}}%{anolis_release}%{?dist}.3 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -84,7 +84,7 @@ Source1002: aliyuncli-2.1.10-py2.py3-none-any.whl Source1003: cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl Source1004: colorama-0.3.3.tar.gz Source1005: jmespath-0.7.1-py2.py3-none-any.whl -Source1006: pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl +Source1006: pycryptodome-3.20.0.tar.gz Source1007: pycparser-2.20-py2.py3-none-any.whl # awscli Source1008: awscrt-0.11.13-cp39-cp39-manylinux2014_x86_64.whl @@ -101,7 +101,7 @@ Source1017: boto3-1.17.102-py2.py3-none-any.whl Source1018: botocore-1.20.102-py2.py3-none-any.whl Source1019: python_dateutil-2.8.1-py2.py3-none-any.whl Source1020: s3transfer-0.4.2-py2.py3-none-any.whl -Source1021: urllib3-1.26.6-py2.py3-none-any.whl +Source1021: urllib3-1.26.18.tar.gz # azure Source1022: adal-1.2.7-py2.py3-none-any.whl Source1023: azure_common-1.1.27-py2.py3-none-any.whl @@ -110,84 +110,82 @@ Source1025: azure_mgmt_compute-21.0.0-py2.py3-none-any.whl Source1026: azure_mgmt_core-1.2.2-py2.py3-none-any.whl Source1027: azure_mgmt_network-19.0.0-py2.py3-none-any.whl Source1028: azure-identity-1.10.0.zip -Source1029: certifi-2021.5.30-py2.py3-none-any.whl -Source1030: chardet-4.0.0-py2.py3-none-any.whl -Source1031: idna-2.10-py2.py3-none-any.whl -Source1032: isodate-0.6.0-py2.py3-none-any.whl -Source1033: msrest-0.6.21-py2.py3-none-any.whl -Source1034: msrestazure-0.6.4-py2.py3-none-any.whl -Source1035: %{oauthlib}-%{oauthlib_version}.tar.gz -Source1036: PyJWT-2.1.0-py3-none-any.whl -Source1037: requests-2.25.1-py2.py3-none-any.whl -Source1038: requests_oauthlib-1.3.0-py2.py3-none-any.whl -Source1139: msal-1.18.0.tar.gz -Source1140: msal-extensions-1.0.0.tar.gz -Source1141: portalocker-2.5.1.tar.gz +Source1029: chardet-4.0.0-py2.py3-none-any.whl +Source1030: idna-2.10-py2.py3-none-any.whl +Source1031: isodate-0.6.0-py2.py3-none-any.whl +Source1032: msrest-0.6.21-py2.py3-none-any.whl +Source1033: msrestazure-0.6.4-py2.py3-none-any.whl +Source1034: %{oauthlib}-%{oauthlib_version}.tar.gz +Source1035: PyJWT-2.1.0-py3-none-any.whl +Source1036: requests-2.25.1-py2.py3-none-any.whl +Source1037: requests_oauthlib-1.3.0-py2.py3-none-any.whl +Source1038: msal-1.18.0.tar.gz +Source1039: msal-extensions-1.0.0.tar.gz +Source1040: portalocker-2.5.1.tar.gz # google -Source1042: cachetools-4.2.2-py3-none-any.whl -Source1043: chardet-3.0.4-py2.py3-none-any.whl -Source1044: google_api_core-1.30.0-py2.py3-none-any.whl -Source1045: google_api_python_client-1.12.8-py2.py3-none-any.whl -Source1046: googleapis_common_protos-1.53.0-py2.py3-none-any.whl -Source1047: google_auth-1.32.0-py2.py3-none-any.whl -Source1048: google_auth_httplib2-0.1.0-py2.py3-none-any.whl -Source1049: httplib2-0.19.1-py3-none-any.whl -Source1050: packaging-20.9-py2.py3-none-any.whl -Source1051: protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl -Source1052: pyasn1-0.4.8-py2.py3-none-any.whl -Source1053: pyasn1_modules-0.2.8-py2.py3-none-any.whl -Source1054: pyparsing-2.4.7-py2.py3-none-any.whl -Source1055: pyroute2-0.6.4.tar.gz -Source1056: pyroute2.core-0.6.4.tar.gz -Source1057: pyroute2.ethtool-0.6.4.tar.gz -Source1058: pyroute2.ipdb-0.6.4.tar.gz -Source1059: pyroute2.ipset-0.6.4.tar.gz -Source1060: pyroute2.ndb-0.6.4.tar.gz -Source1061: pyroute2.nftables-0.6.4.tar.gz -Source1062: pyroute2.nslink-0.6.4.tar.gz -Source1063: pytz-2021.1-py2.py3-none-any.whl -Source1064: rsa-4.7.2-py3-none-any.whl -Source1065: setuptools-57.0.0-py3-none-any.whl -Source1066: uritemplate-3.0.1-py2.py3-none-any.whl +Source1041: cachetools-4.2.2-py3-none-any.whl +Source1042: chardet-3.0.4-py2.py3-none-any.whl +Source1043: google_api_core-1.30.0-py2.py3-none-any.whl +Source1044: google_api_python_client-1.12.8-py2.py3-none-any.whl +Source1045: googleapis_common_protos-1.53.0-py2.py3-none-any.whl +Source1046: google_auth-1.32.0-py2.py3-none-any.whl +Source1047: google_auth_httplib2-0.1.0-py2.py3-none-any.whl +Source1048: httplib2-0.19.1-py3-none-any.whl +Source1049: packaging-20.9-py2.py3-none-any.whl +Source1050: protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl +Source1051: pyasn1-0.4.8-py2.py3-none-any.whl +Source1052: pyasn1_modules-0.2.8-py2.py3-none-any.whl +Source1053: pyparsing-2.4.7-py2.py3-none-any.whl +Source1054: pyroute2-0.6.4.tar.gz +Source1055: pyroute2.core-0.6.4.tar.gz +Source1056: pyroute2.ethtool-0.6.4.tar.gz +Source1057: pyroute2.ipdb-0.6.4.tar.gz +Source1058: pyroute2.ipset-0.6.4.tar.gz +Source1059: pyroute2.ndb-0.6.4.tar.gz +Source1060: pyroute2.nftables-0.6.4.tar.gz +Source1061: pyroute2.nslink-0.6.4.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 +Source1065: uritemplate-3.0.1-py2.py3-none-any.whl # common (pexpect / suds) -Source1067: pexpect-4.8.0-py2.py3-none-any.whl -Source1068: ptyprocess-0.7.0-py2.py3-none-any.whl -Source1069: suds_community-0.8.5-py3-none-any.whl +Source1066: pexpect-4.8.0-py2.py3-none-any.whl +Source1067: ptyprocess-0.7.0-py2.py3-none-any.whl +Source1068: suds_community-0.8.5-py3-none-any.whl ### END ### # kubevirt ## pip download --no-binary :all: openshift "ruamel.yaml.clib>=0.1.2" ### BEGIN -Source1070: %{openshift}-%{openshift_version}.tar.gz -Source1071: %{ruamelyamlclib}-%{ruamelyamlclib_version}.tar.gz -Source1072: %{kubernetes}-%{kubernetes_version}.tar.gz -Source1073: %{certifi}-%{certifi_version}.tar.gz -Source1074: %{googleauth}-%{googleauth_version}.tar.gz -Source1075: %{cachetools}-%{cachetools_version}.tar.gz -Source1076: %{pyasn1modules}-%{pyasn1modules_version}.tar.gz -Source1077: %{pyasn1}-%{pyasn1_version}.tar.gz -Source1079: %{pyyaml}-%{pyyaml_version}.tar.gz +Source1069: %{openshift}-%{openshift_version}.tar.gz +Source1070: %{ruamelyamlclib}-%{ruamelyamlclib_version}.tar.gz +Source1071: %{kubernetes}-%{kubernetes_version}.tar.gz +Source1072: %{certifi}-%{certifi_version}.tar.gz +Source1073: %{googleauth}-%{googleauth_version}.tar.gz +Source1074: %{cachetools}-%{cachetools_version}.tar.gz +Source1075: %{pyasn1modules}-%{pyasn1modules_version}.tar.gz +Source1076: %{pyasn1}-%{pyasn1_version}.tar.gz +Source1078: %{pyyaml}-%{pyyaml_version}.tar.gz ## rsa is dependency for "pip install", ## but gets removed to use cryptography lib instead -Source1080: rsa-4.7.2.tar.gz -Source1081: %{six}-%{six_version}.tar.gz -Source1082: %{urllib3}-%{urllib3_version}.tar.gz -Source1083: %{websocketclient}-%{websocketclient_version}.tar.gz -Source1084: %{jinja2}-%{jinja2_version}.tar.gz -Source1085: %{markupsafe}-%{markupsafe_version}.tar.gz -Source1086: python-%{stringutils}-%{stringutils_version}.tar.gz -Source1087: %{requests}-%{requests_version}.tar.gz -Source1088: %{chrstnormalizer}-%{chrstnormalizer_version}.tar.gz -Source1089: %{idna}-%{idna_version}.tar.gz -Source1090: %{reqstsoauthlib}-%{reqstsoauthlib_version}.tar.gz -Source1091: %{ruamelyaml}-%{ruamelyaml_version}.tar.gz -Source1092: %{setuptools}-%{setuptools_version}.tar.gz +Source1079: rsa-4.7.2.tar.gz +Source1080: %{six}-%{six_version}.tar.gz +Source1081: %{websocketclient}-%{websocketclient_version}.tar.gz +Source1082: %{jinja2}-%{jinja2_version}.tar.gz +Source1083: %{markupsafe}-%{markupsafe_version}.tar.gz +Source1084: python-%{stringutils}-%{stringutils_version}.tar.gz +Source1085: %{requests}-%{requests_version}.tar.gz +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 -Source1093: setuptools_scm-6.3.2.tar.gz -Source1094: packaging-21.2-py3-none-any.whl -Source1095: poetry-core-1.0.7.tar.gz -Source1096: pyparsing-3.0.1.tar.gz -Source1097: tomli-1.0.1.tar.gz -Source1098: wheel-0.37.0-py2.py3-none-any.whl +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 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 @@ -250,8 +248,10 @@ Patch45: bz2221643-fence_ibm_powervs-performance-improvements.patch Patch46: bz2224267-fence_ipmilan-fix-typos-in-metadata.patch ### HA support libs/utils ### -Patch1000: bz2217902-1-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch -Patch1001: bz2217902-2-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch +# all archs +Patch1000: bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch +# cloud (x86_64 only) +Patch2000: bz2217902-2-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.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 @@ -441,21 +441,18 @@ done # sed -i -e "/^import awscli.clidriver/isys.path.insert(0, '/usr/lib/%{name}/support/awscli')" support/awscli/bin/aws # %endif -# regular patch doesnt work in build-section -# Patch1000 -%ifarch x86_64 -pushd support -/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{_sourcedir}/bz2217902-1-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch -popd -%endif - # kubevirt %{__python3} -m pip install --user --no-index --find-links %{_sourcedir} setuptools-scm %{__python3} -m pip install --target support/kubevirt --no-index --find-links %{_sourcedir} openshift rm -rf kubevirt/rsa* -# Patch1001 + +# regular patch doesnt work in build-section pushd support -/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{_sourcedir}/bz2217902-2-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1000} + +%ifarch x86_64 +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH2000} +%endif popd ./autogen.sh @@ -587,7 +584,7 @@ Provides: bundled(aliyuncli) = 2.1.10 Provides: bundled(python-cffi) = 1.14.5 Provides: bundled(python-colorama) = 0.3.3 Provides: bundled(python-jmespath) = 0.7.1 -Provides: bundled(python-pycryptodome) = 3.10.1 +Provides: bundled(python-pycryptodome) = 3.20.0 Provides: bundled(python-pycparser) = 2.20 # awscli Provides: bundled(awscli) = 2.2.15 @@ -605,7 +602,7 @@ Provides: bundled(python-boto3) = 1.17.102 Provides: bundled(python-botocore) = 1.20.102 Provides: bundled(python-dateutil) = 2.8.1 Provides: bundled(python-s3transfer) = 0.4.2 -Provides: bundled(python-urllib3) = 1.26.6 +Provides: bundled(python-urllib3) = 1.26.18 # azure Provides: bundled(python-adal) = 1.2.7 Provides: bundled(python-azure-common) = 1.1.27 @@ -613,7 +610,7 @@ Provides: bundled(python-azure-core) = 1.15.0 Provides: bundled(python-azure-mgmt-compute) = 21.0.0 Provides: bundled(python-azure-mgmt-core) = 1.2.2 Provides: bundled(python-azure-mgmt-network) = 19.0.0 -Provides: bundled(python-certifi) = 2021.5.30 +Provides: bundled(python-certifi) = %{certifi_version} Provides: bundled(python-chardet) = 4.0.0 Provides: bundled(python-idna) = 2.10 Provides: bundled(python-isodate) = 0.6.0 @@ -1490,10 +1487,26 @@ are located on corosync cluster nodes. %endif %changelog -* Mon Dec 11 2023 Chang Gao - 4.10.0-55.0.1 +* Mon May 06 2024 Chang Gao - 4.10.0-55.0.1.3 - Replace some packages with build env - Update CVE-2007-4559 patches +* Thu Jan 18 2024 Oyvind Albrigtsen - 4.10.0-55.3 +- bundled urllib3: fix CVE-2023-45803 + Resolves: RHEL-21714 +- bundled pycryptodome: fix CVE-2023-52323 + Resolves: RHEL-21722 +- bundled jinja2: fix CVE-2024-22195 + Resolves: RHEL-21736 + +* Wed Oct 11 2023 Oyvind Albrigtsen - 4.10.0-55.2 +- bundled urllib3: fix CVE-2023-43804 + Resolves: RHEL-12425 + +* Thu Sep 28 2023 Oyvind Albrigtsen - 4.10.0-55.1 +- bundled certifi: fix CVE-2023-37920 + Resolves: RHEL-9455 + * Thu Aug 3 2023 Oyvind Albrigtsen - 4.10.0-55 - bundled dateutil: fix tarfile CVE-2007-4559 Resolves: rhbz#2217902 diff --git a/pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl b/pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl deleted file mode 100644 index 32fea8569d219d6492434eab99d5018c01343bde..0000000000000000000000000000000000000000 Binary files a/pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl and /dev/null differ diff --git a/urllib3-1.26.6-py2.py3-none-any.whl b/urllib3-1.26.6-py2.py3-none-any.whl deleted file mode 100644 index 504ffbcfcfa790f04aaa1bf8fe3816d86d3228d6..0000000000000000000000000000000000000000 Binary files a/urllib3-1.26.6-py2.py3-none-any.whl and /dev/null differ