guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 2a58d0f1658caf85c8493573ae31b23fe3a22fbe Author: Yelninei <[email protected]> AuthorDate: Fri May 15 13:47:42 2026 +0000 gnu: mit-krb5: Update to 1.22.2. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.22.2. [#:make-flags]: Explicitly disable python tests. * gnu/packages/patches/mit-krb5-hurd.patch: Update patch. Change-Id: I23ccb9ae0fcfc46d074ef13d18bb1c871e22c7bf --- gnu/packages/kerberos.scm | 8 +-- gnu/packages/patches/mit-krb5-hurd.patch | 90 ++++++-------------------------- 2 files changed, 21 insertions(+), 77 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 9a46e680997..435ed7183ee 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -61,7 +61,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.21") + (version "1.22.2") (source (origin (method url-fetch) (uri (list @@ -74,7 +74,7 @@ (patches (search-patches "mit-krb5-hurd.patch")) (sha256 (base32 - "0fx91rickkb5pvxm3imqmaavsncjkgcsrfx4czgk4j28hpzsmy39")))) + "04xg9ran75q0jzzn12v48168fmscqlfjmpf7vliarm54isygyhrj")))) (build-system gnu-build-system) (native-inputs (list bison perl)) ;required for some tests @@ -98,7 +98,9 @@ #:make-flags (list "CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1")) '(#:configure-flags - (list "--localstatedir=/var"))) + (list "--localstatedir=/var") + ;; check-unix-ctxprf does not guard against missing python + #:make-flags (list "RUNPYTEST=true"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory diff --git a/gnu/packages/patches/mit-krb5-hurd.patch b/gnu/packages/patches/mit-krb5-hurd.patch index 449320cea40..c3256f6eda1 100644 --- a/gnu/packages/patches/mit-krb5-hurd.patch +++ b/gnu/packages/patches/mit-krb5-hurd.patch @@ -1,28 +1,24 @@ Avoid using MAXPATHLEN and MAXHOSTLEN on the Hurd. -Taken from https://salsa.debian.org/debian/krb5/-/blob/master/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch +Adapted from https://salsa.debian.org/debian/krb5/-/blob/master/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch From: Sam Hartman <[email protected]> Date: Mon, 26 Dec 2011 18:05:13 -0500 Subject: Debian: HURD compatibility -HURD has no MAXPATHLEN or MAXHOSTLEN. +HURD has no MAXPATHLEN or MAXHOSTNAMELEN. -Patch-Category: debian-local +Thanks Pino Toscano for making the patch more robust. --- src/clients/ksu/ksu.h | 4 ++++ - src/include/k5-int.h | 3 +++ + src/include/k5-int.h | 6 ++++++ src/kadmin/ktutil/ktutil_funcs.c | 4 ++++ - src/kprop/kprop_util.c | 4 ++++ - src/lib/gssapi/spnego/spnego_mech.c | 3 +++ - src/lib/krb5/os/sn2princ.c | 4 ++++ src/plugins/kdb/db2/libdb2/include/db-int.h | 4 ++++ - src/tests/resolve/resolve.c | 4 ++++ - 8 files changed, 30 insertions(+) + 4 files changed, 18 insertions(+) -$ diff -u krb5-1.18/src/util/ss/help.c.orig krb5-1.18/src/util/ss/help.c ---- krb5-1.18/src/util/ss/help.c.orig 2020-03-07 23:25:52.712418587 +0100 -+++ krb5-1.18/src/util/ss/help.c 2020-03-07 23:26:25.764941122 +0100 +diff --git a/src/util/ss/help.c b/src/util/ss/help.c +--- a/src/util/ss/help.c ++++ b/src/util/ss/help.c @@ -6,6 +6,9 @@ */ @@ -33,22 +29,9 @@ $ diff -u krb5-1.18/src/util/ss/help.c.orig krb5-1.18/src/util/ss/help.c #include <sys/types.h> #include <errno.h> #include <sys/file.h> -$ diff -u krb5-1.18/src/lib/krb5/os/hostrealm.c.orig krb5-1.18/src/lib/krb5/os/hostrealm.c ---- krb5-1.18/src/lib/krb5/os/hostrealm.c.orig 2020-03-07 23:33:19.931420994 +0100 -+++ krb5-1.18/src/lib/krb5/os/hostrealm.c 2020-03-07 23:33:58.628026424 +0100 -@@ -42,6 +42,10 @@ - #endif - #endif - -+#ifndef MAXHOSTNAMELEN -+#define MAXHOSTNAMELEN 256 -+#endif -+ - struct hostrealm_module_handle { - struct krb5_hostrealm_vtable_st vt; - krb5_hostrealm_moddata data; + diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h -index 3bf0bd4..f680b33 100644 +index 32ce11c..09a95e3 100644 --- a/src/clients/ksu/ksu.h +++ b/src/clients/ksu/ksu.h @@ -56,6 +56,10 @@ @@ -63,21 +46,24 @@ index 3bf0bd4..f680b33 100644 extern int optind; extern char * optarg; diff --git a/src/include/k5-int.h b/src/include/k5-int.h -index 6522422..e4f1678 100644 +index cfd2cc9..8488e96 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h -@@ -589,6 +589,9 @@ extern char *strdup (const char *); +@@ -601,6 +601,12 @@ extern char *strdup (const char *); #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> /* MAXPATHLEN */ #endif +#ifndef MAXPATHLEN +# define MAXPATHLEN 4096 ++#endif ++#ifndef MAXHOSTNAMELEN ++# define MAXHOSTNAMELEN 256 +#endif #ifdef HAVE_SYS_FILE_H #include <sys/file.h> /* prototypes for file-related diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c -index 6d119a2..fb7fa22 100644 +index e489b5b..426a377 100644 --- a/src/kadmin/ktutil/ktutil_funcs.c +++ b/src/kadmin/ktutil/ktutil_funcs.c @@ -34,6 +34,10 @@ @@ -91,50 +77,6 @@ index 6d119a2..fb7fa22 100644 /* * Free a kt_list */ -diff --git a/src/kprop/kprop_util.c b/src/kprop/kprop_util.c -index c32d174..d72ab18 100644 ---- a/src/kprop/kprop_util.c -+++ b/src/kprop/kprop_util.c -@@ -32,6 +32,10 @@ - #include <sys/types.h> - #include <sys/socket.h> - -+#ifndef MAXHOSTNAMELEN -+#define MAXHOSTNAMELEN 256 -+#endif -+ - /* - * Convert an IPv4 or IPv6 socket address to a newly allocated krb5_address. - * There is similar code elsewhere in the tree, so this should possibly become -diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c -index 9d6027c..585d8a6 100644 ---- a/src/lib/gssapi/spnego/spnego_mech.c -+++ b/src/lib/gssapi/spnego/spnego_mech.c -@@ -65,6 +65,9 @@ - #include "gssapiP_spnego.h" - #include <gssapi_err_generic.h> - -+#ifndef MAXHOSTNAMELEN -+#define MAXHOSTNAMELEN 256 -+#endif - - #undef g_token_size - #undef g_verify_token_header -diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c -index 5932fd9..187daa8 100644 ---- a/src/lib/krb5/os/sn2princ.c -+++ b/src/lib/krb5/os/sn2princ.c -@@ -126,6 +126,10 @@ find_trailer(const char *hostname) - return p; - } - -+#ifndef MAXHOSTNAMELEN -+# define MAXHOSTNAMELEN 256 -+#endif -+ - krb5_error_code KRB5_CALLCONV - krb5_sname_to_principal(krb5_context context, const char *hostname, - const char *sname, krb5_int32 type, diff --git a/src/plugins/kdb/db2/libdb2/include/db-int.h b/src/plugins/kdb/db2/libdb2/include/db-int.h index 7e981d4..d83b3b6 100644 --- a/src/plugins/kdb/db2/libdb2/include/db-int.h
