From 80b84db39222a9972ee15e2339e9490ca29d1953 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Mon, 16 Sep 2024 16:16:55 +0200 Subject: core/pacman: adapted to 7.0.0 changes --- core/pacman/PKGBUILD | 12 +++++++----- core/pacman/pacman.conf | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index e5966c06..673fbe9e 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,14 +1,16 @@ -# upstream git revision: 557099dcb495b55b563735a21fdc393d0fc050fb +# upstream git revision: 1a52f2e1d641587a1514c99b96d839368076288d depends+=(archlinux32-keyring) # fail if upstream changes makepkg.conf or pacman.conf for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef' ]; then - sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' + # pacman.conf + if [ "${sha256sums[${i}]}" = '0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179' ]; then + sha256sums[${i}]='874e874a4eab31bcfe81c17c2ae8769771bad2dd6c8a65ad73bcc0aea4b9095d' fi - if [ "${sha256sums[${i}]}" = '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' ]; then - sha256sums[${i}]='663cbfe0643ff78c1eeb38d59046707da49bde6ab8226fbc5844457a985cb5bc' + # makepkg.conf + if [ "${sha256sums[${i}]}" = 'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c' ]; then + sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' fi done diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf index 75ba5b82..d425eeaf 100644 --- a/core/pacman/pacman.conf +++ b/core/pacman/pacman.conf @@ -35,6 +35,8 @@ Architecture = auto CheckSpace #VerbosePkgLists #ParallelDownloads = 5 +DownloadUser = alpm +#DisableSandbox # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. -- cgit v1.2.3-70-g09d2