Re: [ptxdist] [APPLIED] krb5: version bump 1.20 -> 1.22.1

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 0d63079d1643bf9b4bf4ec05e3759a57dd4faeb3.

Michael

[sent from post-receive hook]

On Fri, 07 Nov 2025 09:53:27 +0100, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251028154644.737033-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/krb5-1.22.1/0001-Fix-kdclist-struct-not-being-defined.patch b/patches/krb5-1.22.1/0001-Fix-kdclist-struct-not-being-defined.patch
> new file mode 100644
> index 000000000000..89313753cf5f
> --- /dev/null
> +++ b/patches/krb5-1.22.1/0001-Fix-kdclist-struct-not-being-defined.patch
> @@ -0,0 +1,59 @@
> +From: =?UTF-8?q?Sven=20P=C3=BCschel?= <s.pueschel@pengutronix.de>
> +Date: Tue, 28 Oct 2025 16:08:59 +0100
> +Subject: [PATCH] Fix kdclist struct not being defined
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +When the kdclist and kdclist_entry structs were added, they were defined
> +dependent of the KRB5_DNS_LOOKUP macro, whereas the code using the struct
> +is compiled even without the macro set. This causes a compile failure
> +when the code is compiled without the KRB5_DNS_LOOKUP macro enabled.
> +
> +Fixes: fabbf11f457a ("Defer primary KDC lookups")
> +
> +Upstream-Status: Submitted [https://github.com/krb5/krb5/pull/1466]
> +
> +Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> +---
> + src/lib/krb5/os/locate_kdc.c | 20 ++++++++++----------
> + 1 file changed, 10 insertions(+), 10 deletions(-)
> +
> +diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
> +index d1df04a635bb..c186bce51c5a 100644
> +--- a/src/lib/krb5/os/locate_kdc.c
> ++++ b/src/lib/krb5/os/locate_kdc.c
> +@@ -28,16 +28,6 @@
> + #include "fake-addrinfo.h"
> + #include "os-proto.h"
> + 
> +-#ifdef KRB5_DNS_LOOKUP
> +-
> +-#define DEFAULT_LOOKUP_KDC 1
> +-#if KRB5_DNS_LOOKUP_REALM
> +-#define DEFAULT_LOOKUP_REALM 1
> +-#else
> +-#define DEFAULT_LOOKUP_REALM 0
> +-#endif
> +-#define DEFAULT_URI_LOOKUP TRUE
> +-
> + struct kdclist_entry {
> +     krb5_data realm;
> +     struct server_entry server;
> +@@ -48,6 +38,16 @@ struct kdclist {
> +     struct kdclist_entry *list;
> + };
> + 
> ++#ifdef KRB5_DNS_LOOKUP
> ++
> ++#define DEFAULT_LOOKUP_KDC 1
> ++#if KRB5_DNS_LOOKUP_REALM
> ++#define DEFAULT_LOOKUP_REALM 1
> ++#else
> ++#define DEFAULT_LOOKUP_REALM 0
> ++#endif
> ++#define DEFAULT_URI_LOOKUP TRUE
> ++
> + static int
> + maybe_use_dns (krb5_context context, const char *name, int defalt)
> + {
> diff --git a/patches/krb5-1.22.1/series b/patches/krb5-1.22.1/series
> new file mode 100644
> index 000000000000..d1a762a37195
> --- /dev/null
> +++ b/patches/krb5-1.22.1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Fix-kdclist-struct-not-being-defined.patch
> +# da253d0898bf12d690738399b189b17b  - git-ptx-patches magic
> diff --git a/rules/krb5.make b/rules/krb5.make
> index 989e0a0d50ee..a511957da8ed 100644
> --- a/rules/krb5.make
> +++ b/rules/krb5.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_KRB5) += krb5
>  #
>  # Paths and names
>  #
> -KRB5_VERSION	:= 1.20
> -KRB5_MD5	:= e88657aca6e6b0528c11a78643498bd5
> +KRB5_VERSION	:= 1.22.1
> +KRB5_MD5	:= 8f841cea186ef6856ea6c2a063091861
>  KRB5		:= krb5-$(KRB5_VERSION)
>  KRB5_SUFFIX	:= tar.gz
> -KRB5_URL	:= https://web.mit.edu/kerberos/dist/krb5/$(KRB5_VERSION)/$(KRB5).$(KRB5_SUFFIX)
> +KRB5_URL	:= https://web.mit.edu/kerberos/dist/krb5/$(basename $(KRB5_VERSION))/$(KRB5).$(KRB5_SUFFIX)
>  KRB5_SOURCE	:= $(SRCDIR)/$(KRB5).$(KRB5_SUFFIX)
>  KRB5_DIR	:= $(BUILDDIR)/$(KRB5)
>  KRB5_LICENSE	:= MIT