upgpkg: pacman-static 5.1.3-5

staticlibs rebuild: curl, gpgme, libarchive

libarchive 3.4.0 does not compile without zlib, see:
https://github.com/libarchive/libarchive/issues/1214
OTOH, it turns out we weren't using zlib...

1 files changed, 44 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c69997c..8b1055a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,16 +6,17 @@ pkgname=pacman-static
 pkgver=5.1.3
 _cares_ver=1.15.0
 _nghttp2_ver=1.36.0
-_curlver=7.65.0
+_curlver=7.65.1
 _sslver=1.1.1c
+_zlibver=1.2.11
 _xzver=5.2.4
 _bzipver=1.0.6
 _zstdver=1.4.0
-_libarchive_ver=3.3.3
+_libarchive_ver=3.4.0
 _gpgerrorver=1.36
 _libassuanver=2.5.3
-_gpgmever=1.13.0
-pkgrel=4
+_gpgmever=1.13.1
+pkgrel=5
 pkgdesc="Statically-compiled pacman (to fix or install systems without libc)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://www.archlinux.org/pacman/"
@@ -34,12 +35,18 @@ source+=("https://c-ares.haxx.se/download/c-ares-${_cares_ver}.tar.gz"{,.asc})
 validpgpkeys+=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg <daniel@haxx.se>
 # curl
 source+=("https://curl.haxx.se/download/curl-${_curlver}.tar.gz"{,.asc}
-         "https://github.com/curl/curl/commit/c6b58137237a89081b4efc33ae0ecf7282e40132.patch")
+         "https://github.com/curl/curl/commit/094b5f3540fec1401f514bc470f11f441527d30a.patch"
+         "https://github.com/curl/curl/commit/8b987cc7eb8bd58eaf7c184e0db7103a236704bd.patch"
+         "https://github.com/curl/curl/commit/6cc18c59a77bccdd04f65a9abcc9a2b2f88d368d.patch"
+         )
 # openssl
 source+=("https://www.openssl.org/source/openssl-${_sslver}.tar.gz"{,.asc}
          "ca-dir.patch")
 validpgpkeys+=('8657ABB260F056B1E5190839D9C4D26D0E604491'  # Matt Caswell <matt@openssl.org>
                '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') # Richard Levitte <levitte@openssl.org>
+# zlib
+source+=("https://zlib.net/zlib-${_zlibver}.tar.gz"{,.asc})
+validpgpkeys+=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') # Mark Adler <madler@alumni.caltech.edu>
 # xz
 source+=("https://tukaani.org/xz/xz-${_xzver}.tar.gz"{,.sig})
 validpgpkeys+=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
@@ -55,21 +62,25 @@ validpgpkeys+=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'  # Werner Koch
 source+=("https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${_libassuanver}.tar.bz2"{,.sig})
 # gpgme
 source+=("https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${_gpgmever}.tar.bz2"{,.sig})
-
 # libarchive
-source+=("libarchive-${_libarchive_ver}.tar.gz::https://github.com/libarchive/libarchive/archive/v${_libarchive_ver}.tar.gz")
+source+=("https://github.com/libarchive/libarchive/releases/download/v${_libarchive_ver}/libarchive-${_libarchive_ver}.tar.gz"{,.asc})
+validpgpkeys+=('CB55788360B992FA0885C878F040F7196BA99AF4') # Martin Matuska <martin@matuska.org>
 
 sha512sums=('b556b6d01d651a675ce1e153ede776e682ca0eb671cd2be00d7b7c602504dd119291f38ef5c318e675b4ce865db7e1c57e0ebc157510f0fc72e656feb8947e54'
             'SKIP'
             '4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76'
             'a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50'
             'SKIP'
-            '8b4a61e1ed5e4417f8162ca91ec5f5b89305c290298e1d5d2e8222fdeec766f02704788a9206784ebfd9b6198fc9a288ca25f5957b57382bffeeff28c3db8556'
+            '0a4b81d115f579df8301859f7d06d00bd9820cbf2fb6b63c6a49418aa174ab32bcbc8942f032f2ea924d208f147de8a30f02f6b922f627d3d9d4afc60df8a39f'
             'SKIP'
-            'f2f0245724b1901a899423d7cac1906d2f55a44779a9aac2a41dd52839c865a65007c8f15c88be4d309840b371a5994b552b0d2aab0bf6d2ce9549479fa13b3e'
+            'c187c7a4352ef16881272d2ac4856b06b5f7b66da0a65df63736183c30942ad70795cff96a6f2a20084bbe58c36bfc0f56472d0e505fe1300ef5dc05527019de'
+            '23584888c3c430f5b8586bf9cc5138b7f28e43e922781b03ea761a5dd550fefcc47d143e3309ffb0f3fea961670fab551911c9c4ec79610ef0d96249157fe829'
+            '368ec44f907e9b358065f335468fd111e9898d892c87379fb97fef4fcd10dc581c0ffd420054b9996b431ed04695f3bb627a11ddbaae778277407b8d912437ce'
             '8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff'
             'SKIP'
             '3857c298663728a465b5f95a3ef44547efbfb420d755e9dde7f20aa3905171b400e1c126d8db5c2b916c733bbd0724d8753cad16c9baf7b12dcd225a3ee04a97'
+            '73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae'
+            'SKIP'
             'e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578'
             'SKIP'
             '00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12'
@@ -78,20 +89,25 @@ sha512sums=('b556b6d01d651a675ce1e153ede776e682ca0eb671cd2be00d7b7c602504dd11929
             'SKIP'
             'e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617'
             'SKIP'
-            '47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b'
+            '11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8'
             'SKIP'
-            '10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d')
+            '2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852'
+            'SKIP')
 b2sums=('f933a37f201ef842b0e4bb041961db6def67c7e811299966b6e2054ae640180a5a10ba904aa4c4356e351a5cefb228d8853e79c5707ddf08dfa271b054d3b169'
         'SKIP'
         '7c116988c22801688c50d6d514ddb904920cc54d3c3d141137e6ed8b2182ef4e670f0a0fdebaeabfe0df8cdea4cfd1ee3fb083628f035201f104de6f3614dd25'
         'c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed'
         'SKIP'
-        '742e4668103554cdb50f24694bee2510d55ba83f81a1e8f696e157fcdd9a80f4efb23a920734ba6340180eb54ea28e772cbefc1f14911085d03fac099a579901'
+        '1c5378789ba5779355e3af3543c36cefb7019abf490e92ec97b2d768bcc7ba58bf7efe3614a7819794095fe8bc690a534f1183796d9074f9358470b046a27769'
         'SKIP'
-        'dceb8bec87136ac5c77f91fb29b588530da74fbbf7ecaa4d8c14271def4835ea0e7b03c20ae41dca485ea3017782cf737195598904d6d656ba4d57efd87b3eee'
+        '6b61b8b9509028d1df40280f77508e7c7c1a01e0fb06ca98c4b4e630ac6be323538786300840e36aabd8aac916b8dc277bd3cf4dec89c314d79742ca7ae594b4'
+        'e31c7678302f9e899b05a3b72826e0cb2dd4b56cae5820c466b41bbf06084fc93bb0b882a4860729e608a1039a7f58f2e35fbda22000aedbbb6f1a0970f3818a'
+        '49f8ab4bc5cd850a85b3dbd493476967be31bff55300bc0b78f0523d8367d8cd84a348422b16607bcbef9396d6b1528de7f4d9485a367729e0dfcc230cbaee24'
         'bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0'
         'SKIP'
         'e2ff99e8236487f43171c771d0ee89137b73f3d0b2756bcb0d6525c810ffa9f5a3763c3744327fb47cef21eabfc50fff96632f4bbe2cd244206a99daffa0c25a'
+        '6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7'
+        'SKIP'
         '877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b'
         'SKIP'
         'b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e'
@@ -100,9 +116,10 @@ b2sums=('f933a37f201ef842b0e4bb041961db6def67c7e811299966b6e2054ae640180a5a10ba9
         'SKIP'
         'ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a'
         'SKIP'
-        '71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa'
+        '17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70'
         'SKIP'
-        '888c56d8e8d9c83008ff851af9097638bea448e2b24583f06c437e41d8820e020a6f57836a96417133cfde96c245d106cbf82169c1544fc29530a2a2c7537930')
+        '6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462'
+        'SKIP')
 
 export LDFLAGS="$LDFLAGS -static"
 export CC=musl-gcc
@@ -120,8 +137,11 @@ fi
 
 prepare() {
     cd "${srcdir}"/curl-${_curlver}
-    # backport fix for "Operation too slow" timeouts in pacman (FS#62708)
-    patch -p1 -i ../c6b58137237a89081b4efc33ae0ecf7282e40132.patch
+    # backport fix for segfaults in DNS resolution
+    patch -p1 -i ../094b5f3540fec1401f514bc470f11f441527d30a.patch
+    # backport more upstream fixes for crashes in multi stack (FS#62892)
+    patch -p1 -i ../8b987cc7eb8bd58eaf7c184e0db7103a236704bd.patch
+    patch -p1 -i ../6cc18c59a77bccdd04f65a9abcc9a2b2f88d368d.patch
 
     cd "${srcdir}"/libarchive-${_libarchive_ver}
     autoreconf -fi
@@ -182,6 +202,13 @@ build() {
     make libzstd.a
     make PREFIX="${srcdir}"/temp/usr install-pc install-static install-includes
 
+    # zlib
+    cd "${srcdir}/"zlib-${_zlibver}
+    ./configure --prefix="${srcdir}"/temp/usr \
+                --static
+    make libz.a
+    make install
+
     # libarchive
     cd "${srcdir}"/libarchive-${_libarchive_ver}
     CPPFLAGS="-I${srcdir}/temp/usr/include" CFLAGS="-L${srcdir}/temp/usr/lib" \