Merge branch 'master' into core-updates

1 files changed, 36 insertions, 20 deletions

diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 7b16da781e..cb14f765e2 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2012, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -136,29 +137,26 @@ secure manner through client-server mutual authentication via tickets.")
 (define-public heimdal
   (package
     (name "heimdal")
-    (version "1.5.3")
+    (version "7.5.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://www.h5l.org/dist/src/heimdal-"
-                                  version ".tar.gz"))
+              (uri (string-append
+                    "https://github.com/heimdal/heimdal/releases/download/"
+                    "heimdal-" version "/" "heimdal-" version ".tar.gz"))
               (sha256
                (base32
-                "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"))
-              (patches (search-patches "heimdal-CVE-2017-6594.patch"
-                                       "heimdal-CVE-2017-11103.patch"))
+                "1bdc682in55ygrxmhncs7cf4s239apcblci3z8i80wnc1w1s18n5"))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   (substitute* "configure"
                     (("User=.*$") "User=Guix\n")
+                    (("Host=.*$") "Host=GNU")
                     (("Date=.*$") "Date=2017\n"))
                   #t))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags (list
-                          ;; Work around a linker error.
-                          "CFLAGS=-pthread"
-
                           ;; Avoid 7 MiB of .a files.
                           "--disable-static"
 
@@ -168,22 +166,40 @@ secure manner through client-server mutual authentication via tickets.")
                            (assoc-ref %build-inputs "readline") "/lib")
                           (string-append
                            "--with-readline-include="
-                           (assoc-ref %build-inputs "readline") "/include"))
+                           (assoc-ref %build-inputs "readline") "/include")
+
+                          ;; Do not build sqlite.
+                          (string-append
+                           "--with-sqlite3="
+                           (assoc-ref %build-inputs "sqlite")))
 
        #:phases (modify-phases %standard-phases
-                  (add-before 'check 'skip-tests
+                  (add-before 'configure 'pre-configure
                     (lambda _
-                      ;; The test simply runs 'ftp --version && ftp --help'
-                      ;; but that fails in the chroot because 'ftp' tries to
-                      ;; do a service lookup before printing the help/version.
-                      (substitute* "appl/ftp/ftp/Makefile.in"
-                        (("^CHECK_LOCAL =.*")
-                         "CHECK_LOCAL = no-check-local\n"))
-                      #t)))))
-    (native-inputs `(("e2fsprogs" ,e2fsprogs)))   ;for 'compile_et'
+                      (substitute* '("appl/afsutil/pagsh.c"
+                                     "tools/Makefile.in")
+                        (("/bin/sh") (which "sh")))
+                      #t))
+                  (add-before 'check 'pre-check
+                    (lambda _
+                      ;; For 'getxxyyy-test'.
+                      (setenv "USER" (passwd:name (getpwuid (getuid))))
+
+                      ;; Skip 'db' and 'kdc' tests for now.
+                      ;; FIXME: figure out why 'kdc' tests fail.
+                      (with-output-to-file "tests/db/have-db.in"
+                        (lambda ()
+                          (format #t "#!~a~%exit 1~%" (which "sh"))))
+                      #t)))
+       ;; Tests fail when run in parallel.
+       #:parallel-tests? #f))
+    (native-inputs `(("e2fsprogs" ,e2fsprogs)     ;for 'compile_et'
+                     ("texinfo" ,texinfo)
+                     ("unzip" ,unzip)))           ;for tests
     (inputs `(("readline" ,readline)
               ("bdb" ,bdb)
-              ("e2fsprogs" ,e2fsprogs)))          ;for libcom_err
+              ("e2fsprogs" ,e2fsprogs)            ;for libcom_err
+              ("sqlite" ,sqlite)))
     (home-page "http://www.h5l.org/")
     (synopsis "Kerberos 5 network authentication")
     (description