summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--oci-cli.patch26
3 files changed, 20 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da77b156b60e..b08d59355340 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = oci-cli
pkgdesc = Command line interface for Oracle Cloud Infrastructure
- pkgver = 2.9.4
+ pkgver = 2.9.7
pkgrel = 1
url = https://github.com/oracle/oci-cli
arch = x86_64
@@ -22,10 +22,10 @@ pkgbase = oci-cli
depends = python-retrying
depends = python-yaml
optdepends = python-cx_oracle-git: Used by the database service
- source = oci-cli-2.9.4.tar.gz::https://github.com/oracle/oci-cli/archive/v2.9.4.tar.gz
+ source = oci-cli-2.9.7.tar.gz::https://github.com/oracle/oci-cli/archive/v2.9.7.tar.gz
source = oci-cli.patch
- sha256sums = 34edb780dbbf575e12435892dbc97721164d305de9e3cb3352815eada413e7c5
- sha256sums = c799b82a7332449f81b5eaa9dd24db6218f60917f05eb9dbb082d4087b41330f
+ sha256sums = 9c481b98fb92b9efbb4233b537a7192dcd29a707f5c89370553e8fb207c084f5
+ sha256sums = 66eda25ca06fc2b93356033f47dbfb787d4bde631f7198eb2f4b8f984e254109
pkgname = oci-cli
diff --git a/PKGBUILD b/PKGBUILD
index 897818fd8031..d4afdcf696bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Andrew O'Neill <andrew at meanjollies dot com>
pkgname=oci-cli
-pkgver=2.9.4
+pkgver=2.9.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=('34edb780dbbf575e12435892dbc97721164d305de9e3cb3352815eada413e7c5'
- 'c799b82a7332449f81b5eaa9dd24db6218f60917f05eb9dbb082d4087b41330f')
+sha256sums=('9c481b98fb92b9efbb4233b537a7192dcd29a707f5c89370553e8fb207c084f5'
+ '66eda25ca06fc2b93356033f47dbfb787d4bde631f7198eb2f4b8f984e254109')
prepare() {
cd "${pkgname}-${pkgver}"
diff --git a/oci-cli.patch b/oci-cli.patch
index b24d0f904d03..3396ff7a1532 100644
--- a/oci-cli.patch
+++ b/oci-cli.patch
@@ -1,23 +1,23 @@
-diff -rupN oci-cli-2.9.4/setup.py oci-cli-2.9.4b/setup.py
---- oci-cli-2.9.4/setup.py 2020-02-25 17:22:27.000000000 -0500
-+++ oci-cli-2.9.4b/setup.py 2020-02-25 21:12:28.892959746 -0500
+diff -rupN oci-cli-2.9.7/setup.py oci-cli-2.9.7b/setup.py
+--- oci-cli-2.9.7/setup.py 2020-03-17 22:09:09.000000000 -0400
++++ oci-cli-2.9.7b/setup.py 2020-03-19 19:06:59.533080529 -0400
@@ -29,25 +29,24 @@ with open_relative("README.rst") as f:
readme = f.read()
requires = [
-- 'oci==2.10.6',
-- 'arrow==0.10.0',
+- 'oci==2.12.0',
+- 'arrow==0.14.7',
+ 'oci',
+ 'arrow',
'certifi',
- 'click==6.7',
-- 'configparser==3.5.0',
+- 'configparser>=4.0.2',
- 'cryptography==2.8',
-- 'jmespath==0.9.3',
-- 'python-dateutil==2.7.3',
-- 'pytz==2016.10',
+- 'jmespath==0.9.4',
+- 'python-dateutil>=2.5.3,<3.0.0',
+- 'pytz>=2016.10',
- 'retrying==1.3.3',
-- 'six==1.11.0',
+- 'six==1.14.0',
- 'terminaltables==3.1.0',
- 'idna>=2.5,<2.7',
- 'pyOpenSSL==18.0.0',
@@ -41,9 +41,9 @@ diff -rupN oci-cli-2.9.4/setup.py oci-cli-2.9.4b/setup.py
}
fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE")
-diff -rupN oci-cli-2.9.4/src/oci_cli/cli_root.py oci-cli-2.9.4b/src/oci_cli/cli_root.py
---- oci-cli-2.9.4/src/oci_cli/cli_root.py 2020-02-25 17:22:27.000000000 -0500
-+++ oci-cli-2.9.4b/src/oci_cli/cli_root.py 2020-02-25 21:13:04.172760386 -0500
+diff -rupN oci-cli-2.9.7/src/oci_cli/cli_root.py oci-cli-2.9.7b/src/oci_cli/cli_root.py
+--- oci-cli-2.9.7/src/oci_cli/cli_root.py 2020-03-17 22:09:09.000000000 -0400
++++ oci-cli-2.9.7b/src/oci_cli/cli_root.py 2020-03-19 19:07:35.469619967 -0400
@@ -217,7 +217,7 @@ For information on configuration, see ht
@click.option('--profile',
default=Sentinel(DEFAULT_PROFILE), show_default=False,