summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD6
-rw-r--r--oci-cli.patch18
2 files changed, 11 insertions, 13 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 14e7fd689571..10942a5ba504 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Andrew O'Neill <andrew at meanjollies dot com>
pkgname=oci-cli
-pkgver=2.12.6
+pkgver=2.12.7
pkgrel=1
pkgdesc='Command line interface for Oracle Cloud Infrastructure'
arch=('x86_64')
@@ -12,8 +12,8 @@ makedepends=('python-setuptools')
optdepends=('python-cx_oracle-git: Used by the database service')
source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
"${pkgname}.patch")
-sha256sums=('9f2faa7b05adee3b3f6d3da6578091561833e3997f5b97e5126ac3a6f148b574'
- '63378d6f4d2eed52fb5cb62789a4e04792f982059b55c406315d4d6b73fb9ce4')
+sha256sums=('e28cfa0bc469892b34ed3d862b7c8461be1ab253f3567d696f3cac59883c945b'
+ '8dde9938bf1830dc1d363c6ba21c4bf980a47c267bb585bc20c45ec8b7a005a4')
prepare() {
cd "${pkgname}-${pkgver}"
diff --git a/oci-cli.patch b/oci-cli.patch
index b62548a3f596..f9aac0c631fd 100644
--- a/oci-cli.patch
+++ b/oci-cli.patch
@@ -1,11 +1,11 @@
-diff -rupN oci-cli-2.12.6/setup.py oci-cli-2.12.6b/setup.py
---- oci-cli-2.12.6/setup.py 2020-08-04 17:37:12.000000000 -0400
-+++ oci-cli-2.12.6b/setup.py 2020-08-04 19:35:11.600090933 -0400
-@@ -30,25 +30,24 @@ with open_relative("README.rst") as f:
+diff -rupN oci-cli-2.12.7/setup.py oci-cli-2.12.7b/setup.py
+--- oci-cli-2.12.7/setup.py 2020-08-11 17:41:56.000000000 -0400
++++ oci-cli-2.12.7b/setup.py 2020-08-14 21:42:56.158790555 -0400
+@@ -30,24 +30,23 @@ with open_relative("README.rst") as f:
readme = f.read()
requires = [
-- 'oci==2.20.0',
+- 'oci==2.21.0',
- 'arrow==0.14.7',
+ 'oci',
+ 'arrow',
@@ -19,7 +19,6 @@ diff -rupN oci-cli-2.12.6/setup.py oci-cli-2.12.6b/setup.py
- 'retrying==1.3.3',
- 'six==1.14.0',
- 'terminaltables==3.1.0',
-- 'idna>=2.5,<2.7',
- 'pyOpenSSL==18.0.0',
- 'PyYAML==5.1.2'
+ 'click',
@@ -30,7 +29,6 @@ diff -rupN oci-cli-2.12.6/setup.py oci-cli-2.12.6b/setup.py
+ 'retrying',
+ 'six',
+ 'terminaltables',
-+ 'idna',
+ 'pyOpenSSL',
+ 'PyYAML'
]
@@ -41,9 +39,9 @@ diff -rupN oci-cli-2.12.6/setup.py oci-cli-2.12.6b/setup.py
}
fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE")
-diff -rupN oci-cli-2.12.6/src/oci_cli/cli_root.py oci-cli-2.12.6b/src/oci_cli/cli_root.py
---- oci-cli-2.12.6/src/oci_cli/cli_root.py 2020-08-04 17:37:12.000000000 -0400
-+++ oci-cli-2.12.6b/src/oci_cli/cli_root.py 2020-08-04 19:35:24.886665516 -0400
+diff -rupN oci-cli-2.12.7/src/oci_cli/cli_root.py oci-cli-2.12.7b/src/oci_cli/cli_root.py
+--- oci-cli-2.12.7/src/oci_cli/cli_root.py 2020-08-11 17:41:56.000000000 -0400
++++ oci-cli-2.12.7b/src/oci_cli/cli_root.py 2020-08-14 21:43:15.712107957 -0400
@@ -218,7 +218,7 @@ For information on configuration, see ht
@click.option('--profile',
default=Sentinel(DEFAULT_PROFILE), show_default=False,