From 286d85d7c45e078ec8df3c1e48ee08cd6a472f1a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 15 Jun 2025 18:16:35 +0200 Subject: [PATCH] package/samba4: bump version to 4.22.2 Release notes: https://www.samba.org/samba/history/samba-4.22.2.html https://www.samba.org/samba/history/samba-4.22.1.html https://www.samba.org/samba/history/samba-4.22.0.html Rebased patch 0001 due to upstream commit https://github.com/samba-team/samba/commit/4dbbfcb00401d7a797154c812587bfe2dda0aea1 An import of the host-python ssl module was added to wscript with commit https://github.com/samba-team/samba/commit/549f67a9e655149b1ede7e2858836cb7811cc78c Select BR2_PACKAGE_HOST_PYTHON3_SSL to provide the new dependency. Note: the 4.22.2 release note mention a security fix for CVE-2025-0620. This commit is not marked as a security bump because this CVE was addressed in a previous Buildroot commit updating samba4 to version 4.21.6, which also contain this fix. Signed-off-by: Bernd Kuhls [Julien: - add a note explaining why this commit is not a security bump - add "select BR2_PACKAGE_HOST_PYTHON3" in Config.in ] Signed-off-by: Julien Olivain --- ...d-find-pre-built-heimdal-build-tools-in-case-of-.patch | 8 ++++---- package/samba4/Config.in | 2 ++ package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index eb0ea099b7..8d223e38a0 100644 --- a/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -33,7 +33,7 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 4.11.13, 4.17.7 & 4.20.3] +[Bernd: rebased for version 4.11.13, 4.17.7, 4.20.3 & 4.22.1] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- @@ -43,10 +43,10 @@ diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_hei index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -13,3 +13,14 @@ - # when this will be available also in - # system libraries... +@@ -15,3 +15,14 @@ conf.define('HAVE_CLIENT_GSS_C_CHANNEL_BOUND_FLAG', 1) + + conf.define('HAVE_KRB5_INIT_CREDS_STEP', 1) + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): diff --git a/package/samba4/Config.in b/package/samba4/Config.in index 6aff82bb3d..e1d3dd9bf7 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -15,6 +15,8 @@ config BR2_PACKAGE_SAMBA4 select BR2_PACKAGE_CMOCKA select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON3_SSL select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 6c4205853e..e80ad7a87d 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.21.6.tar.asc -sha256 681bad60f57959436350751bc89e893b8c106ac882cc7420f93f419e1d188688 samba-4.21.6.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.22.2.tar.asc +sha256 d9ac8e224a200159e62c651cf42307dc162212ec25d04eb6800b9a7ccfbcc3c1 samba-4.22.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 7ba0aa3346..e94ff1d441 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.21.6 +SAMBA4_VERSION = 4.22.2 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES