archlinux-keyring: Sync with archlinux

Signed-off-by: Peter Jung <[email protected]>

archlinux-keyring/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=archlinux-keyring
 pkgver=20240709
-pkgrel=2
+pkgrel=3
 pkgdesc='Arch Linux PGP keyring'
 arch=('any')
 url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/'

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
 }