diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index 2aef6c7..749870d 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,7 +1,7 @@ -diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt ---- oci-cli-3.23.2.orig/requirements.txt 2023-02-28 08:57:36.000000000 +0100 -+++ oci-cli-3.23.2/requirements.txt 2023-03-01 13:44:10.037647032 +0100 -@@ -2,42 +2,42 @@ +diff -Nru oci-cli-3.23.3.orig/requirements.txt oci-cli-3.23.3/requirements.txt +--- oci-cli-3.23.3.orig/requirements.txt 2023-03-07 20:43:28.000000000 +0100 ++++ oci-cli-3.23.3/requirements.txt 2023-03-14 11:33:38.405379694 +0100 +@@ -2,44 +2,44 @@ # (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format), # you may need to use the --extra-index-url option instead. @@ -10,7 +10,7 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt arrow>=1.0.0 certifi cffi>=1.9.1 --click==7.1.2 +-click==8.0.4 -coverage==4.5.2 -cryptography>=3.2.1,<39.0.0 -httpsig-cffi==15.0.0 @@ -18,7 +18,7 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.93.1 +-oci==2.94.0 -packaging==20.2 -pluggy==0.13.0 -py==1.10.0 @@ -26,10 +26,11 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt -pyOpenSSL>=17.5.0,<=22.1.0 -pycparser==2.20 -pyparsing==2.2.0 --pytest==3.2.3 +-pytest==4.6.10; python_version <= '3.9' +-pytest==7.1.2; python_version >= '3.10' -pytest-cov==2.5.1 -python-dateutil>=2.5.3,<3.0.0 -+click>=7.1.2 ++click>=8.0.4 +coverage>=4.5.2 +cryptography>=3.2.1 +httpsig-cffi>=15.0.0 @@ -37,7 +38,7 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.93.1 ++oci>=2.94.0 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.10.0 @@ -45,7 +46,8 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt +pyOpenSSL>=17.5.0 +pycparser>=2.20 +pyparsing>=2.2.0 -+pytest>=3.2.3 ++pytest>=4.6.10; python_version <= '3.9' ++pytest>=7.1.2; python_version >= '3.10' +pytest-cov>=2.5.1 +python-dateutil>=2.5.3 pytz>=2016.10 @@ -56,7 +58,8 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt -sphinx-rtd-theme==0.4.3 -terminaltables==3.1.0 -tox==3.23.0 --vcrpy==1.13.0 +-vcrpy==1.13.0; python_version <= '3.9' +-vcrpy==4.2.1; python_version >= '3.10' -virtualenv==20.13.0 -pytest-xdist==1.22.2 -pytest-forked==1.0.2 @@ -67,7 +70,8 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt +sphinx-rtd-theme>=0.4.3 +terminaltables>=3.1.0 +tox>=3.23.0 -+vcrpy>=1.13.0 ++vcrpy>=1.13.0; python_version <= '3.9' ++vcrpy>=4.2.1; python_version >= '3.10' +virtualenv>=20.13.0 +pytest-xdist>=1.22.2 +pytest-forked>=1.0.2 @@ -78,22 +82,22 @@ diff -Nru oci-cli-3.23.2.orig/requirements.txt oci-cli-3.23.2/requirements.txt -setuptools==59.6.0; python_version == '3.6' \ No newline at end of file +setuptools>=59.6.0; python_version >= '3.6' -diff -Nru oci-cli-3.23.2.orig/setup.py oci-cli-3.23.2/setup.py ---- oci-cli-3.23.2.orig/setup.py 2023-02-28 08:57:36.000000000 +0100 -+++ oci-cli-3.23.2/setup.py 2023-03-01 13:43:24.297667520 +0100 +diff -Nru oci-cli-3.23.3.orig/setup.py oci-cli-3.23.3/setup.py +--- oci-cli-3.23.3.orig/setup.py 2023-03-07 20:43:28.000000000 +0100 ++++ oci-cli-3.23.3/setup.py 2023-03-14 11:32:41.764918764 +0100 @@ -29,23 +29,23 @@ readme = f.read() requires = [ -- 'oci==2.93.1', -+ 'oci>=2.93.1', +- 'oci==2.94.0', ++ 'oci>=2.94.0', 'arrow>=1.0.0', 'certifi', -- 'click==7.1.2', +- 'click==8.0.4', - 'cryptography>=3.2.1,<39.0.0', - 'jmespath==0.10.0', - 'python-dateutil>=2.5.3,<3.0.0', -+ 'click>=7.1.2', ++ 'click>=8.0.4', + 'cryptography>=3.2.1', + 'jmespath>=0.10.0', + 'python-dateutil>=2.5.3', diff --git a/oci-cli-3.23.2.tar.gz b/oci-cli-3.23.2.tar.gz deleted file mode 100644 index d36fe73..0000000 --- a/oci-cli-3.23.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e25b8807ac9509ee32db7e6e8d8517bb215e7e501ea415c7eba2f7d598844996 -size 3574253 diff --git a/oci-cli-3.23.3.tar.gz b/oci-cli-3.23.3.tar.gz new file mode 100644 index 0000000..df73f24 --- /dev/null +++ b/oci-cli-3.23.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92bc8cac1035a3ba1cb3f40b796c655bee1008f89c05fbeda19a242ab0d85098 +size 3580939 diff --git a/oci-cli.changes b/oci-cli.changes index 5f31993..46322d8 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Tue Mar 14 10:40:09 UTC 2023 - John Paul Adrian Glaubitz + +- Update to version 3.23.3 + * Support for Identity Domains service + * ``oci identity-domains`` + * Database Service + * Support for Long Term Backup for Autonomous Databases on Exadata Cloud at Customer + * ``oci db autonomous-database-backup create --backup-destination-details`` + * ``oci db autonomous-database-backup list --type`` + * Container Engine for Kubernetes service + * Support for enhanced cluster + * ``oci ce cluster create --type`` + * ``oci ce cluster update --type`` + * Support for Cluster AddOns + * ``oci ce addon`` + * Support for Serverless + * ``oci ce virtual-node-pool`` + * Data integration service + * Support for copy objects and template retrieval + * ``oci data-integration workspace copy-object-request create`` + * ``oci data-integration workspace copy-object-request get`` + * ``oci data-integration workspace delete-copy-object-request`` + * ``oci data-integration workspace update-copy-object-request`` + * ``oci data-integration workspace copy-object-request-summary-collection + list-copy-object-requests`` + * ``oci data-integration template get`` + * ``oci data-integration template list`` + * Goldengate service + * Support for managing available deployment version in the system + * ``oci goldengate deployment-version`` + * Support for listing deployment versions + * ``oci goldengate deployment-version list`` + * Support new commands for deployment upgrade entity + * ``oci goldengate deployment-upgrade upgrade`` + * ``oci goldengate deployment-upgrade rollback`` + * ``oci goldengate deployment-upgrade snooze`` + * ``oci goldengate deployment-upgrade cancel-snooze`` + * Support for specifying oggVersion when upgrading a deployment + * ``oci goldengate deployment upgrade-to`` + * Support for specifying maintenance-window and ogg version in case of create deployment + * ``oci goldengate deployment create --maintenance-window-day + --maintenance-window-start-hour --ogg-version`` + * Support for specifying maintenance-window in case of update deployment + * ``oci goldengate deployment create --maintenance-window-day + --maintenance-window-start-hour`` + * Support for specifying deployment type and ogg versions when listing deployment types + * ``oci goldengate deployment-type-collection list-deployment-types + --deployment-type --ogg-version`` + * Operations Insights + * Support in OPSI Host Capacity planning for Host network metrics + * ``oci opsi host-insights summarize-network-usage-trend + --compartment-id --id --analysis-time-interval`` + * Support in OPSI Host Capacity planning for Host storage metrics + * ``oci opsi host-insights summarize-storage-usage-trend + --compartment-id --id --analysis-time-interval`` + * Upgraded the cryptography version to (>=3.2.1,<40.0.0) and pyOpenSSL version + to (>=17.5.0,<24.0.0') to fix CVE-2023-0286 and CVE-2023-23931 +- Refresh patches for new version + * oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Wed Mar 1 12:44:44 UTC 2023 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index ad1df28..0c8552d 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -28,7 +28,7 @@ %bcond_with test %endif Name: oci-cli%{psuffix} -Version: 3.23.2 +Version: 3.23.3 Release: 0 Summary: Oracle Cloud Infrastructure CLI License: Apache-2.0 @@ -46,7 +46,7 @@ BuildRequires: python3-click >= 8.0.4 BuildRequires: python3-cryptography >= 3.2.1 BuildRequires: python3-devel BuildRequires: python3-jmespath >= 0.10.0 -BuildRequires: python3-oci-sdk >= 2.93.1 +BuildRequires: python3-oci-sdk >= 2.94.0 BuildRequires: python3-pyOpenSSL >= 22.1.0 BuildRequires: python3-python-dateutil >= 2.5.3 BuildRequires: python3-pytz >= 2016.10 @@ -66,15 +66,18 @@ BuildRequires: python3-py >= 1.10.0 BuildRequires: python3-pyasn1 >= 0.2.3 BuildRequires: python3-pycparser >= 2.20 BuildRequires: python3-pyparsing >= 2.2.0 -BuildRequires: python3-pytest >= 3.2.3 BuildRequires: python3-pytest-cov >= 2.5.1 BuildRequires: python3-pytest-forked >= 1.0.2 BuildRequires: python3-pytest-xdist >= 1.22.2 BuildRequires: python3-requests >= 2.21.0 BuildRequires: python3-sphinx_rtd_theme >= 0.4.3 BuildRequires: python3-tox >= 3.23.0 -BuildRequires: python3-vcrpy >= 1.13.0 +BuildRequires: python3-vcrpy >= 4.2.1 BuildRequires: python3-virtualenv >= 16.7.10 +BuildRequires: (python3-vcrpy >= 1.13.0 if python-base <= 3.9) +BuildRequires: (python3-vcrpy >= 4.2.1 if python-base >= 3.10) +BuildRequires: (python3-vcrpy >= 4.6.10 if python-base <= 3.9) +BuildRequires: (python3-vcrpy >= 7.1.2 if python-base >= 3.10) %endif Requires: python3-PyYAML >= 5.4.1 Requires: python3-arrow >= 1.0.0 @@ -82,7 +85,7 @@ Requires: python3-certifi Requires: python3-click >= 8.0.4 Requires: python3-cryptography >= 3.2.1 Requires: python3-jmespath >= 0.10.0 -Requires: python3-oci-sdk >= 2.93.1 +Requires: python3-oci-sdk >= 2.94.0 Requires: python3-prompt_toolkit >= 3.0.29 Requires: python3-pyOpenSSL >= 22.1.0 Requires: python3-python-dateutil >= 2.5.3