diff --git a/aws-cli-1.15.76.tar.gz b/aws-cli-1.15.76.tar.gz deleted file mode 100644 index f78f4db..0000000 --- a/aws-cli-1.15.76.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be765387533de0674493d4dd467044b5f1b700c4fe991062666e46dec267cc81 -size 1107173 diff --git a/aws-cli-1.16.1.tar.gz b/aws-cli-1.16.1.tar.gz new file mode 100644 index 0000000..0cfee3e --- /dev/null +++ b/aws-cli-1.16.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3ac5bd4a55bdf4a41264428e82444b3425e00a00a4e5d7945fbab3b3f520e6b +size 1107514 diff --git a/aws-cli.changes b/aws-cli.changes index ed98411..48479b9 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 13 10:23:47 UTC 2018 - John Paul Adrian Glaubitz + +- Update to version 1.16.1 (bsc#1105988, bsc#1092493) + + Fix CVE-2018-15869 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.16.1/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch + + Replace vendored version of six from botocore with upstream version + + Update Requires in spec file from setup.py + ------------------------------------------------------------------- Mon Aug 13 14:47:29 UTC 2018 - adrian.glaubitz@suse.com diff --git a/aws-cli.spec b/aws-cli.spec index d4cdd68..9156791 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.15.76 +Version: 1.16.1 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -29,7 +29,7 @@ Patch0: hide_py_pckgmgmt.patch Requires: python3 Requires: python3-PyYAML <= 4.0 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.10.75 +Requires: python3-botocore >= 1.11.1 Requires: python3-colorama <= 0.3.9 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 @@ -37,13 +37,14 @@ Requires: python3-rsa <= 3.5.0 Requires: python3-rsa >= 3.1.2 Requires: python3-s3transfer <= 0.2.0 Requires: python3-s3transfer >= 0.1.12 +Requires: python3-six BuildRequires: python3-devel BuildRequires: python3-setuptools %else Requires: python Requires: python-PyYAML <= 3.13 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.10.75 +Requires: python-botocore >= 1.11.1 Requires: python-colorama <= 0.3.9 Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 @@ -51,6 +52,7 @@ Requires: python-rsa <= 3.5.0 Requires: python-rsa >= 3.1.2 Requires: python-s3transfer <= 0.2.0 Requires: python-s3transfer >= 0.1.12 +Requires: python-six BuildRequires: python-devel BuildRequires: python-setuptools %endif @@ -64,6 +66,8 @@ from the command line and automated through scripts. %prep %setup -q %patch0 +sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py +sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py %build %if 0%{?suse_version} && 0%{?suse_version} > 1315 diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index d165a68..ee84983 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,16 +1,16 @@ ---- setup.py.orig 2018-08-10 22:13:09.000000000 +0200 -+++ setup.py 2018-08-13 16:41:02.210656456 +0200 +--- setup.py.orig 2018-08-25 03:51:52.000000000 +0200 ++++ setup.py 2018-08-25 17:41:34.441844517 +0200 @@ -23,18 +23,18 @@ raise RuntimeError("Unable to find version string.") --requires = ['botocore==1.10.75', +-requires = ['botocore==1.11.1', - 'colorama>=0.2.5,<=0.3.9', - 'docutils>=0.10', - 'rsa>=3.1.2,<=3.5.0', - 's3transfer>=0.1.12,<0.2.0', - 'PyYAML>=3.10,<=3.13'] -+# requires = ['botocore==1.10.75', ++# requires = ['botocore==1.11.1', +# 'colorama>=0.2.5,<=0.3.9', +# 'docutils>=0.10', +# 'rsa>=3.1.2,<=3.5.0',