upgpkg: 2.10.1-1o

* Rewrite a patch for easier rebasing
* Switch to signed tarballs. Inspired by
  https://github.com/aws/aws-cli/blob/v2/proposals/source-install.md

3 files changed, 58 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e25500ca9c35..2a7602826588 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: David Birks <david@birks.dev>
 
 pkgname=aws-cli-v2
-pkgver=2.9.18
+pkgver=2.10.1
 pkgrel=1
 pkgdesc='Unified command line interface for Amazon Web Services (version 2)'
 arch=(any)
@@ -17,17 +17,21 @@ 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)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/aws/aws-cli/archive/$pkgver.tar.gz"
+source=("https://awscli.amazonaws.com/awscli-$pkgver.tar.gz"{,.sig}
         prompt-toolkit-3.0.29.diff
         build-ac.index-in-tmp.diff
         fix-env.diff)
-sha256sums=('feecf0cfd8b3b35d68ca02ee3dd2e0ffa1133e9be12049d080c4491a57c52888'
+sha256sums=('75bbec828b86d3b424eda42d14381e9e0ad0309f33813f9143077d432ee98a9f'
+            'SKIP'
             'c4f0bfe21bef89934137c57ee4771db57e8dad0f995634ee4de0890dcf45a636'
-            '3f5633c7f83b346f79a9af2baee476e6967ef8fa62636a535dee1e011ef978db'
+            '0267e41561ab2c46a97ebfb024f0b047aabc9e6b9866f204b2c1a84ee5810d63'
             '893d61d7e958c3c02bfa1e03bf58f6f6abd98849d248cc661f1c56423df9f312')
+validpgpkeys=(
+  'FB5DB77FD5C118B80511ADA8A6310ACC4672475C'  # the key mentioned on https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
+)
 
 prepare() {
-  cd aws-cli-$pkgver
+  cd awscli-$pkgver
 
   # Don't treat warnings as errors
   sed -i '/"error::/d' pyproject.toml
@@ -43,7 +47,7 @@ prepare() {
 }
 
 build() {
-  cd aws-cli-$pkgver
+  cd awscli-$pkgver
 
   # flit-core adds runtime dependencies to reported build-time dependencies [1],
   # and upstream often lags behind the latest dependencies [2], thus --skip-dependency-check
@@ -55,7 +59,7 @@ build() {
 }
 
 check() {
-  cd aws-cli-$pkgver
+  cd awscli-$pkgver
 
   export AWS_SECRET_ACCESS_KEY=fake_key
   export AWS_ACCESS_KEY_ID=fake_id
@@ -68,7 +72,7 @@ check() {
 }
 
 package() {
-  cd aws-cli-$pkgver
+  cd awscli-$pkgver
   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"
diff --git a/build-ac.index-in-tmp.diff b/build-ac.index-in-tmp.diff
index 2a47158ca5a4..40c5fb5eff8f 100644
--- a/build-ac.index-in-tmp.diff
+++ b/build-ac.index-in-tmp.diff
@@ -1,30 +1,29 @@
---- a/backends/pep517.py	2022-10-26 23:06:36.402013172 +0800
-+++ b/backends/pep517.py	2022-10-26 23:09:02.888234183 +0800
-@@ -32,6 +32,7 @@
+--- a/backends/pep517.py	2023-02-16 02:15:30.000000000 +0800
++++ b/backends/pep517.py	2023-02-18 01:31:54.245328767 +0800
+@@ -30,6 +30,7 @@
+ import os
+ import glob
  import tarfile
++import tempfile
  import shutil
  import sys
-+import tempfile
  import zipfile
- from pathlib import Path
- 
-@@ -205,12 +206,13 @@
+@@ -214,14 +215,16 @@
  
  
  def _build_and_inject_ac_index(build_dir, extracted_wheel_dir):
 -    ac_index_build_name = _build_ac_index(build_dir)
--    print("Adding auto-complete index into wheel")
++    ac_index_dir = tempfile.mkdtemp()
++    ac_index_build_name = _build_ac_index(ac_index_dir)
+     extracted_ac_index = os.path.join(extracted_wheel_dir, AC_INDEX_REL_PATH)
+     _remove_file_if_exists(extracted_ac_index)
+     print("Adding auto-complete index into wheel")
 -    os.rename(
--        ac_index_build_name,
--        os.path.join(extracted_wheel_dir, AC_INDEX_REL_PATH),
--    )
-+    with tempfile.TemporaryDirectory() as ac_index_dir:
-+        ac_index_build_name = _build_ac_index(ac_index_dir)
-+        print("Adding auto-complete index into wheel")
-+        shutil.copy2(
-+            ac_index_build_name,
-+            os.path.join(extracted_wheel_dir, AC_INDEX_REL_PATH),
-+        )
++    shutil.copy2(
+         ac_index_build_name,
+         extracted_ac_index,
+     )
++    shutil.rmtree(ac_index_dir)
  
  
  def _build_ac_index(build_dir, rebuild=True):
diff --git a/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc b/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc
new file mode 100644
index 000000000000..595184845c66
--- /dev/null
+++ b/keys/pgp/FB5DB77FD5C118B80511ADA8A6310ACC4672475C.asc
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF2Cr7UBEADJZHcgusOJl7ENSyumXh85z0TRV0xJorM2B/JL0kHOyigQluUG
+ZMLhENaG0bYatdrKP+3H91lvK050pXwnO/R7fB/FSTouki4ciIx5OuLlnJZIxSzx
+PqGl0mkxImLNbGWoi6Lto0LYxqHN2iQtzlwTVmq9733zd3XfcXrZ3+LblHAgEt5G
+TfNxEKJ8soPLyWmwDH6HWCnjZ/aIQRBTIQ05uVeEoYxSh6wOai7ss/KveoSNBbYz
+gbdzoqI2Y8cgH2nbfgp3DSasaLZEdCSsIsK1u05CinE7k2qZ7KgKAUIcT/cR/grk
+C6VwsnDU0OUCideXcQ8WeHutqvgZH1JgKDbznoIzeQHJD238GEu+eKhRHcz8/jeG
+94zkcgJOz3KbZGYMiTh277Fvj9zzvZsbMBCedV1BTg3TqgvdX4bdkhf5cH+7NtWO
+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
+-----END PGP PUBLIC KEY BLOCK-----