[arch-commits] Commit in s3cmd/trunk (1061.patch PKGBUILD)

[Alexander Epaneshnikov]

    Date: Monday, October 4, 2021 @ 06:30:13
  Author: alex19ep
Revision: 1027257

upgpkg: s3cmd 2.2.0-1

new upstream release

Modified:
  s3cmd/trunk/PKGBUILD
Deleted:
  s3cmd/trunk/1061.patch

------------+
 1061.patch |   25 -------------------------
 PKGBUILD   |   23 ++++++-----------------
 2 files changed, 6 insertions(+), 42 deletions(-)

Deleted: 1061.patch
===================================================================
--- 1061.patch	2021-10-04 06:27:40 UTC (rev 1027256)
+++ 1061.patch	2021-10-04 06:30:13 UTC (rev 1027257)
@@ -1,25 +0,0 @@
-From 8665ff5dc95900798bd8e935c61a10324115579a Mon Sep 17 00:00:00 2001
-From: Konstantin Shalygin <k0ste at k0ste.ru>
-Date: Mon, 18 Nov 2019 11:28:53 +0700
-Subject: [PATCH] s3cmd: python 3.8 compat
-
----
- s3cmd | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/s3cmd b/s3cmd
-index cef1e9c5..3e18af1b 100755
---- a/s3cmd
-+++ b/s3cmd
-@@ -317,9 +317,9 @@ def cmd_expiration_set(args):
-             raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % arg)
-         try:
-             response = s3.expiration_set(uri, cfg.bucket_location)
--            if response["status"] is 200:
-+            if response["status"] == 200:
-                 output(u"Bucket '%s': expiration configuration is set." % (uri.uri()))
--            elif response["status"] is 204:
-+            elif response["status"] == 204:
-                 output(u"Bucket '%s': expiration configuration is deleted." % (uri.uri()))
-         except S3Error as e:
-             if e.info["Code"] in S3.codes:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-04 06:27:40 UTC (rev 1027256)
+++ PKGBUILD	2021-10-04 06:30:13 UTC (rev 1027257)
@@ -6,31 +6,20 @@
 # Contributor: Daniel Grana <dangra at gmail.com>
 
 pkgname=s3cmd
-pkgver=2.1.0
-pkgrel=5
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A command line client for Amazon S3"
 arch=('any')
 url='http://s3tools.org/s3cmd'
 license=('GPL2')
 depends=('python-dateutil' 'python-magic')
-makedepends=('python-setuptools')
+makedepends=('git' 'python-setuptools')
 optdepends=('gnupg: encrypted file storage')
-source=(https://github.com/s3tools/s3cmd/releases/download/v${pkgver}/s3cmd-${pkgver}.tar.gz{,.asc}
-        ${pkgname}-1144.patch::https://patch-diff.githubusercontent.com/raw/s3tools/s3cmd/pull/1144.patch
-        ${pkgname}-1137.patch::https://patch-diff.githubusercontent.com/raw/s3tools/s3cmd/pull/1137.patch)
-sha512sums=('98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6'
-            'SKIP'
-            '72ccb5bbb8bf8e3b9e4c887d6e995f5dc209c94fcc3916340143b0004997e7822d491c07adae616a92bac6a47b957635ac2d8e42ec89506730efa31e903b09c5'
-            '9cdfb70ee630242170fbdc16eac67e7fe95921a307861fdc6b4b60094dde3f5573aa2d7b9484714cf19721bf59c99af94b2d2a438e21b5f358ecfdc8cf08a8ce')
+source=(https://github.com/s3tools/s3cmd/releases/download/v${pkgver}/s3cmd-${pkgver}.tar.gz{,.asc})
+sha512sums=('07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845'
+            'SKIP')
 validpgpkeys=(0D37A8F4A5D183D5541D85D9241769189AC3D00B)
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # python3.9 compatibility fixes
-  patch -Np1 -i ../${pkgname}-1144.patch
-  patch -Np1 -i ../${pkgname}-1137.patch
-}
-
 build() {
   cd "${pkgname}-${pkgver}"
   python setup.py build