diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-07 03:58:35 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-08 12:14:24 -0400 |
| commit | d054377af1728f5feb6488d3c7992de150ca1dd8 (patch) | |
| tree | efa736b7966302d443e4cc1c1c7fabcf609b3670 | |
| parent | b89841b6da141b8956c24d142f72b0ff5937a572 (diff) | |
[pacman]: add keyring updatedb patch
| -rw-r--r-- | libre/pacman/9002-pacman-key-updatedb.patch | 16 | ||||
| -rw-r--r-- | libre/pacman/PKGBUILD | 9 |
2 files changed, 22 insertions, 3 deletions
diff --git a/libre/pacman/9002-pacman-key-updatedb.patch b/libre/pacman/9002-pacman-key-updatedb.patch new file mode 100644 index 000000000..c134ba871 --- /dev/null +++ b/libre/pacman/9002-pacman-key-updatedb.patch @@ -0,0 +1,16 @@ +this helps to ensure that an expired key will be trusted again, +immediately after the updated keyring package is installed + +diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in +index f7f1dd6..c5fb73f 100644 +--- a/scripts/pacman-key.sh.in ++++ b/scripts/pacman-key.sh.in +@@ -599,7 +599,7 @@ verify_sig() { + + updatedb() { + msg "$(gettext "Updating trust database...")" +- if ! "${GPG_PACMAN[@]}" --batch --check-trustdb ; then ++ if ! "${GPG_PACMAN[@]}" --batch --check-trustdb --yes ; then + error "$(gettext "Trust database could not be updated.")" + exit 1 + fi diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index e37c193a7..09d4e129e 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -16,7 +16,7 @@ pkgname=pacman pkgver=6.0.1 pkgrel=4 -pkgrel+=.parabola2 +pkgrel+=.parabola3 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') arch+=('armv7h' 'i686') @@ -47,7 +47,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig source=( ${source[*]/pacman.conf/} $(printf "pacman.conf.%s\n" "${arch[@]}" | sort) ) # pacman.conf.{armv7h,i686,x86_64} source=( ${source[*]/makepkg.conf/makepkg.conf.in} ) # makepkg.conf.in source+=(dummy.conf - 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch) + 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch + 9002-pacman-key-updatedb.patch) source_armv7h=(0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) @@ -62,7 +63,8 @@ sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731' 'a9745669798187ae1862481eceda93691d64c48c8198b06b9df85fa6f21966de' # pacman.conf.i686 'aac3d5414de69f8cd3126adc85066299c8f6149bd12dffceb1049e124aab6f34') # pacman.conf.x86_64 sha256sums+=('8fca32bf5ee85b67c93983d7e1c93734de5e715b3bb732f7e48b88da7844f94b' - '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8') + '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8' + '98396eba73b305da7e86a163bb1fcb5ff2cb2c5dd1e0ccf09fd1e7e0222fe3c5') sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc' '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9' '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb') @@ -83,6 +85,7 @@ prepare() { # From Parabola patch -p1 -i ../9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch + patch -p1 -i ../9002-pacman-key-updatedb.patch # Generate the architecture-specific makepkg.conf files local carch mycarch mychost myflags myldflags |