From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 28 Oct 2025 16:47:10 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vDlug-00CjQZ-1V for lore@lore.pengutronix.de; Tue, 28 Oct 2025 16:47:10 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vDlug-0006AL-AC; Tue, 28 Oct 2025 16:47:10 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vDluP-00069k-Et; Tue, 28 Oct 2025 16:46:53 +0100 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Tue, 28 Oct 2025 16:42:35 +0100 Message-ID: <20251028154644.737033-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] krb5: version bump 1.20 -> 1.22.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Sven Püschel --- No license file md5 hash was added, as checking the NOTICE file, several licenses were not really detected by the SPDX Online tool (mostly about donated code license and a several U.S. export regulation statements for which some license texts seem to be adapted) --- ...Fix-kdclist-struct-not-being-defined.patch | 59 +++++++++++++++++++ patches/krb5-1.22.1/series | 4 ++ rules/krb5.make | 6 +- 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 patches/krb5-1.22.1/0001-Fix-kdclist-struct-not-being-defined.patch create mode 100644 patches/krb5-1.22.1/series 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 000000000..89313753c --- /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?= +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 +--- + 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 000000000..d1a762a37 --- /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 989e0a0d5..a511957da 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 -- 2.47.3