Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / archlinux-keyring
Commits: 9a592c25 by Christian Hesse at 2024-09-13T16:25:48+02:00 use an extra function in install script - - - - - b60a1e0f by Christian Hesse at 2024-09-13T16:47:25+02:00 force to remove 'lock-never' from pacman's gpg.conf Closes: https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/272 - - - - - 685cf724 by Christian Hesse at 2024-09-13T20:35:33+02:00 upgpkg: 20240709-2: push install script changes - - - - - 3 changed files: - .SRCINFO - PKGBUILD - archlinux-keyring.install Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = archlinux-keyring pkgdesc = Arch Linux PGP keyring pkgver = 20240709 - pkgrel = 1 + pkgrel = 2 url = https://gitlab.archlinux.org/archlinux/archlinux-keyring/ install = archlinux-keyring.install arch = any ===================================== PKGBUILD ===================================== @@ -3,7 +3,7 @@ pkgname=archlinux-keyring pkgver=20240709 -pkgrel=1 +pkgrel=2 pkgdesc='Arch Linux PGP keyring' arch=('any') url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/' ===================================== archlinux-keyring.install ===================================== @@ -1,13 +1,26 @@ #!/bin/sh -post_upgrade() { +populate_archlinux() { if usr/bin/pacman-key -l >/dev/null 2>&1; then usr/bin/pacman-key --populate archlinux fi } + +post_upgrade() { + # Older versions of pacman (before 6.1.0) disabled locking by default: + # https://gitlab.archlinux.org/pacman/pacman/-/commit/1d1bb6fa1a8247242fbdd226f50265a278a12ac8 + # + # This still causes lots of problems, so force to remove that option. + if grep -qx 'lock-never' etc/pacman.d/gnupg/gpg.conf 2>/dev/null; then + sed -i '/^lock-never$/d' etc/pacman.d/gnupg/gpg.conf + fi + + populate_archlinux +} + post_install() { if [ -x usr/bin/pacman-key ]; then - post_upgrade + populate_archlinux fi } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/archlinux-keyring/-/compare/808f9c0b24d6145679acb9d0cbcc27d76e71a8ad...685cf724318bcfc1758b8d116042fbf61f60fbff -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/archlinux-keyring/-/compare/808f9c0b24d6145679acb9d0cbcc27d76e71a8ad...685cf724318bcfc1758b8d116042fbf61f60fbff You're receiving this email because of your account on gitlab.archlinux.org.
