From 98a8b891a12548725762142f4b6bf822ab073239 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 23 Sep 2019 17:09:54 +0200 Subject: [PATCH] * doc/org/init.el.in: Work around obsolete ELPA signatures. --- doc/org/init.el.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/org/init.el.in b/doc/org/init.el.in index db416f1ed..ed0820b32 100644 --- a/doc/org/init.el.in +++ b/doc/org/init.el.in @@ -3,6 +3,15 @@ (setq debug-on-error t) +;;; Some combination of GNU TLS and Emacs fail to retrieve archive +;;; contents over https. +;;; https://www.reddit.com/r/emacs/comments/cdf48c/failed_to_download_gnu_archive/ +;;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341 +(if (and (version< emacs-version "26.3") (>= libgnutls-version 30600)) + (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")) +; work around obsolete ELPA signatures :-( +(setq package-check-signature 'nil) + (package-initialize) (require 'cl) (setq features-before features) @@ -11,13 +20,6 @@ (print (org-version nil t t)) (print (concat "Org " org-version)) -; Some combination of GNU TLS and Emacs fail to retrieve archive -; contents over https. -; https://www.reddit.com/r/emacs/comments/cdf48c/failed_to_download_gnu_archive/ -; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341 -(if (and (version< emacs-version "26.3") (>= libgnutls-version 30600)) - (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")) - ; The Org version that ships with emacs is usually too old. (when (version< org-version "9.1") (warn "Org-mode is too old; attempting to download a more recent version")