[arch-commits] Commit in pacman/trunk (PKGBUILD)

[Allan McRae]

    Date: Thursday, June 10, 2021 @ 02:30:29
  Author: allan
Revision: 417619

upgpkg: pacman 6.0.0-3: backports from upstream

Modified:
  pacman/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-10 02:27:55 UTC (rev 417618)
+++ PKGBUILD	2021-06-10 02:30:29 UTC (rev 417619)
@@ -3,7 +3,7 @@
 
 pkgname=pacman
 pkgver=6.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -21,13 +21,24 @@
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan at archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}
+        pacman-6.0.0-fix-404-download.patch::https://git.archlinux.org/pacman.git/patch/?id=3401f9e142ac4c701cd98c52618cb13164f2146b
+        pacman-6.0.0-fix-key-import-double-free.patch::https://git.archlinux.org/pacman.git/patch/?id=542910d684191eb7f25ddc5d3d8fe3060028a267
         pacman.conf
         makepkg.conf)
 sha256sums=('004448085a7747bdc7a0a4dd5d1fb7556c6b890111a06e029ab088f9905d4808'
             'SKIP'
+            'fe7e037e1b84bfa5bc401650d148c2a2e87d827705a6ec18a596ff5eea3cc0fd'
+            'a51b57dd47818d97e29ac0b8604b4b409916bbe6029adfbb03ac7e7c2b2a0819'
             '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7'
             '89d1dd7e7064243754efc1993a8843a400afd5d7c15070787985376ec346d6d9')
 
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 -i "$srcdir"/pacman-6.0.0-fix-404-download.patch
+  patch -p1 -i "$srcdir"/pacman-6.0.0-fix-key-import-double-free.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"