From fa9a3c24a1e1607e4a3d56dd41acfefe7bcd77b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <buehler@cert.uni-stuttgart.de>
Date: Fri, 9 Dec 2016 13:44:51 +0100
Subject: [PATCH] refresh keys again, this time with gpg1 - gpg2 creates
 incompatible keyrings

---
 create-gpgring.sh                    |   6 +++---
 trusted.gpg.d/obs-home-stbuehler.gpg | Bin 879 -> 737 bytes
 trusted.gpg.d/obs-openSUSE-Tools.gpg | Bin 811 -> 669 bytes
 trusted.gpg.d/obs-server-http.gpg    | Bin 805 -> 663 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/create-gpgring.sh b/create-gpgring.sh
index e8caf8c..eeeb4f9 100755
--- a/create-gpgring.sh
+++ b/create-gpgring.sh
@@ -11,7 +11,7 @@ tmpdir=$(mktemp --tmpdir -d create-gpgring-XXXXXXX)
 trap 'rm -rf "${tmpdir}"' EXIT
 
 mygpg() {
-	gpg --homedir "${tmpdir}/.gnupg" --batch --no-tty --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name "${tmpdir}/trustdb.gpg" "$@"
+	gpg1 --homedir "${tmpdir}/.gnupg" --batch --no-tty --no-options --no-auto-check-trustdb --trustdb-name "${tmpdir}/trustdb.gpg" "$@"
 }
 
 unset INFILES
@@ -58,8 +58,8 @@ export HOME="${tmpdir}"
 
 KEYRING="${tmpdir}/keyring"
 
-mygpg --keyring "${KEYRING}" --import -- "${INFILES[@]}"
-mygpg --keyring "${KEYRING}" --list-keys
+mygpg --no-default-keyring --primary-keyring "${KEYRING}" --import -- "${INFILES[@]}"
+mygpg --no-default-keyring --primary-keyring "${KEYRING}" --list-keys
 
 mv "${KEYRING}" "${OUTFILE}"
 
diff --git a/trusted.gpg.d/obs-home-stbuehler.gpg b/trusted.gpg.d/obs-home-stbuehler.gpg
index 3588c16de42f7dfbf04cbc0aba06e2885013b2c5..8423ddb221da3bc1c40a28cdd38d39f0747ee3b6 100644
GIT binary patch
delta 22
bcmaFQ_K<aB(?lkg4NMHolZBZ*Knw-|SrY~V

delta 164
zcmaFJ`kt+xfq_ARk&%JP+bJRq$YzM}>iG)7AT|Ur`!g|uSxF2GOg9-A8D!WDTvz+P
zKPl>YIcizs?dy}T#kC&*s!#x{VgRb(0TLxZo*h_(iGk%m5I|+&6xbGKAa}z=rpZ&8
bJVfeG^f>W7E>_=@S9qP-wn#eo?WIHjcP=M?

diff --git a/trusted.gpg.d/obs-openSUSE-Tools.gpg b/trusted.gpg.d/obs-openSUSE-Tools.gpg
index 32c8df7cfca5e9f280ed8c340ab494c7df1b01d6..f0a23b3f9966a64c9956bac0d84f134853fb3340 100644
GIT binary patch
delta 22
bcmZ3@HkWl{lP?p?1||mP$>*6oKnw-|PlN^W

delta 164
zcmbQsx|*$?fq_ARk&%JP+bJRq$YzM}>iGu3AT|Urb2Bl5SxF2GOj8*c8DzMa1%n@b
zeR;bukhiC`)N1Lwe}7*BRVYBz16A+<RdND(c3=@E2A2Oo0F{MPU|X1h+zq}=lLMJN
aL@pJ-?srMf<0zeMwTJUgq5a>$4G#e3UMBDW

diff --git a/trusted.gpg.d/obs-server-http.gpg b/trusted.gpg.d/obs-server-http.gpg
index 13c32dcbaa90e6d77bbcbc3e86c6c5eb15ec8d5e..109c97432d65ff241ead167dfd31260c40633c73 100644
GIT binary patch
delta 22
bcmZ3=Hl1~2lRFd31||mP$tRgSKnw-|P51@b

delta 164
zcmbQvx|FS+fq_ARk&%JP+bJRq$YzM}>iG)7AT|UrvobM)SxF2GO#KXu3^G4I=`OLp
z7|p=?G$wdc245e?#T%P}Dik2<fhu@_Dmj5X3$O?i1IvFPfXc!tur16$?gn?J$=*yJ
aA}eL1y>9CVOM5q-@Q)06HQ9Ie(i{L_<|HEk