upgpkg: 2.13.28-1

* Drop the patch to enable zsh completions automatically as the related
  upstream pull request appears rejected [1]. This effectively reverts
  [2].
* Cleanup ruamel-yaml patches after the upstream issue [3] is fixed.
* Manually bump expired PGP key

[1] https://github.com/aws/aws-cli/pull/2708
[2] https://gitlab.archlinux.org/archlinux/packaging/packages/aws-cli-v2/-/commit/db0f45f059d6dca17af482320bb64c2bfd5bbd54
[3] https://sourceforge.net/p/ruamel-yaml/tickets/482/

4 files changed, 41 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dd2850a9637..be6b7b82959f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = aws-cli-v2
 	pkgdesc = Unified command line interface for Amazon Web Services (version 2)
-	pkgver = 2.13.25
+	pkgver = 2.13.28
 	pkgrel = 1
 	url = https://github.com/aws/aws-cli/tree/v2
+	install = aws-cli-v2.install
 	arch = any
 	license = Apache
 	checkdepends = python-pytest
@@ -28,22 +29,18 @@ pkgbase = aws-cli-v2
 	depends = python-urllib3
 	provides = aws-cli
 	conflicts = aws-cli
-	source = https://awscli.amazonaws.com/awscli-2.13.25.tar.gz
-	source = https://awscli.amazonaws.com/awscli-2.13.25.tar.gz.sig
+	source = https://awscli.amazonaws.com/awscli-2.13.28.tar.gz
+	source = https://awscli.amazonaws.com/awscli-2.13.28.tar.gz.sig
 	source = build-ac.index-in-tmp.diff
 	source = fix-env.diff
 	source = aws-cli-v2-tz-fix.patch::https://github.com/aws/aws-cli/commit/95aa5ccc7bfaeafc0373e8472c8459030ac18920.patch
-	source = aws-cli-v2-fix-zsh-completions.patch::https://github.com/aws/aws-cli/commit/006957ebf258e39fd1692151166a1d245e06a32f.patch
-	source = aws-cli-v2-ruamel-yaml-0.17.22.patch::https://github.com/aws/aws-cli/commit/96c855c44a6bd05e52cf98fa3c8e00db637f0a7b.patch
-	source = ruamel-yaml-0.17.32.patch
+	source = aws-cli-v2-ruamel-yaml-v4.patch::https://github.com/aws/aws-cli/commit/0331e399231b6cdb54b7b3bdd01a793647053cdd.patch
 	validpgpkeys = FB5DB77FD5C118B80511ADA8A6310ACC4672475C
-	sha256sums = 32d464f4c33b8903f1886d522ea7bced7c369ed67a64eb5bcc180a63889f581a
+	sha256sums = f26be381ee1e278167bdd2e5a6e2c43d9b0b2b72337e4e0f5bfd7bd152a9466b
 	sha256sums = SKIP
 	sha256sums = 0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63
 	sha256sums = 893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312
 	sha256sums = 4fc614b8550d7363bb2d578c6b49326c9255203eb2f933fd0551f96ed5fb1f30
-	sha256sums = 0e4064c45e8f987fd8aaa48e1b289de413d96168fc14432c2072a03068358742
-	sha256sums = 12f9aacb46e5754ea3935b29e07033285cdf66047fc39520d9f716b33edb5a7e
-	sha256sums = 4a245036c6e45328667d46e179751188bc6606bb715f3072ac45105e443e14e9
+	sha256sums = 20a9fcd5235bf606e86a6ec06ca30307ebbcfd36063d2ac561c1f9eff7243046
 
 pkgname = aws-cli-v2
diff --git a/PKGBUILD b/PKGBUILD
index 8d90c8922291..a93144c63a2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=aws-cli-v2
 # https://github.com/aws/aws-cli/raw/v2/CHANGELOG.rst
-pkgver=2.13.25
+pkgver=2.13.28
 pkgrel=1
 pkgdesc='Unified command line interface for Amazon Web Services (version 2)'
 arch=(any)
@@ -18,21 +18,18 @@ makedepends=(python-build python-wheel python-flit-core python-installer)
 checkdepends=(python-pytest python-pytest-xdist python-jsonschema python-mock procps-ng)
 provides=(aws-cli)
 conflicts=(aws-cli)
+install=aws-cli-v2.install
 source=("https://awscli.amazonaws.com/awscli-$pkgver.tar.gz"{,.sig}
         build-ac.index-in-tmp.diff
         fix-env.diff
         "$pkgname-tz-fix.patch::https://github.com/aws/aws-cli/commit/95aa5ccc7bfaeafc0373e8472c8459030ac18920.patch"
-        "${pkgname}-fix-zsh-completions.patch::https://github.com/aws/aws-cli/commit/006957ebf258e39fd1692151166a1d245e06a32f.patch"
-        "${pkgname}-ruamel-yaml-0.17.22.patch::https://github.com/aws/aws-cli/commit/96c855c44a6bd05e52cf98fa3c8e00db637f0a7b.patch"
-        ruamel-yaml-0.17.32.patch)
-sha256sums=('32d464f4c33b8903f1886d522ea7bced7c369ed67a64eb5bcc180a63889f581a'
+        "${pkgname}-ruamel-yaml-v4.patch::https://github.com/aws/aws-cli/commit/0331e399231b6cdb54b7b3bdd01a793647053cdd.patch")
+sha256sums=('f26be381ee1e278167bdd2e5a6e2c43d9b0b2b72337e4e0f5bfd7bd152a9466b'
             'SKIP'
             '0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63'
             '893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312'
             '4fc614b8550d7363bb2d578c6b49326c9255203eb2f933fd0551f96ed5fb1f30'
-            '0e4064c45e8f987fd8aaa48e1b289de413d96168fc14432c2072a03068358742'
-            '12f9aacb46e5754ea3935b29e07033285cdf66047fc39520d9f716b33edb5a7e'
-            '4a245036c6e45328667d46e179751188bc6606bb715f3072ac45105e443e14e9')
+            '20a9fcd5235bf606e86a6ec06ca30307ebbcfd36063d2ac561c1f9eff7243046')
 validpgpkeys=(
   'FB5DB77FD5C118B80511ADA8A6310ACC4672475C'  # the key mentioned on https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
 )
@@ -52,18 +49,9 @@ prepare() {
   # Fix possible test failure with a non-UTC time zone (https://bugs.archlinux.org/task/77919)
   patch -Np1 -i ../$pkgname-tz-fix.patch
 
-  # Make zsh completions automatically enabled
-  # From https://github.com/aws/aws-cli/pull/2708 (unmerged)
-  patch -Np1 -i ../${pkgname}-fix-zsh-completions.patch
-
-  # Fix tests with ruamel.yaml >= 0.17.22
+  # Fix tests with newer ruamel.yaml
   # https://github.com/aws/aws-cli/pull/8072 (unmerged)
-  patch -Np1 -i ../${pkgname}-ruamel-yaml-0.17.22.patch
-
-  # Fix compatibility with ruamel.yaml >= 0.17.30
-  # The patch is from Fedora https://src.fedoraproject.org/rpms/awscli2/blob/rawhide/f/ruamel-yaml-0.17.32.patch
-  # TODO: investigate and submit it to upstream, probably along with earlier ruamel.yaml fixes in https://github.com/aws/aws-cli/pull/8072
-  patch -Np1 -i ../ruamel-yaml-0.17.32.patch
+  patch -Np1 -i ../${pkgname}-ruamel-yaml-v4.patch
 }
 
 build() {
@@ -96,5 +84,4 @@ package() {
   python -m installer --destdir="$pkgdir" dist/*.whl
   install -Dm 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm 644 bin/aws_bash_completer "$pkgdir/usr/share/bash-completion/completions/aws"
-  install -Dm 644 bin/aws_zsh_completer.sh "${pkgdir}/usr/share/zsh/site-functions/_aws"
 }
diff --git a/aws-cli-v2.install b/aws-cli-v2.install
new file mode 100644
index 000000000000..118b791e81b2
--- /dev/null
+++ b/aws-cli-v2.install
@@ -0,0 +1,12 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 2.13.25)" -le 0 ]; then
+    cat << EOF
+===> zsh completions are no longer automatically enabled.
+===> You can put the following line in a zsh startup script
+===> or run it manually before using aws zsh completions.
+===>     source /usr/bin/aws_zsh_completer.sh
+EOF
+  fi
+}
diff --git a/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc b/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc
index 595184845c66..0dcdfccc0bb1 100644
--- a/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc
+++ b/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc
@@ -11,19 +11,19 @@ lrFj6UwAsGukBTAOxC0l/dnSmZhJ7Z1KmEWilro/gOrjtOxqRQutlIqG22TaqoPG
 fYVN+en3Zwbt97kcgZDwqbuykNt64oZWc4XKCa3mprEGC3IbJTBFqglXmZ7l9ywG
 EEUJYOlb2XrSuPWml39beWdKM8kzr1OjnlOm6+lpTRCBfo0wa9F8YZRhHPAkwKkX
 XDeOGpWRj4ohOx0d2GWkyV5xyN14p2tQOCdOODmz80yUTgRpPVQUtOEhXQARAQAB
-tCFBV1MgQ0xJIFRlYW0gPGF3cy1jbGlAYW1hem9uLmNvbT6JAlQEEwEIAD4WIQT7
-Xbd/1cEYuAURraimMQrMRnJHXAUCXYKvtQIbAwUJB4TOAAULCQgHAgYVCgkICwIE
-FgIDAQIeAQIXgAAKCRCmMQrMRnJHXJIXEAChLUIkg80uPUkGjE3jejvQSA1aWuAM
-yzy6fdpdlRUz6M6nmsUhOExjVIvibEJpzK5mhuSZ4lb0vJ2ZUPgCv4zs2nBd7BGJ
-MxKiWgBReGvTdqZ0SzyYH4PYCJSE732x/Fw9hfnh1dMTXNcrQXzwOmmFNNegG0Ox
-au+VnpcR5Kz3smiTrIwZbRudo1ijhCYPQ7t5CMp9kjC6bObvy1hSIg2xNbMAN/Do
-ikebAl36uA6Y/Uczjj3GxZW4ZWeFirMidKbtqvUz2y0UFszobjiBSqZZHCreC34B
-hw9bFNpuWC/0SrXgohdsc6vK50pDGdV5kM2qo9tMQ/izsAwTh/d/GzZv8H4lV9eO
-tEis+EpR497PaxKKh9tJf0N6Q1YLRHof5xePZtOIlS3gfvsH5hXA3HJ9yIxb8T0H
-QYmVr3aIUes20i6meI3fuV36VFupwfrTKaL7VXnsrK2fq5cRvyJLNzXucg0WAjPF
-RrAGLzY7nP1xeg1a0aeP+pdsqjqlPJom8OCWc1+6DWbg0jsC74WoesAqgBItODMB
-rsal1y/q+bPzpsnWjzHV8+1/EtZmSc8ZUGSJOPkfC7hObnfkl18h+1QtKTjZme4d
-H17gsBJr+opwJw/Zio2LMjQBOqlm3K1A4zFTh7wBC7He6KPQea1p2XAMgtvATtNe
-YLZATHZKTJyiqA==
-=vYOk
+tCFBV1MgQ0xJIFRlYW0gPGF3cy1jbGlAYW1hem9uLmNvbT6JAlQEEwEIAD4CGwMF
+CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQT7Xbd/1cEYuAURraimMQrMRnJHXAUC
+ZMKcEgUJCSEf3QAKCRCmMQrMRnJHXCilD/4vior9J5tB+icri5WbDudS3ak/ve4q
+XS6ZLm5S8l+CBxy5aLQUlyFhuaaEHDC11fG78OduxatzeHENASYVo3mmKNwrCBza
+NJaeaWKLGQT0MKwBSP5aa3dva8P/4oUP9GsQn0uWoXwNDWfrMbNI8gn+jC/3MigW
+vD3fu6zCOWWLITNv2SJoQlwILmb/uGfha68o4iTBOvcftVRuao6DyqF+CrHX/0j0
+klEDQFMY9M4tsYT7X8NWfI8Vmc89nzpvL9fwda44WwpKIw1FBZP8S0sgDx2xDsxv
+L8kM2GtOiH0cHqFO+V7xtTKZyloliDbJKhu80Kc+YC/TmozD8oeGU2rEFXfLegwS
+zT9N+jB38+dqaP9pRDsi45iGqyA8yavVBabpL0IQ9jU6eIV+kmcjIjcun/Uo8SjJ
+0xQAsm41rxPaKV6vJUn10wVNuhSkKk8mzNOlSZwu7Hua6rdcCaGeB8uJ44AP3QzW
+BNnrjtoN6AlN0D2wFmfE/YL/rHPxU1XwPntubYB/t3rXFL7ENQOOQH0KVXgRCley
+sHMglg46c+nQLRzVTshjDjmtzvh9rcV9RKRoPetEggzCoD89veDA9jPR2Kw6RYkS
+XzYm2fEv16/HRNYt7hJzneFqRIjHW5qAgSs/bcaRWpAU/QQzzJPVKCQNr4y0weyg
+B8HCtGjfod0p1A==
+=gdMc
 -----END PGP PUBLIC KEY BLOCK-----