From a54e29f7c98203a98a54f8e38495d4cad9543489 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Jan 2025 12:52:37 +0200
Subject: [PATCH] Move keyring configuration in tests out of root's
 ~/.rpmmacros

The third step to fixing #3521
---
 tests/rpmdb.at     |  3 +--
 tests/rpmsigdig.at | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/tests/rpmdb.at b/tests/rpmdb.at
index 5c2ed91bc6..84ee533078 100644
--- a/tests/rpmdb.at
+++ b/tests/rpmdb.at
@@ -128,8 +128,7 @@ AT_KEYWORDS([rpmdb query])
 AT_SKIP_IF([test x$PGP = xdummy])
 RPMDB_INIT
 
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring rpmdb" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring rpmdb" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 
 RPMTEST_CHECK([
 runroot rpm -U --nodeps --ignorearch --ignoreos --nosignature \
diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at
index ee956c2875..24873becc1 100644
--- a/tests/rpmsigdig.at
+++ b/tests/rpmsigdig.at
@@ -63,8 +63,7 @@ AT_SETUP([rpmkeys key update and delete (rpmdb)])
 AT_KEYWORDS([rpmkeys signature])
 RPMDB_INIT
 # currently the default but make it explicit
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring rpmdb" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring rpmdb" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 RPMTEST_CHECK([
 runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
 runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm
@@ -164,8 +163,7 @@ RPMTEST_CLEANUP
 AT_SETUP([rpmkeys migrate from keyid to fingerprint (fs)])
 AT_KEYWORDS([rpmkeys rpmdb])
 RPMDB_INIT
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring fs" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring fs" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 
 RPMTEST_CHECK([
 runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
@@ -198,8 +196,7 @@ RPMTEST_CLEANUP
 AT_SETUP([rpmkeys key update (fs)])
 AT_KEYWORDS([rpmkeys signature])
 RPMDB_INIT
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring fs" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring fs" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 RPMTEST_CHECK([
 runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
 runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm
@@ -277,8 +274,7 @@ RPMTEST_CLEANUP
 AT_SETUP([rpmkeys key update (openpgp)])
 AT_KEYWORDS([rpmkeys signature])
 RPMDB_INIT
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring openpgp" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring openpgp" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 RPMTEST_CHECK([
 runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
 runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm