diff --git a/.checkpackageignore b/.checkpackageignore index 505725695c..471b049ca6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1281,9 +1281,8 @@ 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/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch lib_patch.Upstream -package/samba4/0001-libreplace-disable-libbsd-support.patch lib_patch.Upstream -package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream -package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.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-use-memcpy-as-an-alternative-for-bcopy-memmov.patch lib_patch.Upstream diff --git a/package/samba4/0002-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 similarity index 100% rename from package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch rename to package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch deleted file mode 100644 index 8259e91fc6..0000000000 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4df82c9e03b68dc1621fe4c9ac6a29ae3e64e07e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 7 Sep 2016 23:03:43 -0300 -Subject: [PATCH] libreplace: disable libbsd support - -Disable libbsd support, samba4 uses a global config.h for its own -codebase and that of heimdal (when building with builtin). -This causes redefinition conflicts for link(2) when both standard -unistd.h and bsd/unistd.h get included. - -Signed-off-by: Gustavo Zacarias -[Bernd: rebased for versions 4.7.3, 4.8.0, 4.8.5 & 4.11.13] -Signed-off-by: Bernd Kuhls ---- - lib/replace/wscript | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 240d730cbee..c6d8df43c74 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -436,21 +436,6 @@ def configure(conf): - - strlcpy_in_bsd = False - -- # libbsd on some platforms provides strlcpy and strlcat -- if not conf.CHECK_FUNCS('strlcpy strlcat'): -- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True): -- strlcpy_in_bsd = True -- if not conf.CHECK_FUNCS('getpeereid'): -- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') -- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): -- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- if not conf.CHECK_FUNCS('setproctitle_init'): -- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -- - conf.CHECK_CODE(''' - struct ucred cred; - socklen_t cred_len; --- -2.20.1 - diff --git a/package/samba4/0003-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 similarity index 100% rename from package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch rename to package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 49ce47705d..353736f3b2 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.19.6.tar.asc -sha256 653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1 samba-4.19.6.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.20.2.tar.asc +sha256 f969ffed58ccf3e85cbbcc0e33a1726d025c2b40f42a653b1125b82b92d2e0e5 samba-4.20.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 994037c84b..5536b6b121 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.6 +SAMBA4_VERSION = 4.20.2 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES