branch: master
commit 79318884dc709c2eb42f58f00c6559926c2992f5
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* gnu-elpa-keyring-update: New package
---
.../etc/gnu-elpa-keyring.gpg | Bin 0 -> 2069 bytes
.../gnu-elpa-keyring-update.el | 96 +++++++++++++++++++++
2 files changed, 96 insertions(+)
diff --git a/packages/gnu-elpa-keyring-update/etc/gnu-elpa-keyring.gpg
b/packages/gnu-elpa-keyring-update/etc/gnu-elpa-keyring.gpg
new file mode 100644
index 0000000..490dee4
Binary files /dev/null and
b/packages/gnu-elpa-keyring-update/etc/gnu-elpa-keyring.gpg differ
diff --git a/packages/gnu-elpa-keyring-update/gnu-elpa-keyring-update.el
b/packages/gnu-elpa-keyring-update/gnu-elpa-keyring-update.el
new file mode 100644
index 0000000..5db762d
--- /dev/null
+++ b/packages/gnu-elpa-keyring-update/gnu-elpa-keyring-update.el
@@ -0,0 +1,96 @@
+;;; gnu-elpa-keyring-update.el --- Update Emacs's GPG keyring for GNU ELPA
-*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019 Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monn...@iro.umontreal.ca>
+;; Keywords: maint, tools
+;; Version: 2019.0
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This package updates the GPG keys used by the ELPA package manager
+;; (a.k.a `package.el') to verify authenticity of packages downloaded
+;; from the GNU ELPA archive.
+;;
+;; Those keys have a limited validity in time (for example, the first key was
+;; valid until Sep 2019 only), so you need to install and keep this package up
+;; to date to make sure signature verification does not spuriously fail when
+;; installing packages.
+;;
+;; If your keys are already too old, causing signature verification errors when
+;; installing packages, then in order to install this package you will
+;; ironically need to temporarily disable signature verification (see variable
+;; `package-check-signature') or to manually modify the expiration date of
+;; the old key, e.g. with:
+;;
+;; gpg --homedir ~/.emacs.d/elpa/gnupg --quick-set-expire 474F05837FBDEF9B 1y
+
+;;; Code:
+
+;;;###autoload
+(defvar gnu-elpa-keyring-update--keyring
+ (let ((kr (expand-file-name "etc/gnu-elpa-keyring.gpg"
+ (file-name-directory load-file-name))))
+ (if (and load-file-name (file-readable-p kr))
+ kr
+ "etc/gnu-elpa-keyring.gpg")))
+
+(defun gnu-elpa-keyring-update--keyring (&optional noerror)
+ (if (and (file-name-absolute-p gnu-elpa-keyring-update--keyring)
+ (file-readable-p gnu-elpa-keyring-update--keyring))
+ gnu-elpa-keyring-update--keyring
+ (let ((kr (expand-file-name
+ gnu-elpa-keyring-update--keyring
+ (file-name-directory
+ (or (locate-library "gnu-elpa-keyring-update")
+ (error
+ "Can't find the gnu-elpa-keyring-update package"))))))
+ (if (file-readable-p kr)
+ (setq gnu-elpa-keyring-update--keyring kr)
+ (unless noerror
+ (error "Can't find the keyring.gpg file with the new keys"))))))
+
+;;;###autoload
+(defun gnu-elpa-keyring-update ()
+ "Import new GNU ELPA keys (if any) into package.el's keyring."
+ (let ((gnupghome-dir (or (bound-and-true-p package-gnupghome-dir)
+ (expand-file-name "gnupg"
+ package-user-dir))))
+ (if (file-directory-p gnupghome-dir)
+ (package-import-keyring (gnu-elpa-keyring-update--keyring))
+ (error "No keyring to update!"))))
+
+;;;###autoload (eval-after-load 'package
+;;;###autoload `(and (bound-and-true-p package-user-dir)
+;;;###autoload (file-directory-p package-user-dir)
+;;;###autoload (let ((okr (expand-file-name
+;;;###autoload "pubring.gpg"
+;;;###autoload (or (bound-and-true-p package-gnupghome-dir)
+;;;###autoload (expand-file-name "gnupg"
+;;;###autoload package-user-dir))))
+;;;###autoload (nkr gnu-elpa-keyring-update--keyring))
+;;;###autoload (and (file-writable-p okr)
+;;;###autoload (file-readable-p nkr)
+;;;###autoload (file-newer-than-file-p nkr okr)
+;;;###autoload (gnu-elpa-keyring-update)))))
+
+(eval-when-compile
+ (condition-case err
+ (gnu-elpa-keyring-update)
+ (error (message "Skipping update: %s" (error-message-string err)))))
+
+(provide 'gnu-elpa-keyring-update)
+;;; gnu-elpa-keyring-update.el ends here
