From fdd2f57359cb01b2a867aaff88b86989597c2953 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 2 Aug 2021 21:40:37 -0400
Subject: [PATCH] gnu: mit-krb5: Update to 1.18.4 [fixes CVE-2021-36222].

* gnu/packages/kerberos.scm (mit-krb5)[replacement]: New field.
(mit-krb5-1.18.4): New variable.
---
 gnu/packages/kerberos.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 20ed94b33b..92cc84b673 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -52,6 +52,7 @@ (define-module (gnu packages kerberos)
 (define-public mit-krb5
   (package
     (name "mit-krb5")
+    (replacement mit-krb5-1.18.4)
     (version "1.18")
     (source (origin
               (method url-fetch)
@@ -119,6 +120,28 @@ (define-public mit-krb5
     (home-page "https://web.mit.edu/kerberos/")
     (properties '((cpe-name . "kerberos")))))
 
+(define-public mit-krb5-1.18.4
+  ;; Hide the package to avoid displaying the confusing "1.1a" version in the
+  ;; user interface.
+  (hidden-package
+    (package
+      (inherit mit-krb5)
+      ; version 1.18.4
+      (version "1.1a")
+      (source (origin
+                (method url-fetch)
+                (uri (list
+                       (string-append "https://web.mit.edu/kerberos/dist/krb5/"
+                                      "1.18"
+                                      "/krb5-1.18.4.tar.gz")
+                       (string-append "https://kerberos.org/dist/krb5/"
+                                      "1.18"
+                                      "/krb5-1.18.4.tar.gz")))
+                (patches (search-patches "mit-krb5-hurd.patch"))
+                (sha256
+                  (base32
+                    "1j4zm5npv3yxrwrsdwlxias0ycj4qfxzgnz0h9zffla7b4pmw236")))))))
+
 (define-public shishi
   (package
     (name "shishi")