Archived
1
0
Fork 0

Revert "doc: Update to cover for an additional OpenPGP signing key."

This reverts commit b9fb13b284.  Per discussions
simply updating OPENPGP-SIGNING-KEY-ID and OPENPGP-SIGNING-KEY-URL will be
enough.
This commit is contained in:
Maxim Cournoyer 2021-05-05 11:20:45 -04:00
parent f30e8f2909
commit c241b7ea63
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -9,11 +9,9 @@
@include version.texi @include version.texi
@c Identifier of the OpenPGP keys used to sign tarballs and such. @c Identifier of the OpenPGP key used to sign tarballs and such.
@set OPENPGP-SIGNING-KEY-ID-1 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 @c ludo @set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
@set OPENPGP-SIGNING-KEY-URL-1 https://sv.gnu.org/people/viewgpg.php?user_id=15145 @set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145
@set OPENPGP-SIGNING-KEY-ID-2 27D586A4F8900854329FF09F1260E46482E63562 @c maxim
@set OPENPGP-SIGNING-KEY-URL-2 https://sv.gnu.org/people/viewgpg.php?user_id=127547
@c Base URL for downloads. @c Base URL for downloads.
@set BASE-URL https://ftp.gnu.org/gnu/guix @set BASE-URL https://ftp.gnu.org/gnu/guix
@ -652,13 +650,11 @@ $ wget @value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig
$ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig $ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig
@end example @end example
If that command fails because you do not have the required public keys, If that command fails because you do not have the required public key,
then run these commands to import them: then run this command to import it:
@example @example
$ wget '@value{OPENPGP-SIGNING-KEY-URL-1}' \ $ wget '@value{OPENPGP-SIGNING-KEY-URL}' \
-qO - | gpg --import -
$ wget '@value{OPENPGP-SIGNING-KEY-URL-2}' \
-qO - | gpg --import - -qO - | gpg --import -
@end example @end example
@ -2124,13 +2120,11 @@ $ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.
$ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig $ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig
@end example @end example
If that command fails because you do not have the required public keys, If that command fails because you do not have the required public key,
then run these commands to import them: then run this command to import it:
@example @example
$ wget @value{OPENPGP-SIGNING-KEY-URL-1} \ $ wget @value{OPENPGP-SIGNING-KEY-URL} \
-qO - | gpg --import -
$ wget @value{OPENPGP-SIGNING-KEY-URL-2} \
-qO - | gpg --import - -qO - | gpg --import -
@end example @end example
@ -11919,7 +11913,7 @@ Likewise, you can fetch keys to a specific keybox file like this:
@example @example
gpg --no-default-keyring --keyring mykeyring.kbx \ gpg --no-default-keyring --keyring mykeyring.kbx \
--recv-keys @value{OPENPGP-SIGNING-KEY-ID-1} --recv-keys @value{OPENPGP-SIGNING-KEY-ID}
@end example @end example
@xref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU @xref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU