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 3588c16..8423ddb 100644 Binary files a/trusted.gpg.d/obs-home-stbuehler.gpg and b/trusted.gpg.d/obs-home-stbuehler.gpg differ diff --git a/trusted.gpg.d/obs-openSUSE-Tools.gpg b/trusted.gpg.d/obs-openSUSE-Tools.gpg index 32c8df7..f0a23b3 100644 Binary files a/trusted.gpg.d/obs-openSUSE-Tools.gpg and b/trusted.gpg.d/obs-openSUSE-Tools.gpg differ diff --git a/trusted.gpg.d/obs-server-http.gpg b/trusted.gpg.d/obs-server-http.gpg index 13c32dc..109c974 100644 Binary files a/trusted.gpg.d/obs-server-http.gpg and b/trusted.gpg.d/obs-server-http.gpg differ