diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-06-08 15:33:29 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-06-08 15:33:29 +0200 |
| commit | 909788c0aebd8098084c009afa98d1209c9ec869 (patch) | |
| tree | ffe6735a2db3b0ac595b90a52825fe82eca9b803 /gnu/packages/kerberos.scm | |
| parent | 16a5ce3bb7fbd14fb17a6ba6a62fb079d2379fcc (diff) | |
| parent | 872b2487451c39020a78ed3227992fb02a7ed5e5 (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/kerberos.scm')
| -rw-r--r-- | gnu/packages/kerberos.scm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index c553f8180a..241881ea47 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -183,14 +183,7 @@ After installation, the system administrator should generate keys using (base32 "0f4dblav859p5hn7b2jdj1akw6d8p32as6bj6zym19kghh3s51zx")) (patches - (search-patches "heimdal-CVE-2022-45142.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "configure" - (("User=.*$") "User=Guix\n") - (("Host=.*$") "Host=GNU") - (("Date=.*$") "Date=2022\n")))))) + (search-patches "heimdal-CVE-2022-45142.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -221,9 +214,20 @@ After installation, the system administrator should generate keys using "/libexec/heimdal"))) #~())) #:phases (modify-phases %standard-phases + ;; Skip the appl folder as obsolete per message from Brian May <brian@linuxpenguins.xyz> + ;; <MDAEMON-F202305111940.AA401569md5001000003030@sequoia-grove.ad.secure-endpoints.com> + (add-after 'unpack 'drop-obsolete-executables + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("Makefile.am") + (("appl") "")))) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) + (invoke (search-input-file inputs "bin/autoreconf") "--install" "--force") (substitute* "configure" + ;; Reproducible build date, etc. + (("User=.*$") "User=Guix\n") + (("Host=.*$") "Host=GNU\n") + (("Date=.*$") "Date=2022\n") ;; The e2fsprogs input is included for libcom_err, ;; let's use it even if cross-compiling. (("test \"\\$\\{krb_cv_com_err\\}\" = \"yes\"") @@ -232,15 +236,6 @@ After installation, the system administrator should generate keys using ;; which confuses heimdal. (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") "ac_cv_PROG_COMPILE_ET=compile_et")) - (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") - (("/bin/sh") - (search-input-file inputs "bin/sh")) - ;; Use the cross-compiled bash instead of the - ;; native bash (XXX shouldn't _PATH_BSHELL point - ;; to a cross-compiled bash?). - (("_PATH_BSHELL") - (string-append - "\"" (search-input-file inputs "bin/sh") "\""))) (substitute* '("tools/Makefile.in") (("/bin/sh") (which "sh"))))) (add-before 'check 'pre-check @@ -255,12 +250,17 @@ After installation, the system administrator should generate keys using (format #t "#!~a~%exit 1~%" (which "sh"))))))) ;; Tests fail when run in parallel. #:parallel-tests? #f)) - (native-inputs (list bison + (native-inputs (list autoconf + automake + bison e2fsprogs ;for 'compile_et' flex + libtool texinfo unzip ;for tests pkg-config + perl + perl-json python)) (inputs (list readline bash-minimal |