From 7fd6943ee8bc056395c499c09a51abeab22752b9 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 25 Aug 2021 14:09:19 +0200
Subject: [PATCH] - add aliyuncli to ha-cloud-support package Resolves:
rhbz#1989149
---
fence-agents.spec | 176 ++++++++++++++++++++++---------------------
sources | 12 +--
update-ha-support.sh | 7 ++
3 files changed, 104 insertions(+), 91 deletions(-)
diff --git a/fence-agents.spec b/fence-agents.spec
index 5825fb3..4c0149d 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -9,7 +9,7 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.10.0
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Release: 6%{?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
@@ -28,92 +28,94 @@ Source901: botocore-2.0.0dev123.zip
# update with ./update-ha-support.sh and replace lines below with output
### BEGIN ###
# aliyun
-Source1000: aliyun-python-sdk-core-2.13.35.tar.gz
-Source1001: aliyun_python_sdk_ecs-4.24.3-py2.py3-none-any.whl
-Source1002: cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl
-Source1003: cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl
-Source1004: jmespath-0.10.0-py2.py3-none-any.whl
-Source1005: pycparser-2.20-py2.py3-none-any.whl
+Source1000: aliyun-python-sdk-core-2.11.5.tar.gz
+Source1001: aliyun_python_sdk_ecs-4.24.7-py2.py3-none-any.whl
+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
+Source1007: pycparser-2.20-py2.py3-none-any.whl
# awscli
-Source1006: awscrt-0.11.13-cp39-cp39-manylinux2014_x86_64.whl
-Source1007: colorama-0.4.3-py2.py3-none-any.whl
-Source1008: cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl
-Source1009: distro-1.5.0-py2.py3-none-any.whl
-Source1010: docutils-0.15.2-py3-none-any.whl
-Source1011: prompt_toolkit-2.0.10-py3-none-any.whl
-Source1012: ruamel.yaml-0.15.100.tar.gz
-Source1013: six-1.16.0-py2.py3-none-any.whl
-Source1014: wcwidth-0.1.9-py2.py3-none-any.whl
+Source1008: awscrt-0.11.13-cp39-cp39-manylinux2014_x86_64.whl
+Source1009: colorama-0.4.3-py2.py3-none-any.whl
+Source1010: cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl
+Source1011: distro-1.5.0-py2.py3-none-any.whl
+Source1012: docutils-0.15.2-py3-none-any.whl
+Source1013: prompt_toolkit-2.0.10-py3-none-any.whl
+Source1014: ruamel.yaml-0.15.100.tar.gz
+Source1015: six-1.16.0-py2.py3-none-any.whl
+Source1016: wcwidth-0.1.9-py2.py3-none-any.whl
# aws
-Source1015: boto3-1.17.102-py2.py3-none-any.whl
-Source1016: botocore-1.20.102-py2.py3-none-any.whl
-Source1017: python_dateutil-2.8.1-py2.py3-none-any.whl
-Source1018: s3transfer-0.4.2-py2.py3-none-any.whl
-Source1019: urllib3-1.26.6-py2.py3-none-any.whl
+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
# azure
-Source1020: adal-1.2.7-py2.py3-none-any.whl
-Source1021: azure_common-1.1.27-py2.py3-none-any.whl
-Source1022: azure_core-1.15.0-py2.py3-none-any.whl
-Source1023: azure_mgmt_compute-21.0.0-py2.py3-none-any.whl
-Source1024: azure_mgmt_core-1.2.2-py2.py3-none-any.whl
-Source1025: azure_mgmt_network-19.0.0-py2.py3-none-any.whl
-Source1026: certifi-2021.5.30-py2.py3-none-any.whl
-Source1027: chardet-4.0.0-py2.py3-none-any.whl
-Source1028: idna-2.10-py2.py3-none-any.whl
-Source1029: isodate-0.6.0-py2.py3-none-any.whl
-Source1030: msrest-0.6.21-py2.py3-none-any.whl
-Source1031: msrestazure-0.6.4-py2.py3-none-any.whl
-Source1032: oauthlib-3.1.1-py2.py3-none-any.whl
-Source1033: PyJWT-2.1.0-py3-none-any.whl
-Source1034: requests-2.25.1-py2.py3-none-any.whl
-Source1035: requests_oauthlib-1.3.0-py2.py3-none-any.whl
+Source1022: adal-1.2.7-py2.py3-none-any.whl
+Source1023: azure_common-1.1.27-py2.py3-none-any.whl
+Source1024: azure_core-1.15.0-py2.py3-none-any.whl
+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: certifi-2021.5.30-py2.py3-none-any.whl
+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-3.1.1-py2.py3-none-any.whl
+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
# google
-Source1036: cachetools-4.2.2-py3-none-any.whl
-Source1037: chardet-3.0.4-py2.py3-none-any.whl
-Source1038: google_api_core-1.30.0-py2.py3-none-any.whl
-Source1039: google_api_python_client-1.12.8-py2.py3-none-any.whl
-Source1040: googleapis_common_protos-1.53.0-py2.py3-none-any.whl
-Source1041: google_auth-1.32.0-py2.py3-none-any.whl
-Source1042: google_auth_httplib2-0.1.0-py2.py3-none-any.whl
-Source1043: httplib2-0.19.1-py3-none-any.whl
-Source1044: packaging-20.9-py2.py3-none-any.whl
-Source1045: protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl
-Source1046: pyasn1-0.4.8-py2.py3-none-any.whl
-Source1047: pyasn1_modules-0.2.8-py2.py3-none-any.whl
-Source1048: pyparsing-2.4.7-py2.py3-none-any.whl
-Source1049: pyroute2-0.6.4.tar.gz
-Source1050: pyroute2.core-0.6.4.tar.gz
-Source1051: pyroute2.ethtool-0.6.4.tar.gz
-Source1052: pyroute2.ipdb-0.6.4.tar.gz
-Source1053: pyroute2.ipset-0.6.4.tar.gz
-Source1054: pyroute2.ndb-0.6.4.tar.gz
-Source1055: pyroute2.nftables-0.6.4.tar.gz
-Source1056: pyroute2.nslink-0.6.4.tar.gz
-Source1057: pytz-2021.1-py2.py3-none-any.whl
-Source1058: rsa-4.7.2-py3-none-any.whl
-Source1059: setuptools-57.0.0-py3-none-any.whl
-Source1060: uritemplate-3.0.1-py2.py3-none-any.whl
+Source1038: cachetools-4.2.2-py3-none-any.whl
+Source1039: chardet-3.0.4-py2.py3-none-any.whl
+Source1040: google_api_core-1.30.0-py2.py3-none-any.whl
+Source1041: google_api_python_client-1.12.8-py2.py3-none-any.whl
+Source1042: googleapis_common_protos-1.53.0-py2.py3-none-any.whl
+Source1043: google_auth-1.32.0-py2.py3-none-any.whl
+Source1044: google_auth_httplib2-0.1.0-py2.py3-none-any.whl
+Source1045: httplib2-0.19.1-py3-none-any.whl
+Source1046: packaging-20.9-py2.py3-none-any.whl
+Source1047: protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl
+Source1048: pyasn1-0.4.8-py2.py3-none-any.whl
+Source1049: pyasn1_modules-0.2.8-py2.py3-none-any.whl
+Source1050: pyparsing-2.4.7-py2.py3-none-any.whl
+Source1051: pyroute2-0.6.4.tar.gz
+Source1052: pyroute2.core-0.6.4.tar.gz
+Source1053: pyroute2.ethtool-0.6.4.tar.gz
+Source1054: pyroute2.ipdb-0.6.4.tar.gz
+Source1055: pyroute2.ipset-0.6.4.tar.gz
+Source1056: pyroute2.ndb-0.6.4.tar.gz
+Source1057: pyroute2.nftables-0.6.4.tar.gz
+Source1058: pyroute2.nslink-0.6.4.tar.gz
+Source1059: pytz-2021.1-py2.py3-none-any.whl
+Source1060: rsa-4.7.2-py3-none-any.whl
+Source1061: setuptools-57.0.0-py3-none-any.whl
+Source1062: uritemplate-3.0.1-py2.py3-none-any.whl
# openstack
-Source1061: debtcollector-2.2.0-py3-none-any.whl
-Source1062: iso8601-0.1.14-py2.py3-none-any.whl
-Source1063: keystoneauth1-4.3.1-py3-none-any.whl
-Source1064: msgpack-1.0.2.tar.gz
-Source1065: netaddr-0.8.0-py2.py3-none-any.whl
-Source1066: netifaces-0.11.0.tar.gz
-Source1067: oslo.i18n-5.0.1-py3-none-any.whl
-Source1068: oslo.serialization-4.1.0-py3-none-any.whl
-Source1069: oslo.utils-4.9.1-py3-none-any.whl
-Source1070: os_service_types-1.7.0-py2.py3-none-any.whl
-Source1071: pbr-5.6.0-py2.py3-none-any.whl
-Source1072: prettytable-2.1.0-py3-none-any.whl
-Source1073: python_novaclient-17.5.0-py3-none-any.whl
-Source1074: stevedore-3.3.0-py3-none-any.whl
-Source1075: wcwidth-0.2.5-py2.py3-none-any.whl
-Source1076: wrapt-1.12.1.tar.gz
+Source1063: debtcollector-2.2.0-py3-none-any.whl
+Source1064: iso8601-0.1.14-py2.py3-none-any.whl
+Source1065: keystoneauth1-4.3.1-py3-none-any.whl
+Source1066: msgpack-1.0.2.tar.gz
+Source1067: netaddr-0.8.0-py2.py3-none-any.whl
+Source1068: netifaces-0.11.0.tar.gz
+Source1069: oslo.i18n-5.0.1-py3-none-any.whl
+Source1070: oslo.serialization-4.1.0-py3-none-any.whl
+Source1071: oslo.utils-4.9.1-py3-none-any.whl
+Source1072: os_service_types-1.7.0-py2.py3-none-any.whl
+Source1073: pbr-5.6.0-py2.py3-none-any.whl
+Source1074: prettytable-2.1.0-py3-none-any.whl
+Source1075: python_novaclient-17.5.0-py3-none-any.whl
+Source1076: stevedore-3.3.0-py3-none-any.whl
+Source1077: wcwidth-0.2.5-py2.py3-none-any.whl
+Source1078: wrapt-1.12.1.tar.gz
# common (pexpect / suds)
-Source1077: pexpect-4.8.0-py2.py3-none-any.whl
-Source1078: ptyprocess-0.7.0-py2.py3-none-any.whl
-Source1079: suds_community-0.8.5-py3-none-any.whl
+Source1079: pexpect-4.8.0-py2.py3-none-any.whl
+Source1080: ptyprocess-0.7.0-py2.py3-none-any.whl
+Source1081: suds_community-0.8.5-py3-none-any.whl
### END ###
Patch0: ha-cloud-support-aliyun.patch
@@ -361,11 +363,13 @@ This package contains support files including the Python fencing library.
License: GPLv2+ and LGPLv2+
Summary: Support libraries for HA Cloud agents
# aliyun
-Provides: bundled(python-aliyun-python-sdk-core) = 2.13.35
-Provides: bundled(python-aliyun-python-sdk-ecs) = 4.24.3
+Provides: bundled(python-aliyun-python-sdk-core) = 2.11.5
+Provides: bundled(python-aliyun-python-sdk-ecs) = 4.24.7
+Provides: bundled(aliyuncli) = 2.1.10
Provides: bundled(python-cffi) = 1.14.5
-Provides: bundled(python-cryptography) = 3.4.7
-Provides: bundled(python-jmespath) = 0.10.0
+Provides: bundled(python-colorama) = 0.3.3
+Provides: bundled(python-jmespath) = 0.7.1
+Provides: bundled(python-pycryptodome) = 3.10.1
Provides: bundled(python-pycparser) = 2.20
# awscli
Provides: bundled(awscli) = 2.2.15
@@ -1238,7 +1242,7 @@ are located on corosync cluster nodes.
%{_libdir}/fence-virt/cpg.so
%changelog
-* Tue Aug 24 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-5
+* Wed Aug 25 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-6
- remove suds dependency
Resolves: rhbz#1989149
diff --git a/sources b/sources
index 4116c95..1c47a1c 100644
--- a/sources
+++ b/sources
@@ -1,18 +1,20 @@
SHA512 (fence-agents-4.10.0.tar.gz) = 9b867c420730106c07c8d9352b5d17c473642443bb0ff9bd94597722198b295c3b41663fa5c8267bdf44153dbbafe644c3701728b39293fcb9a67b9734d488c2
SHA512 (awscli-2.2.15.tar.gz) = 4fe4f360e7b25ab3fa7b6659a7300875cf7a9c0bad2c9dbcbec25b85bda6ccb25511a44d24ebc60db8eee59de81fe586254f2990339bda8dcab93f9f1253e39e
SHA512 (botocore-2.0.0dev123.zip) = 72e436421010f54b45aeb7d0b9dd2c22f4273f2ba702b30a214288a0c83d9a6da99ecb70f6d9aeb054c536acd0bb9ce9e9a89bf794de81020fea75d0eae16eca
-SHA512 (requirements-aliyun.txt) = 0c4f89de63246c406535ee73310232f3986b37dedbeed52f25000386d73af6735e1bf8e7ecaa97419df98f55058d76e4ff289d856b815afaaaf69744c5924f7e
+SHA512 (requirements-aliyun.txt) = 7d2f192a9d3a7e5272a85bcb65d96dc5037799d8a068f80a6ebecccdad7af40096a75e89e7d25171b215e35730ddaeea8b7ebb1d5c4f160ad29b2ddcbb30c3c8
SHA512 (requirements-awscli.txt) = fb88998a860e25d9423833b53b150e564a2cd46ac54b0538e2704c116f7449b5747744b36b05b5a3f1a96856fd8812560cecded3ec44b8ada40161a5e7718d56
SHA512 (requirements-aws.txt) = ca39604d09f4b05589ddaa437be13b7f5d1868218745df107564d73a6c32efb7e4761436197a69653edc47a78f40dd7d5f0894935ec21b8f23b7c7bc71dfd0d1
SHA512 (requirements-azure.txt) = a176aeaba7f13ca126bc6b41de1237148480787e4fe56cd9969b843d7102b24cbef2c9f9bd5e4460c603da96ba588639a77dfb376f9ab4ff6f7c2a29013edc31
SHA512 (requirements-google.txt) = d916eb72588e55f5243b9e5391ab07d65eaafe583e073ef79d0e865f4c5e911d7b10310f7ccb98b5fdc1383c2214cc0cc082fa3c5fac6aa3d1931e4779149241
SHA512 (requirements-openstack.txt) = e4c6ee00ff7bedd0229aa9ba9380cb20891f5fdd35e39bcc9d6c8e21ce9e7fffe18e383a44ea711266d07f47e9ffa3123beeafb14d0c9b62ddb0456b86e57f22
SHA512 (requirements-common.txt) = 48725599ca3e019f34ce59b78a6ac1deb0cc459e062cd87d5bc96dc2a47f9ef86cc46d50c318c3cd83765882fab40bdfcc03feff82933ed3bdce35b50fbb696e
-SHA512 (aliyun-python-sdk-core-2.13.35.tar.gz) = 0e73892f23541f74618796f3ee672348c1764feac8c5a4ce8abb1265fba0e53b59a7ac1087ccbf4800b016ae691abd493f3457c2bb4086d5678b2eb0652d11bc
-SHA512 (aliyun_python_sdk_ecs-4.24.3-py2.py3-none-any.whl) = eff82b13a587f21ef0f7bfb3640ada409ba284d2105e2a6d7d8d6494931d25c3a3471499216346490ec923d903593def4af8838f9067ed18f0f2cc66ed9650ac
+SHA512 (aliyun-python-sdk-core-2.11.5.tar.gz) = 4178056b2b94b314924c671c26a15696493412ab0a61c13ff64eeff72f0e0c80960269db34471adce34d35e23578b8b54953a242fd575560c2312d672871b951
+SHA512 (aliyun_python_sdk_ecs-4.24.7-py2.py3-none-any.whl) = e479191136e74eaa1f52ba0b317c721cdb1fc1972f074377dd6a7616ef79d93b8b494a53d7d745d8438be748e3d14dbbab6e8433381d1ea589fa073d1ed0e52e
+SHA512 (aliyuncli-2.1.10-py2.py3-none-any.whl) = d777881a0235986da7b8954b01a671ac2da3c4578566672ce77b4769e2df04ebc943ea2aaf03c170ea607dce4cbb90fe71aff87f8ac97a307e79824bd5419234
SHA512 (cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl) = 3c73e06bef8e9646beacc584d59ecf42de013034194d6eb59f1abf279e8fe5468e106fcd47802ce1d264d3c1d9122af3c66ea1229db78a768f7ea069ddc2fd72
-SHA512 (cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl) = 6b4eaa52b17065e5723ac2d70f38f05c5a550aea5a50cd4ffac78ec61fa363ac9d1ef29d9c9ca876e69cf9ac681bf6e9941f2027fd6126e472d425d0b5cdf788
-SHA512 (jmespath-0.10.0-py2.py3-none-any.whl) = c4ef69cbdac0e6ff8fe1b4a604ebd7abd16e6021cea4b8b6c69917433939a60632462cecf6164a00fd585cb2ca4ddbfb3f871286ab48dd4aa37a11d002612b65
+SHA512 (colorama-0.3.3.tar.gz) = 8e6177ea60ab8f1267ce982f23803a9d2eb0c4550d7eac4776416d62a99d1ce03254fc64cc959ca95e2409ceeff081d4d19359c383e969dfb921b44c56914495
+SHA512 (jmespath-0.7.1-py2.py3-none-any.whl) = e035bbd4e716066fc6a6282505a51dac8ec738a2794db958aef9edefb9871aa2424ead0ffb80d8cda75436b23ebc02f96201b3960e48d3ea3299e9b4aa8a6958
+SHA512 (pycryptodome-3.10.1-cp35-abi3-manylinux2010_x86_64.whl) = c016ccea0db39c04a4dac0ef4a8f1331049fbe0b34bab2791e42e9b5c9a20305bda482092af05940da3a641fac1e9aa95f76d982221bf9ca792114ff3efd4f4b
SHA512 (pycparser-2.20-py2.py3-none-any.whl) = 06dc9cefdcde6b97c96d0452a77db42a629c48ee545edd7ab241763e50e3b3c56d21f9fcce4e206817aa1a597763d948a10ccc73572490d739c89eea7fede0a1
SHA512 (awscrt-0.11.13-cp39-cp39-manylinux2014_x86_64.whl) = f071293fd9710e8661f2a3a3ac4ad63748ab922fa8f9914be3b67844570c0b6f58696dd3335958369a828c35467312f1e77970039917923057624e5821cd68fa
SHA512 (colorama-0.4.3-py2.py3-none-any.whl) = 7cb2e248fbda31049e23431a921c71d3ecca650011ba25290ce0bfabb616faa0f0185e49deda10a9a358d3b9355392864b51ef764a4020c33d0980af97a33024
diff --git a/update-ha-support.sh b/update-ha-support.sh
index 2ebe76d..9462062 100755
--- a/update-ha-support.sh
+++ b/update-ha-support.sh
@@ -1,4 +1,11 @@
#!/bin/sh
+
+echo -e "Run \"pip download --no-binary msgpack,netifaces -r requirements-$1.txt\" to update,\n\
+and add output from \"sha512sum --tag <updated-files>\" to sources, and update spec-file."
+exit 0
+
+##
+
export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
find -maxdepth 1 -not -name "fence-agents-*.tar.gz" -and -not -name "awscli-*.tar.gz" -and -not -name "botocore-2*.zip" -and \( -name "*.whl" -or -name "*.tar.?z*" \) -delete