From 84d43643c9f7a135740df63a728cc43abb62a405 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 15 Jul 2019 00:59:26 +0200
Subject: [PATCH] Fix "Bad request" failures during package-refresh

Particular with elpa.gnu.org. This is caused by a known error in Emacs
26.x, which has been fixed in 27, and documented here:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341
---
 core/autoload/packages.el | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index 723d21c0e..78d905354 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -19,6 +19,28 @@
   (setq doom--refreshed-p nil)
   (doom-cache-set 'last-pkg-refresh nil))
 
+(defun doom--refresh-pkg-contents ()
+  (unless (file-exists-p package-user-dir)
+    (make-directory package-user-dir t))
+  (require 'gnutls)
+  (let ((old-gnutls-algorithm-priority gnutls-algorithm-priority))
+    ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3434
+    (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
+    (unwind-protect
+        (progn
+          (let ((default-keyring (expand-file-name "package-keyring.gpg"
+                                                   data-directory)))
+            (when (and package-check-signature (file-exists-p default-keyring))
+              (condition-case-unless-debug error
+                  (package-import-keyring default-keyring)
+                (error (message "Cannot import default keyring: %S" (cdr error))))))
+          (dolist (archive package-archives)
+            (cl-pushnew archive package--downloads-in-progress
+                        :test #'equal))
+          (dolist (archive package-archives)
+            (package--download-one-archive archive "archive-contents" nil)))
+      (setq gnutls-algorithm-priority old-gnutls-algorithm-priority))))
+
 ;;;###autoload
 (defun doom-refresh-packages-maybe (&optional force-p)
   "Refresh ELPA packages, if it hasn't been refreshed recently."
@@ -29,11 +51,12 @@
     (condition-case e
         (progn
           (message "Refreshing package archives")
-          (package-refresh-contents)
+          (doom--refresh-pkg-contents)
           (doom-cache-set 'last-pkg-refresh t 1200))
-    ((debug error)
-     (doom--refresh-pkg-cache)
-     (signal 'doom-error e)))))
+      ((debug error)
+       (message "Trying again %s" e)
+       (doom--refresh-pkg-contents)
+       (signal 'doom-error e)))))
 
 
 ;;