[pkg-gnupg-maint] Bug#1033155: migration test fails when EC key present in test keyrings

[Jonathan Wiltshire]

Source: gnupg2
Version: 2.2.40-1
Severity: important
Tags: patch
X-Debbugs-Cc: jmw at debian.org

Hi,

The stable release key for bookworm is EC, and this causes gpg1 to bail
out when it is imported as part of the migration test. Attached patch
limits the keyrings used to the archive's automatic keys, which are
still RSA.


-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.1.0-6-amd64 (SMP w/8 CPU threads; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
Index: gnupg2-2.2.40/debian/tests/migration
===================================================================
--- gnupg2-2.2.40.orig/debian/tests/migration
+++ gnupg2-2.2.40/debian/tests/migration
@@ -11,7 +11,7 @@ gpg1=(gpg1 --homedir "$GPG_HOME" --batch
 mkdir "$GPG_HOME"
 chmod 700 "$GPG_HOME"
 
-cat /usr/share/keyrings/debian-archive-*.gpg | "${gpg1[@]}" --import
+cat /usr/share/keyrings/debian-archive-*-automatic.gpg | "${gpg1[@]}" --import
 "${gpg1[@]}" --list-keys
 "${gpg[@]}" --list-keys > "$DIR/key.list.before"
 migrate-pubring-from-classic-gpg "$GPG_HOME"