From f672b11508c7ce8366d68c8e902f5fdf3881edfc Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 22 Jul 2025 07:08:08 +0200
Subject: [PATCH] pacman: sync

---
 ...34-pacman-key-disable-WKD-by-default.patch | 58 +++++++++++++++++++
 pacman/PKGBUILD                               | 11 ++--
 2 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 pacman/0034-pacman-key-disable-WKD-by-default.patch

diff --git a/pacman/0034-pacman-key-disable-WKD-by-default.patch b/pacman/0034-pacman-key-disable-WKD-by-default.patch
new file mode 100644
index 00000000..8dc91ef9
--- /dev/null
+++ b/pacman/0034-pacman-key-disable-WKD-by-default.patch
@@ -0,0 +1,58 @@
+From 612777d1e6f196517c1db62454e952ddad14b260 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Wed, 16 Jul 2025 11:07:34 +0200
+Subject: [PATCH 34/N] pacman-key: disable WKD by default
+
+We don't use WKD and it leads to unavoidable error messages
+when --refresh-keys is used, for example on the first startup,
+which can be confusing.
+
+While it's only annoying for --refresh-keys, also disable it
+for --recv-keys for consistency.
+
+Fixes #27
+---
+ scripts/pacman-key.sh.in | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
+index 85ceda9..1d14e7b 100644
+--- a/scripts/pacman-key.sh.in
++++ b/scripts/pacman-key.sh.in
+@@ -53,6 +53,9 @@ USE_COLOR='y'
+ VERIFY=0
+ VERBOSE=0
+ 
++# MSYS2: we don't use WKD, disable it to avoid unnecessary lookup error messages
++_USE_WKD=0
++
+ usage() {
+ 	printf "pacman-key (pacman) %s\n" ${myver}
+ 	echo
+@@ -529,11 +532,16 @@ receive_keys() {
+ 
+ 	(( ${#keyids[*]}+${#emails[*]} > 0 )) || exit 1
+ 
+-	if (( ${#emails[*]} > 0 )) && \
++	if (( _USE_WKD )) && (( ${#emails[*]} > 0 )) && \
+ 	   ! "${GPG_PACMAN[@]}" --auto-key-locate clear,nodefault,wkd,keyserver \
+ 	                        --locate-key "${emails[@]}" ; then
+ 		error "$(gettext "Remote key not fetched correctly from WKD or keyserver.")"
+ 		ret=1
++	elif (( ${#emails[*]} > 0 )) && \
++	   ! "${GPG_PACMAN[@]}" --auto-key-locate clear,nodefault,keyserver \
++	                        --locate-key "${emails[@]}" ; then
++		error "$(gettext "Remote key not fetched correctly from keyserver.")"
++		ret=1
+ 	fi
+ 
+ 	if (( ${#keyids[*]} > 0 )) && ! "${GPG_PACMAN[@]}" --recv-keys "${keyids[@]}" ; then
+@@ -564,7 +572,7 @@ refresh_keys() {
+ 
+ 		# first try looking up the key in a WKD (only works by email address)
+ 		for email in "${emails[@]}"; do
+-			"${GPG_PACMAN[@]}" --locate-external-keys "$email" && break
++			(( _USE_WKD )) && "${GPG_PACMAN[@]}" --locate-external-keys "$email" && break
+ 		done
+ 
+ 		# if no key was found, fall back to using the keyservers (with the key fingerprint instead)
diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index 85e17006..59eacb5b 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=6.1.0
-pkgrel=16
+pkgrel=17
 pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
 arch=('i686' 'x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -83,7 +83,8 @@ source=(pacman::git+https://gitlab.archlinux.org/pacman/pacman.git#commit=${_com
         0030-libmakepkg-do-not-unset-CHOST-with-buildflags.patch
         0031-repo-add-unconditionally-create-the-database-if-it-i.patch
         0032-Translate-MSYS2-specific-messages-into-Japanese.patch
-        0033-fixup-Core-update.patch)
+        0033-fixup-Core-update.patch
+        0034-pacman-key-disable-WKD-by-default.patch)
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
 sha256sums=('803cba087e713a59866797747c3c63abbc0e4354c45cc2c0467d11e78364d66f'
@@ -128,7 +129,8 @@ sha256sums=('803cba087e713a59866797747c3c63abbc0e4354c45cc2c0467d11e78364d66f'
             'c4762de7bb589b5ed84f0474e7a2ba8bf3c6447db153099816cba9cf8cf01cee'
             'f090e9c042c901c52f13a8639577f3a97fcac20fc4f2c21a27e7d9223f5dfe2c'
             '3de0512e99d5b13ecffd192b019ba2f77e0f238112d2578ae10cbb1cbdd39e47'
-            'd093221c40c9a96e0303f299f5df31f5cd100e83e8ceb9eccaffee07a60ef338')
+            'd093221c40c9a96e0303f299f5df31f5cd100e83e8ceb9eccaffee07a60ef338'
+            '5a31b6b09db89935664ec3e640e3a24a03c75657c3d61463c0e38f7b7da34339')
 
 apply_git_with_msg() {
   for _patch in "$@"
@@ -177,7 +179,8 @@ prepare() {
   0030-libmakepkg-do-not-unset-CHOST-with-buildflags.patch \
   0031-repo-add-unconditionally-create-the-database-if-it-i.patch \
   0032-Translate-MSYS2-specific-messages-into-Japanese.patch \
-  0033-fixup-Core-update.patch
+  0033-fixup-Core-update.patch \
+  0034-pacman-key-disable-WKD-by-default.patch
 }
 
 build() {