From 29d53b2c1c54b28a78b0dffa372bde10be6f0f1b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 8 Feb 2024 00:31:02 +0000 Subject: [PATCH] core/pacman to 6.0.2-9 --- core/pacman/.SRCINFO | 22 +++++++++++++++++++--- core/pacman/PKGBUILD | 33 +++++++++++++++++++++++++++------ core/pacman/makepkg.conf | 13 ++++++++----- 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/core/pacman/.SRCINFO b/core/pacman/.SRCINFO index baa9eac1f..bbe273949 100644 --- a/core/pacman/.SRCINFO +++ b/core/pacman/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = pacman pkgdesc = A library-based package manager with dependency support pkgver = 6.0.2 - pkgrel = 8 + pkgrel = 9 url = https://www.archlinux.org/pacman/ arch = x86_64 - license = GPL + license = GPL-2.0-or-later checkdepends = python checkdepends = fakechroot makedepends = meson @@ -34,6 +34,14 @@ pkgbase = pacman 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 = pacman-change-default-checksum-from-md5-to-sha256.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f79a83cd7dde50c66e.patch + source = pacman-sort-debuginfod-repro.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a57e45ef9c62312fee.patch + source = pacman-split-off-strip-debug.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/7a4fff3310ba2eadd3d5428cbb92e58eb2ee853b.patch + source = pacman-ignore-a-files.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/00d2b1f90261bf77eaaf262d2504af016562f2ac.patch + source = pacman-early-err-git.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/3aa096a74f717d31650e0eb3cf34e9a5ebadc313.patch + source = pacman-fix-gnupg-binary-data.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86ec26b2d33372a4b3bda48f22c4a9f226c3ccce.patch + source = pacman-fix-gnupg-newsig-check.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/16a064701a30d7e1175e1185cc6da44238302fab.patch + source = pacman-check-pipes-gnupg.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/f8c2e59ec57c86827b1f1b1c2f6760dc3e59fe40.patch source = pacman.conf source = makepkg.conf validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD @@ -46,7 +54,15 @@ pkgbase = pacman sha256sums = d87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312 sha256sums = 8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1 sha256sums = b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1 + sha256sums = cf749ad981e8f3dedd89c05a5e69a9c91d1e58ef9407e8f8e04ba9c183939623 + sha256sums = 17e7af22533984924aaf1cf36c74aa26b46b04ad140cd76b65521be906bd3ff7 + sha256sums = 94d1f3575d0c3faf8bf11fee8e5ef36c8b339ebfd24868931903ba179ffecf4e + sha256sums = 96efb79a96abf8cdcecb9f8dc461552549cf46159f44bb4160eb073e1ea5000a + sha256sums = 0ac6a34e6fc126a243a642e509f459f6cde20af213ab949791a5cc325cf031f9 + sha256sums = 6e81b34e6a5f312d48ce3aaca0f02ddd10b7a43325cb32acf7666b6b7ac41552 + sha256sums = 250598a27a3077ec1dfe97a30af8bb0daf449d3ab456ed6a0c7a5bea0eb58f51 + sha256sums = 94c273f07e4e28125b6002567c62e1f6c65f543597de6a8bd79e8c5bf6e4a125 sha256sums = 656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a - sha256sums = b46bca4d3f8b41138923b7a1d7ada272b56ad8b89d0d6ce09145638bdf15185d + sha256sums = f2791b51588104ec6dbaafa389451056f3c61fa6c19510dcce3a9a6cc19cba29 pkgname = pacman diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 774677791..36789632e 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -11,11 +11,11 @@ pkgname=pacman pkgver=6.0.2 -pkgrel=8 +pkgrel=9 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" -license=('GPL') +license=('GPL-2.0-or-later') depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist' 'gettext' 'gawk' 'coreutils' 'gnupg' 'grep') makedepends=('meson' 'asciidoc' 'doxygen') @@ -34,6 +34,14 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch + pacman-change-default-checksum-from-md5-to-sha256.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f79a83cd7dde50c66e.patch + pacman-sort-debuginfod-repro.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a57e45ef9c62312fee.patch + pacman-split-off-strip-debug.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/7a4fff3310ba2eadd3d5428cbb92e58eb2ee853b.patch + pacman-ignore-a-files.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/00d2b1f90261bf77eaaf262d2504af016562f2ac.patch + pacman-early-err-git.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/3aa096a74f717d31650e0eb3cf34e9a5ebadc313.patch + pacman-fix-gnupg-binary-data.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86ec26b2d33372a4b3bda48f22c4a9f226c3ccce.patch + pacman-fix-gnupg-newsig-check.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/16a064701a30d7e1175e1185cc6da44238302fab.patch + pacman-check-pipes-gnupg.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/f8c2e59ec57c86827b1f1b1c2f6760dc3e59fe40.patch 0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -47,11 +55,19 @@ sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' 'd87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312' '8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1' 'b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1' + 'cf749ad981e8f3dedd89c05a5e69a9c91d1e58ef9407e8f8e04ba9c183939623' + '17e7af22533984924aaf1cf36c74aa26b46b04ad140cd76b65521be906bd3ff7' + '94d1f3575d0c3faf8bf11fee8e5ef36c8b339ebfd24868931903ba179ffecf4e' + '96efb79a96abf8cdcecb9f8dc461552549cf46159f44bb4160eb073e1ea5000a' + '0ac6a34e6fc126a243a642e509f459f6cde20af213ab949791a5cc325cf031f9' + '6e81b34e6a5f312d48ce3aaca0f02ddd10b7a43325cb32acf7666b6b7ac41552' + '250598a27a3077ec1dfe97a30af8bb0daf449d3ab456ed6a0c7a5bea0eb58f51' + '94c273f07e4e28125b6002567c62e1f6c65f543597de6a8bd79e8c5bf6e4a125' 'ba91c92fbae492be13df12dd34e22b00e1a63c706fdd328e8d9a907c5d517e71' 'bb8d53dd1136c314aacbc275f36936112d04ec6c0ebc882eefe6e46bd86e6db5' '11b3ed535d0cb981ce5927ed9b308615e4f6b6a8e2aef6e2e15a59df956bfdab' '6456e1ad704565d1e401b2b94fcfd1c75be290aa92ac9437343625209e7793ab' - 'c482f4cae70219ac4922e827ed3a4bd76df57774285f55a1cb67e95abe177ebc') + '963936676b07ba2fe5a0af00d0b3c49b2d1f0575f902534efbb94c4a45d77cfd') prepare() { cd "$pkgname-$pkgver" @@ -115,9 +131,14 @@ package() { -e "s|@CHOST[@]|$mychost|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" sed -i $pkgdir/etc/pacman.conf -e "s|@CARCH[@]|$mycarch|g" - if [[ $CARCH == "arm" ]]; then - sed -i 's/,-z,now//' "$pkgdir/etc/makepkg.conf" - fi + + local wantsdir="$pkgdir/usr/lib/systemd/system/sockets.target.wants" + install -dm755 "$wantsdir" + + local unit + for unit in dirmngr gpg-agent gpg-agent-{browser,extra,ssh} keyboxd; do + ln -s "../${unit}@.socket" "$wantsdir/${unit}@etc-pacman.d-gnupg.socket" + done } # vim: set ts=2 sw=2 et: diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf index 9c35791f1..220ad17ca 100644 --- a/core/pacman/makepkg.conf +++ b/core/pacman/makepkg.conf @@ -1,4 +1,6 @@ #!/hint/bash +# shellcheck disable=2034 + # # /etc/makepkg.conf # @@ -46,13 +48,13 @@ CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt -fexceptions \ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" LTOFLAGS="" -#RUSTFLAGS="-C opt-level=2" +RUSTFLAGS="" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags -DEBUG_CFLAGS="-g -fvar-tracking-assignments" -DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" -#DEBUG_RUSTFLAGS="-C debuginfo=2" +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" +DEBUG_RUSTFLAGS="" ######################################################################### # BUILD ENVIRONMENT @@ -139,7 +141,7 @@ DBGSRCDIR="/usr/src/debug" COMPRESSGZ=(gzip -c -f -n) COMPRESSBZ2=(bzip2 -c -f) COMPRESSXZ=(xz -c -z -) -COMPRESSZST=(zstd -c -z -q -) +COMPRESSZST=(zstd -c -T0 --ultra -20 -) COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) @@ -159,3 +161,4 @@ SRCEXT='.src.tar.gz' # #-- Command used to run pacman as root, instead of trying sudo and su #PACMAN_AUTH=() +# vim: set ft=sh ts=2 sw=2 et: