From d848e83a32faf8a99a8ae26e85de9f32f215d02e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 27 Mar 2026 22:40:54 +0100 Subject: [PATCH] package/samba4: bump version to 4.24.0 https://www.samba.org/samba/history/samba-4.24.0.html Removed patch 0002, its content is included in upstream commit https://gitlab.com/samba-team/devel/samba/-/commit/50604bc027c3d053cafd803ff515e6da881e79a5 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...st.c-include-stdint.h-before-cmoka.h.patch | 40 ------------------- package/samba4/samba4.hash | 4 +- package/samba4/samba4.mk | 2 +- 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch diff --git a/.checkpackageignore b/.checkpackageignore index 973ecfba89..8c64f9ce51 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -847,7 +847,6 @@ package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch lib_patch.Upstream package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream -package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch lib_patch.Upstream package/samba4/S91smb Shellcheck lib_sysv.Indent lib_sysv.Variables package/sane-backends/0001-sane_backend-add-missing-config.h.patch lib_patch.Upstream package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch lib_patch.Upstream diff --git a/package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch b/package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch deleted file mode 100644 index e63f43c290..0000000000 --- a/package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b2ea5dc3639d68b878c6534f4992da446dbbf2d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 16 May 2020 18:15:38 +0200 -Subject: [PATCH] ldap_message_test.c: include stdint.h before cmoka.h - -This fix the following build failure on uclibc: - -In file included from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0, - from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/inttypes.h:27, - from ../../lib/replace/../replace/replace.h:64, - from ../../source4/include/includes.h:23, - from ../../libcli/ldap/tests/ldap_message_test.c:41: -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t' - typedef unsigned long int uintptr_t; - ^ - -Fixes: - - http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65 - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - libcli/ldap/tests/ldap_message_test.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libcli/ldap/tests/ldap_message_test.c b/libcli/ldap/tests/ldap_message_test.c -index c5aacd4bc6b..51331e5c600 100644 ---- a/libcli/ldap/tests/ldap_message_test.c -+++ b/libcli/ldap/tests/ldap_message_test.c -@@ -34,6 +34,7 @@ - */ - #include - #include -+#include - #include - #include - --- -2.26.2 - diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 84ada82bfd..d9bb2eac01 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.23.6.tar.asc -sha256 e3dabd8b5e42dc97669fa0faef032510a94e496b58f7067082e5036d88f0e702 samba-4.23.6.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.24.0.tar.asc +sha256 1b1e457fd651a612cd08226cc6efd04e5d01e36d918c8b4c4e470e74e86881ea samba-4.24.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 2631f2dcad..e5d73a43ef 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.23.6 +SAMBA4_VERSION = 4.24.0 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES