From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 18 Apr 2023 10:40:10 +0000 (+0200)
Subject: fedora: fix gpg key location
X-Git-Tag: v15~242^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1453%2Fhead;p=thirdparty%2Fmkosi.git

fedora: fix gpg key location

With the new Fedora website the location of the gpg keys has changed.
Also, all the gpg keys are now in one file instead of having a separate
file for each release.

See: https://fedoraproject.org/security/
---

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 77d3aac98..a355e145e 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -14,13 +14,6 @@ from mkosi.log import MkosiPrinter, warn
 from mkosi.remove import unlink_try_hard
 from mkosi.run import run_with_apivfs
 
-FEDORA_KEYS_MAP = {
-    "36": "53DED2CB922D8B8D9E63FD18999F7CBF38AB71F4",
-    "37": "ACB5EE4E831C74BB7C168D27F55AD3FB5323552A",
-    "38": "6A51BBABBA3D5467B6171221809A8D7CEB10B464",
-    "39": "E8F23996F23218640CB44CBE75CF5AC418B8E74C",
-}
-
 
 class FedoraInstaller(DistributionInstaller):
     @classmethod
@@ -57,13 +50,9 @@ class FedoraInstaller(DistributionInstaller):
             # In other versions, the "fedora" repo is frozen at release, and "updates" provides any new packages.
             updates_url = None
 
-        if releasever in FEDORA_KEYS_MAP:
-            gpgid = f"keys/{FEDORA_KEYS_MAP[releasever]}.txt"
-        else:
-            gpgid = "fedora.gpg"
-
         gpgpath = Path(f"/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-{releasever}-{state.config.architecture}")
-        gpgurl = urllib.parse.urljoin("https://getfedora.org/static/", gpgid)
+        # See: https://fedoraproject.org/security/
+        gpgurl = "https://fedoraproject.org/fedora.gpg"
 
         repos = [Repo("fedora", release_url, gpgpath, gpgurl)]
         if updates_url is not None: