updated 3rdparty libraries and integrated patches for pacman 6.0.2 from upstream

1 files changed, 66 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82d466fbd84a..a66f2a011219 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pacman-static
 	pkgdesc = Statically-compiled pacman (to fix or install systems without libc)
 	pkgver = 6.0.2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.archlinux.org/pacman/
 	arch = i486
 	arch = i686
@@ -19,39 +19,52 @@ pkgbase = pacman-static
 	options = !emptydirs
 	source = https://sources.archlinux.org/other/pacman/pacman-6.0.2.tar.xz
 	source = https://sources.archlinux.org/other/pacman/pacman-6.0.2.tar.xz.sig
-	source = https://github.com/nghttp2/nghttp2/releases/download/v1.50.0/nghttp2-1.50.0.tar.xz
-	source = https://c-ares.haxx.se/download/c-ares-1.18.1.tar.gz
-	source = https://c-ares.haxx.se/download/c-ares-1.18.1.tar.gz.asc
-	source = https://curl.haxx.se/download/curl-7.86.0.tar.gz
-	source = https://curl.haxx.se/download/curl-7.86.0.tar.gz.asc
-	source = https://www.openssl.org/source/openssl-3.0.7.tar.gz
-	source = https://www.openssl.org/source/openssl-3.0.7.tar.gz.asc
+	source = pacman-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch
+	source = pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch
+	source = pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch
+	source = pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch
+	source = pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch
+	source = pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch
+	source = https://github.com/nghttp2/nghttp2/releases/download/v1.56.0/nghttp2-1.56.0.tar.xz
+	source = https://c-ares.haxx.se/download/c-ares-1.19.1.tar.gz
+	source = https://c-ares.haxx.se/download/c-ares-1.19.1.tar.gz.asc
+	source = https://curl.haxx.se/download/curl-8.3.0.tar.gz
+	source = https://curl.haxx.se/download/curl-8.3.0.tar.gz.asc
+	source = https://www.openssl.org/source/openssl-3.1.3.tar.gz
+	source = https://www.openssl.org/source/openssl-3.1.3.tar.gz.asc
 	source = ca-dir.patch
 	source = openssl-3.0.7-no-atomic.patch
 	source = https://zlib.net/zlib-1.3.tar.gz
 	source = https://zlib.net/zlib-1.3.tar.gz.asc
-	source = https://tukaani.org/xz/xz-5.2.7.tar.gz
-	source = https://tukaani.org/xz/xz-5.2.7.tar.gz.sig
+	source = https://tukaani.org/xz/xz-5.4.4.tar.gz
+	source = https://tukaani.org/xz/xz-5.4.4.tar.gz.sig
 	source = https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
 	source = https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz.sig
-	source = https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.zst
-	source = https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.zst.sig
-	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig
-	source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2.sig
-	source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.18.0.tar.bz2
-	source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.18.0.tar.bz2.sig
-	source = https://github.com/libarchive/libarchive/releases/download/v3.6.1/libarchive-3.6.1.tar.xz
-	source = https://github.com/libarchive/libarchive/releases/download/v3.6.1/libarchive-3.6.1.tar.xz.asc
+	source = https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.zst
+	source = https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.zst.sig
+	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2.sig
+	source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.6.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.6.tar.bz2.sig
+	source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.22.0.tar.bz2
+	source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.22.0.tar.bz2.sig
+	source = https://github.com/libarchive/libarchive/releases/download/v3.7.2/libarchive-3.7.2.tar.xz
+	source = https://github.com/libarchive/libarchive/releases/download/v3.7.2/libarchive-3.7.2.tar.xz.asc
 	validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD
 	validpgpkeys = B8151B117037781095514CA7BBDFFC92306B1121
 	validpgpkeys = 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
+	validpgpkeys = 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
+	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
+	validpgpkeys = 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
+	validpgpkeys = A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C
+	validpgpkeys = EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
 	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
 	validpgpkeys = 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
 	validpgpkeys = A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C
+	validpgpkeys = EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
 	validpgpkeys = 5ED46A6721D365587791E2AA783FCD8E58BCAFBA
 	validpgpkeys = 3690C240CE51B4670D30AD1C38EE757D69184620
+	validpgpkeys = 22D465F2B4C173803B20C6DE59FCF207FEA7F445
 	validpgpkeys = EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A
 	validpgpkeys = 4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
@@ -59,59 +72,72 @@ pkgbase = pacman-static
 	validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA
 	validpgpkeys = AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD
 	validpgpkeys = A5A45B12AD92D964B89EEE2DEC560C81CEC2276E
+	validpgpkeys = DB2C7CF1B4C265FAEF56E3FC5848A18B8F14184B
 	sha512sums = 9d76fb58c3a50e89a4b92b1f9e3bfdecca3f69e05022ea88fbd34f9df540c4fc688ad4f8b27e77eedb791aa682c27037abe65c789c6d9ee393bae5b620c3df13
 	sha512sums = SKIP
-	sha512sums = c2f7f14972cb268a85966f2bd26ac515fa61d9cf6b6bcaa5cffc04f02a18abf116b15537eb4dfbdfa79e7b1472de7034dfdbce7a082cc5b23627d87e2939e529
-	sha512sums = 1276ec0799916019f8c0af6b55a139701bd15e0ca4a00811d07963893978bc96c107b980f0fd49f81aa70bc8b3b8cd671195ba357c390772d4c2c5643c50c5a5
+	sha512sums = cb9e16c231ddbc4d296642941b58cbdd9e76d3f49e53e118819047917550373e44444575af593c02018beededbfa9d7e8a93a14859be43c630b18701ec8bab28
+	sha512sums = 67f28a6da5e4852c291e0a2e4c6ccce358e961ebe5e8a8cb7277322512ad08815efcbe09f9310cc4ea021900aaae65a9fcf56f5e51cd1fb8af99a06fc962aceb
+	sha512sums = eea39274ca3935a7bc45c81eb9d5dd72f816cd8c7260b77a3a4fd9cdbcdd7643166d643628fd583d987218cadf4fa90ac394947d8aae8af84e1b69d2d3533e45
+	sha512sums = ddd217c235c375e59e130a21aefeb531a3f6624f4e3937de75370d42c39063b2e14196e2d7fcbaa1745c93fd31454793dda031132e299f08aae6cf7b89d5d6fc
+	sha512sums = 8b0ab45c1bb6bd8da0c7e31c2c880fb74c8cbfe03c68ea3c9022fed6028d46b4a4ce94aaf158218576df9dcb01922c984cc29aa43469fafad15322f83bd82a29
+	sha512sums = 4c76fcd3472dea62772155ec0c2ecd49270a4717a3f06964836f4d575378f42ef71b2176f14f1693f15476c85081d593c072108915968467005aa0ff7a1c6741
+	sha512sums = 9754bd637705400cc4c3488d6dd1fc217c765a0925d2a5edfd83d380db0ad9e9a05974afa4fcda40b07287e8e8261b9d8009892cb1c2cc417ce4232a01b0011d
+	sha512sums = 466a94efda626e815a6ef7a890637056339f883d549ea6055e289fd8cd2391130e5682c905c0fb3bd7e955af7f6deb793562c170eb0ee066a4a62085a82ba470
 	sha512sums = SKIP
-	sha512sums = b2d30b4d145a3621862a0f5e6378b5099ba92f4be6e92f4e070ec1299fc5eacba851bf993efd613b366fb81642f3f5cccb6e02adcd472dccc9c5e65c1a51812c
+	sha512sums = 838f96b6faee949ae70060420d1cc31f3eb018160aaebef53acc850d9cd6d68cf15bf5d76e2838474aff05cb7f51b054bbada09a6257c60ff9892852bdc1da41
 	sha512sums = SKIP
-	sha512sums = 6c2bcd1cd4b499e074e006150dda906980df505679d8e9d988ae93aa61ee6f8c23c0fa369e2edc1e1a743d7bec133044af11d5ed57633b631ae479feb59e3424
+	sha512sums = 2388eaa8e99acf1e8af4691a645b9b9af456900c74959e82d4cb02808301e11dcfecc86954a922262b16fa4b664b459894d133ab7d35ec82e1633a33194b7b20
 	sha512sums = SKIP
 	sha512sums = b1873dbb7a49460b007255689102062756972de5cc2d38b12cc9f389b6be412da6797579b1acd3717a8cd2ee118fd9801b94e55f063d4328f050f0876a5eb53c
 	sha512sums = b5887ea77417fae49b6cb1e9fa782d3021f268d5219701d87a092235964f73fa72a31428b630445517f56f2bb69dcbbb24119ef9dbf8b4e40a753369a9f9a16f
 	sha512sums = 185795044461cd78a5545250e06f6efdb0556e8d1bfe44e657b509dd6f00ba8892c8eb3febe65f79ee0b192d6af857f0e0055326d33a881449f3833f92e5f8fb
 	sha512sums = SKIP
-	sha512sums = 06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9
+	sha512sums = 2e27d864c9f346e53afc549d7046385b5d35a749af15d84f69de14612657df2f0e2ce71d3be03d57adadf8fd28549ecf4ef1c214bdcd1f061b5a47239e0104e8
 	sha512sums = SKIP
 	sha512sums = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 	sha512sums = SKIP
-	sha512sums = bf8183dcb42ac306c120836fdd03a13f3f41de72f697a928a7795008acc86e2533ce42f6b554bde7f1ca834f1a0282f8371585b9129ea88441f3f8dd49f1e923
+	sha512sums = c2d88b2c2050262f85be32877142c94e36a8ee451890f579cd2426c7de565fb22d21c369bad11f306093f0b356e935cef5a8ff5a2b0c007ade0f7e7eb944d2a5
 	sha512sums = SKIP
-	sha512sums = b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d
+	sha512sums = bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
 	sha512sums = SKIP
-	sha512sums = 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
+	sha512sums = dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee
 	sha512sums = SKIP
-	sha512sums = c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
+	sha512sums = 17053053fa885f01416433e43072ac716b5d5db0c3edf45b2d6e90e6384d127626e6ae3ce421abba8f449f5ca7e8963f3d62f3565d295847170bc998d1ec1a70
 	sha512sums = SKIP
-	sha512sums = 2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8
+	sha512sums = a21bebb27b808cb7d2ed13a70739904a1b7b55661d8dea83c9897a0129cf71e20c962f13666c571782ff0f4f753ca885619c2097d9e7691c2dee4e6e4b9a2971
 	sha512sums = SKIP
 	b2sums = 648f62307e413cb352ed92e92df1ace510c1fc5e9ddd254baeef071e89cb7dae1786a95d29c5f69e8b03b1a8cfe3cd65671588dc362c8d3b281c092393aad54c
 	b2sums = SKIP
-	b2sums = ae5d89a1f7287a3f2f2b9380ff5e9efb7f0646950d15ed281f268dafc65eb34ad7e34610333b4c98db8a657034ea462e7f1eda80ff2e94a918751dbb112c9a2a
-	b2sums = c03a572726c6bbb24a3e4773673d0c87f4833bb9582aed57a424eea8c965beb6e232f502b61922b124d37403d91ebfefe0db7373673fc22e0d752c4e5036eb07
+	b2sums = b916ed6aa7deb1091b204d09187a3d9006c74976725ba81027841885276f2261415db7688359910ee8cbfd696e8dc310560cfbad2d3c0d88ad263425a6e1aa82
+	b2sums = 8f781728405ae2590302171d0e6b0d723b00861e3a37be6678d8ad40e91217b513241a19a2a9912260ad0ec699eeb53b7c59aaa6c27f2c22cbb9443556bbf9de
+	b2sums = bb41ad66821bb5499825a7411b0ce8001092106d1dfc6d3b5ae10e1da8bc269e1775883520154496a2dc833fffaf11032466ecbadc123365eb2e6fa48bba4f3e
+	b2sums = 64e042cbac411b323038504f843fcf786689a0b6d63b2d8ea5bb3431998dae1e98656923ac96b5ec99c03494aaab1ad8f60d2614b03947df5f607c43411060da
+	b2sums = ce420c696f4a8b4f3f64b4e9c4cdef0ea0225900145f10834314fcc8c371f84352453bd4c6c613f979f81d14453732c248a2a225c4bf5e2c678c9548ced11b31
+	b2sums = 0dcdefcc7b4c15a408712c50b6371b76197a577d5069501225b8815c401fda8a40d897b51afe8f93ff54d0f1ac7f2a9054f016c5e5cb25d5cc2fe89b3819977b
+	b2sums = bb8270a636852a1c542d683feba7c55be74808ac17f6ac6774d4122a74d8d1fa4821234fa945b4c12aabf7bd7b608e70b45f729e5c7cd03cfebf8e285e419734
+	b2sums = 4b6c9593edb1a91ab76d54ddacb1cd5d67006d5e628ea1f3289f54e9360be32abeb5d8fc7d23e193feab3e7928e8efde82757eb12fe217dc92ed0d9132bedf5d
 	b2sums = SKIP
-	b2sums = 874805e4b100130ffa7196fb1ea7ab6ee38a00607194c7a6543a7cef904f08506811d6d7f95939985b0765f3a1789a3a3727c8429e050f47c373ca8ae4e6a8dc
+	b2sums = 513caa9bc548fcb8d664b221e555df3e1a6457a856d4e787a28544d15c6f528b31ae57932b43bce1e3cf1e67faebe7de6c68eeeef73b1e124fab17f71c8d1ffa
 	b2sums = SKIP
-	b2sums = 141881071fa62f056c514e7c653a61c59cc45fe951ec094041e23fb5e619133b7ebbfe31cd8203969c9d8842b8cbc10ec58da67cc181761a11c1cfdd0869df9a
+	b2sums = a279a5c80191b95ca735aed20beb56ab899ee302258ce3529c377820739bf55075537cd900b06b3ca07b85efdce95cb081bcad1dfd4d33f81695c7ef0cefdf03
 	b2sums = SKIP
 	b2sums = 928c0cb15cca44bb7f194db9f95985f6c50aacd3e22fe2eb60ece26ed76469289f10d303c645a48407f3d6435ac66f25dd3c4cbc56fdc5dfd9ea2566feda9ff8
 	b2sums = c72172cf57389718b4722c3482ddaf9c2fc02aafe391c68edeb92d41fd6345a0a98f6fd63ddf01b33fe59a7a3f270ff1ccad432feba578b7b7e0170cd1dea7ef
 	b2sums = 7dd64103163363f5e1fba57d2e436342768d1b702154a261185eb7eda42c51c17fb2b44c58381050d7e42d4a8ddb9817be78a8fd6291d1c40fbc45436d3feacd
 	b2sums = SKIP
-	b2sums = 5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b
+	b2sums = 0ade3767651a07a6bb4d53b510d7e97239e182788c42bc3388b97c54463ccaa968e27bcb88d34697df70381eea91279615f2622b5493ae2da22632e9576d8989
 	b2sums = SKIP
 	b2sums = 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad
 	b2sums = SKIP
-	b2sums = 513e4526a92bcb59416b3457d186a30e554f9e0cf21d7114eb3e9fbcbd9d662c8d95cf0b06237f6fe3f756862c63de0aa146d6a23cb4111c16e6459608d115f1
+	b2sums = 2c2dc95f227e661ada23d8f6141bcd293505ce14e605f946ae00d4d4ac37d10b4eb08279ef7560618c67caf266431f76686fda5ae1921d698a6a93bbaf9a0052
 	b2sums = SKIP
-	b2sums = 6748c463256b7d0a05fe89a63c5f3abda1975d861c35821248664f2f09cd2273ef619d12408b6107a99519939ca7214f492e705c29f52f7bbdc422237281c1ca
+	b2sums = bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27
 	b2sums = SKIP
-	b2sums = 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d
+	b2sums = 462af1eab69e157f65f8134a492cde01dd1e0ee00609f2c2585e742fb9c5532b3fd96054b4fb7449e305690f70aa7a120085db42e2de2e3b0ef8b1603e7e5846
 	b2sums = SKIP
-	b2sums = a071b839eb75455378514f003920cd387320e9fae416e71151cf6ac1b4a058b58ed054450b79e3eeaf820ff5324ea14efa003612867477b7379a776942d62be6
+	b2sums = 6c03f4252391a114233fed284bf9eba03fa7b67328b506c01554fbd4239e0f3ede0bc79d82e9f21718084ca17945d628707d4451ac765a8f36d282e7e2d75f8e
 	b2sums = SKIP
-	b2sums = e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf
+	b2sums = 7221db4811a965ee61d879a2603480363628a19995a351b572d099be9f35576d76f0b0822f9a5a47d9929bc094d4444fd8eafcb4a073e39bb3aa797d4b926ca5
 	b2sums = SKIP
 
 pkgname = pacman-static