diff --git a/.awscli.metadata b/.awscli.metadata index 4cd68ff..b588c2c 100644 --- a/.awscli.metadata +++ b/.awscli.metadata @@ -1,2 +1,2 @@ -37649950791f3db6f5879205de658fa78075aae1 SOURCES/awscli-1.14.28.tar.gz +b3c2011ba2b91491c9effbea37cced7b1d30cee2 SOURCES/awscli-1.23.2.tar.gz 7310d6ddf680c524ad6b16f673a77a9defb5766e SOURCES/colorama-0.3.7.tar.gz diff --git a/.gitignore b/.gitignore index a69681e..9cd9f26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/awscli-1.14.28.tar.gz +SOURCES/awscli-1.23.2.tar.gz SOURCES/colorama-0.3.7.tar.gz diff --git a/SOURCES/bundled-python-botocore.patch b/SOURCES/bundled-python-botocore.patch index 6b4895e..55d9118 100644 --- a/SOURCES/bundled-python-botocore.patch +++ b/SOURCES/bundled-python-botocore.patch @@ -439,18 +439,6 @@ diff -uNr a/awscli/customizations/s3/subcommands.py b/awscli/customizations/s3/s from botocore.client import Config from dateutil.parser import parse from dateutil.tz import tzlocal -diff -uNr a/awscli/customizations/s3endpoint.py b/awscli/customizations/s3endpoint.py ---- a/awscli/customizations/s3endpoint.py 2018-01-18 02:06:58.000000000 +0100 -+++ b/awscli/customizations/s3endpoint.py 2018-01-26 13:05:58.240231181 +0100 -@@ -26,6 +26,8 @@ - """ - from functools import partial - -+import sys -+sys.path.insert(0, '/usr/lib/fence-agents/bundled') - from botocore.utils import fix_s3_host - - diff -uNr a/awscli/customizations/s3uploader.py b/awscli/customizations/s3uploader.py --- a/awscli/customizations/s3uploader.py 2018-01-18 02:06:58.000000000 +0100 +++ b/awscli/customizations/s3uploader.py 2018-01-26 13:06:04.494172122 +0100 @@ -551,21 +539,21 @@ diff -uNr a/awscli/help.py b/awscli/help.py from docutils.writers import manpage +sys.path.insert(0, '/usr/lib/fence-agents/bundled') - from botocore.docs.bcdoc import docevents - from botocore.docs.bcdoc.restdoc import ReSTDocument - from botocore.docs.bcdoc.textwriter import TextWriter + from awscli.clidocs import ProviderDocumentEventHandler + from awscli.clidocs import ServiceDocumentEventHandler + from awscli.clidocs import OperationDocumentEventHandler diff -uNr a/awscli/paramfile.py b/awscli/paramfile.py --- a/awscli/paramfile.py 2018-01-18 02:06:58.000000000 +0100 +++ b/awscli/paramfile.py 2018-01-26 13:09:46.469075911 +0100 @@ -13,6 +13,8 @@ - import logging import os + import copy +import sys +sys.path.insert(0, '/usr/lib/fence-agents/bundled') - from botocore.vendored import requests - from awscli.compat import six - + from botocore.awsrequest import AWSRequest + from botocore.httpsession import URLLib3Session + from botocore.exceptions import ProfileNotFound diff -uNr a/awscli/plugin.py b/awscli/plugin.py --- a/awscli/plugin.py 2018-01-18 02:06:58.000000000 +0100 +++ b/awscli/plugin.py 2018-01-26 13:11:22.716167007 +0100 @@ -582,10 +570,10 @@ diff -uNr a/awscli/testutils.py b/awscli/testutils.py --- a/awscli/testutils.py 2018-01-18 02:06:58.000000000 +0100 +++ b/awscli/testutils.py 2018-01-26 13:09:52.192021868 +0100 @@ -47,6 +47,7 @@ - # different story. - mock = None + + from awscli.compat import six +sys.path.insert(0, '/usr/lib/fence-agents/bundled') - from botocore.hooks import HierarchicalEmitter from botocore.session import Session from botocore.exceptions import ClientError + from botocore.exceptions import WaiterErro diff --git a/SOURCES/bz1581138-fix-unsupported-max_bandwidth.patch b/SOURCES/bz1581138-fix-unsupported-max_bandwidth.patch deleted file mode 100644 index 036a7c4..0000000 --- a/SOURCES/bz1581138-fix-unsupported-max_bandwidth.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr a/awscli/customizations/s3/transferconfig.py b/awscli/customizations/s3/transferconfig.py ---- a/awscli/customizations/s3/transferconfig.py 2018-01-18 02:06:58.000000000 +0100 -+++ b/awscli/customizations/s3/transferconfig.py 2018-05-24 13:45:29.714544364 +0200 -@@ -109,7 +109,6 @@ - 'max_queue_size': 'max_request_queue_size', - 'multipart_threshold': 'multipart_threshold', - 'multipart_chunksize': 'multipart_chunksize', -- 'max_bandwidth': 'max_bandwidth', - } - kwargs = {} - for key, value in runtime_config.items(): diff --git a/SPECS/awscli.spec b/SPECS/awscli.spec index 2704305..b2d6eeb 100644 --- a/SPECS/awscli.spec +++ b/SPECS/awscli.spec @@ -12,8 +12,8 @@ %global colorama_dir %{bundled_lib_dir}/colorama Name: awscli -Version: 1.14.28 -Release: 5%{?dist}.1 +Version: 1.23.2 +Release: 1%{?dist}.1 Summary: Universal Command Line Environment for AWS License: ASL 2.0 @@ -22,7 +22,6 @@ Source0: %{name}/%{name}-%{version}.tar.gz Source1: colorama-%{colorama_version}.tar.gz Patch0: python-rsa-to-cryptography.patch Patch1: bundled-python-botocore.patch -Patch2: bz1581138-fix-unsupported-max_bandwidth.patch BuildArch: noarch %if %{with python3} BuildRequires: python3-devel @@ -69,12 +68,10 @@ rm -rf %{name}.egg-info %patch0 -p1 # python-botocore bundled in python-s3transfer -%patch1 -p1 - -# fix unsupported max_bandwidth -%patch2 -p1 +%patch1 -p1 -F2 # python-colorama bundle +#%patch2 -p1 mkdir -p %{bundled_lib_dir} tar -xzf %SOURCE1 -C %{bundled_lib_dir} mv %{bundled_lib_dir}/colorama-%{colorama_version} %{colorama_dir} @@ -86,7 +83,6 @@ pushd %{colorama_dir} rm -rf *.egg-info popd # python-colorama: append bundled-directory to search path -sed -i "/^from colorama/iimport sys\nsys.path.insert(0, '%{_libdir}/fence-agents/bundled')" scripts/performance/perfcmp sed -i "/^import colorama/isys.path.insert(0, '%{_libdir}/fence-agents/bundled')" awscli/customizations/history/show.py awscli/table.py # python-jmespath: append bundled-directory to search path sed -i "/^import jmespath/iimport sys\nsys.path.insert(0, '%{_libdir}/fence-agents/bundled')" awscli/customizations/arguments.py @@ -148,10 +144,10 @@ popd %{_libdir}/fence-agents/bundled %changelog -* Thu May 24 2018 Oyvind Albrigtsen - 1.14.28-5.1 -- Fix unsupported max_bandwidth issue +* Tue May 3 2022 Oyvind Albrigtsen - 1.23.2-1.1 +- Rebase to 1.23.2 to fix issues with upgraded libs - Resolves: rhbz#1581138 + Resolves: rhbz#2073979 * Mon Feb 12 2018 Oyvind Albrigtsen - 1.14.28-5 - Append python-botocore and python-jmespath bundled directory to