From: Fabrice Fontaine Date: Sun, 9 Jun 2019 15:15:15 +0000 (+0200) Subject: package/samba4: drop unneeded second patch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df859a83f6f53c3e9cc4d1d11abd58f47bed1489;p=buildroot.git package/samba4: drop unneeded second patch This patch is not needed since version 4.9.0 and https://github.com/samba-team/samba/commit/859698d29b547217356851094ed8188236e717b6 which solved the issue by avoiding calling this function. Also renumber the remaining patches. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- diff --git a/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch b/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch deleted file mode 100644 index 45d3050a39..0000000000 --- a/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From da2f2cf8e7a1dfcb661b707e4649cec1e8a0e79c Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 9 Aug 2018 10:03:06 +0200 -Subject: [PATCH] Fix compilation of Samba 4.7.4 with disabled ADS - -Downloaded from upstream mailinglist -https://lists.samba.org/archive/samba-technical/2017-December/124629.html - -Patch originates from FreeBSD: -https://svnweb.freebsd.org/ports/head/net/samba47/files/patch-source3__libads__kerberos_keytab.c?revision=457119&view=markup - -Signed-off-by: Bernd Kuhls ---- - source3/libads/kerberos_keytab.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c -index 37ac7ba985e..71250962090 100644 ---- a/source3/libads/kerberos_keytab.c -+++ b/source3/libads/kerberos_keytab.c -@@ -32,8 +32,6 @@ - - #ifdef HAVE_KRB5 - --#ifdef HAVE_ADS -- - /* This MAX_NAME_LEN is a constant defined in krb5.h */ - #ifndef MAX_KEYTAB_NAME_LEN - #define MAX_KEYTAB_NAME_LEN 1100 -@@ -85,6 +83,8 @@ out: - return ret; - } - -+#ifdef HAVE_ADS -+ - /********************************************************************** - Adds a single service principal, i.e. 'host' to the system keytab - ***********************************************************************/ --- -2.14.4 - diff --git a/package/samba4/0002-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch b/package/samba4/0002-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch new file mode 100644 index 0000000000..c1418bd885 --- /dev/null +++ b/package/samba4/0002-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch @@ -0,0 +1,149 @@ +From 5627ea3826a00c149ff3d49c40706217043a014d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 28 Jan 2018 11:57:11 +0100 +Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h + +Fixes an error detected by buildroot autobuilders: +http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log + +/home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: +error: conflicting types for 'uintptr_t' + typedef unsigned long int uintptr_t; + ^ +In file included from ../lib/ldb/tests/ldb_msg.c:17:0: +../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here + typedef unsigned int uintptr_t; + +The define __WORDSIZE is missing when cmocka.h decides how to +define uintptr_t, this patch includes stdint.h when needed. + +Patch sent upstream: +https://lists.samba.org/archive/samba-technical/2018-January/125306.html + +[updated for samba-4.8.4, v2 sent upstream + https://lists.samba.org/archive/samba-technical/2018-August/129732.html, + updated for samba-4.9.1] + +Signed-off-by: Bernd Kuhls +--- + lib/ldb/tests/ldb_kv_ops_test.c | 1 + + lib/ldb/tests/ldb_mod_op_test.c | 1 + + lib/ldb/tests/ldb_msg.c | 1 + + lib/ldb/tests/ldb_tdb_test.c | 1 + + lib/ldb/tests/test_ldb_qsort.c | 1 + + lib/util/tests/test_ms_fnmatch.c | 1 + + libcli/auth/tests/ntlm_check.c | 1 + + libcli/smb/test_smb1cli_session.c | 1 + + source3/lib/test_tldap.c | 1 + + 9 files changed, 9 insertions(+) + +diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c +index 30ce019fac8..3ac7763b307 100644 +--- a/lib/ldb/tests/ldb_kv_ops_test.c ++++ b/lib/ldb/tests/ldb_kv_ops_test.c +@@ -46,6 +46,7 @@ + */ + #include + #include ++#include + #include + #include + +diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c +index 01667af3865..a1a20d38f28 100644 +--- a/lib/ldb/tests/ldb_mod_op_test.c ++++ b/lib/ldb/tests/ldb_mod_op_test.c +@@ -13,6 +13,7 @@ + */ + #include + #include ++#include + #include + #include + +diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c +index f8de418e0dc..31786a9a318 100644 +--- a/lib/ldb/tests/ldb_msg.c ++++ b/lib/ldb/tests/ldb_msg.c +@@ -13,6 +13,7 @@ + */ + #include + #include ++#include + #include + #include + +diff --git a/lib/ldb/tests/ldb_tdb_test.c b/lib/ldb/tests/ldb_tdb_test.c +index 686a35104ea..2e312e60a3c 100644 +--- a/lib/ldb/tests/ldb_tdb_test.c ++++ b/lib/ldb/tests/ldb_tdb_test.c +@@ -40,6 +40,7 @@ + */ + #include + #include ++#include + #include + #include + +diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c +index 06e80d94379..663cf0e7564 100644 +--- a/lib/ldb/tests/test_ldb_qsort.c ++++ b/lib/ldb/tests/test_ldb_qsort.c +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/lib/util/tests/test_ms_fnmatch.c b/lib/util/tests/test_ms_fnmatch.c +index 7fe8ed05e28..d11c7bed4be 100644 +--- a/lib/util/tests/test_ms_fnmatch.c ++++ b/lib/util/tests/test_ms_fnmatch.c +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c +index e87a0a276d4..65c7b086008 100644 +--- a/libcli/auth/tests/ntlm_check.c ++++ b/libcli/auth/tests/ntlm_check.c +@@ -40,6 +40,7 @@ + */ + #include + #include ++#include + #include + #include + +diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c +index d1e21d5431e..6a526c96b61 100644 +--- a/libcli/smb/test_smb1cli_session.c ++++ b/libcli/smb/test_smb1cli_session.c +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + #include + +diff --git a/source3/lib/test_tldap.c b/source3/lib/test_tldap.c +index a6c2f2117cb..659c5a7371a 100644 +--- a/source3/lib/test_tldap.c ++++ b/source3/lib/test_tldap.c +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + +-- +2.19.0 + diff --git a/package/samba4/0003-Disable-build-of-manpages-and-documentation.patch b/package/samba4/0003-Disable-build-of-manpages-and-documentation.patch new file mode 100644 index 0000000000..ad8712634e --- /dev/null +++ b/package/samba4/0003-Disable-build-of-manpages-and-documentation.patch @@ -0,0 +1,123 @@ +From 3cd608170b99492bdd5fe3b7b8e7db61af199845 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 9 Aug 2018 09:59:06 +0200 +Subject: [PATCH] Disable build of manpages and documentation + +This patch fixes a bug described in an upstream bug report +https://bugzilla.samba.org/show_bug.cgi?id=9515 +which was closed as WONTFIX by disabling the build of manpages and +documentation. + +If installed on the host, samba4 uses the docbook-xsl package to build +parts of the documentation. This package is broken, on Debian for +example the bug reported to samba4 was fixed in the docbook-xsl package: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567 + +Since we do not provide a host version of docbook-xsl we need to disable +the build of manpages and documentation. + +Patch was downloaded from +https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch + +[Bernd: rebased for samba-4.8.5] +Signed-off-by: Bernd Kuhls +--- + buildtools/wafsamba/wafsamba.py | 10 ++++----- + docs-xml/wscript_build | 40 ++++++++++++++++----------------- + source4/scripting/wscript_build | 4 ++-- + 3 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py +index 4bb19d070e2..a255d841111 100644 +--- a/buildtools/wafsamba/wafsamba.py ++++ b/buildtools/wafsamba/wafsamba.py +@@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source, + else: + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) + +- if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and +- bld.env['XSLTPROC_MANPAGES']): +- bld.MANPAGES(manpages, install) ++# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and ++# bld.env['XSLTPROC_MANPAGES']): ++# bld.MANPAGES(manpages, install) + + + Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY +@@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source, + samba_ldflags = pie_ldflags + ) + +- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: +- bld.MANPAGES(manpages, install) ++# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: ++# bld.MANPAGES(manpages, install) + + Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY + +diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build +index ec5d28fc62a..f81c125bcd4 100644 +--- a/docs-xml/wscript_build ++++ b/docs-xml/wscript_build +@@ -148,23 +148,23 @@ bld.SAMBA_GENERATOR(parameter_all, + rule=smbdotconf_generate_parameter_list, + dep_vars=bld.dynconfig_varnames()) + +-def SMBDOTCONF_MANPAGE(bld, target): +- ''' assemble and build smb.conf.5 manual page''' +- bld.SAMBAMANPAGES(target, parameter_all) +- +-if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): +- +- SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') +- bld.SAMBAMANPAGES(manpages) +- +- if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): +- bld.SAMBAMANPAGES(pam_winbind_manpages) +- +- if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): +- bld.SAMBAMANPAGES(krb5_locator_manpages) +- +- if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): +- bld.SAMBAMANPAGES(krb5_localauth_manpages) +- +- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): +- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') ++#def SMBDOTCONF_MANPAGE(bld, target): ++# ''' assemble and build smb.conf.5 manual page''' ++# bld.SAMBAMANPAGES(target, parameter_all) ++# ++#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): ++# ++# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') ++# bld.SAMBAMANPAGES(manpages) ++# ++# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): ++# bld.SAMBAMANPAGES(pam_winbind_manpages) ++# ++# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): ++# bld.SAMBAMANPAGES(krb5_locator_manpages) ++# ++# if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): ++# bld.SAMBAMANPAGES(krb5_localauth_manpages) ++# ++# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): ++# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') +diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build +index 2f53cce12b7..9841ae0a116 100644 +--- a/source4/scripting/wscript_build ++++ b/source4/scripting/wscript_build +@@ -12,8 +12,8 @@ if sbin_files: + bld.INSTALL_FILES('${SBINDIR}', + sbin_files, + chmod=MODE_755, python_fixup=True, flat=True) +- if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: +- bld.MANPAGES(man_files, True) ++# if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: ++# bld.MANPAGES(man_files, True) + + if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): + bld.INSTALL_FILES('${BINDIR}', +-- +2.18.0 + diff --git a/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch b/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch deleted file mode 100644 index c1418bd885..0000000000 --- a/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 5627ea3826a00c149ff3d49c40706217043a014d Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 28 Jan 2018 11:57:11 +0100 -Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h - -Fixes an error detected by buildroot autobuilders: -http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log - -/home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: -error: conflicting types for 'uintptr_t' - typedef unsigned long int uintptr_t; - ^ -In file included from ../lib/ldb/tests/ldb_msg.c:17:0: -../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here - typedef unsigned int uintptr_t; - -The define __WORDSIZE is missing when cmocka.h decides how to -define uintptr_t, this patch includes stdint.h when needed. - -Patch sent upstream: -https://lists.samba.org/archive/samba-technical/2018-January/125306.html - -[updated for samba-4.8.4, v2 sent upstream - https://lists.samba.org/archive/samba-technical/2018-August/129732.html, - updated for samba-4.9.1] - -Signed-off-by: Bernd Kuhls ---- - lib/ldb/tests/ldb_kv_ops_test.c | 1 + - lib/ldb/tests/ldb_mod_op_test.c | 1 + - lib/ldb/tests/ldb_msg.c | 1 + - lib/ldb/tests/ldb_tdb_test.c | 1 + - lib/ldb/tests/test_ldb_qsort.c | 1 + - lib/util/tests/test_ms_fnmatch.c | 1 + - libcli/auth/tests/ntlm_check.c | 1 + - libcli/smb/test_smb1cli_session.c | 1 + - source3/lib/test_tldap.c | 1 + - 9 files changed, 9 insertions(+) - -diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c -index 30ce019fac8..3ac7763b307 100644 ---- a/lib/ldb/tests/ldb_kv_ops_test.c -+++ b/lib/ldb/tests/ldb_kv_ops_test.c -@@ -46,6 +46,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c -index 01667af3865..a1a20d38f28 100644 ---- a/lib/ldb/tests/ldb_mod_op_test.c -+++ b/lib/ldb/tests/ldb_mod_op_test.c -@@ -13,6 +13,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c -index f8de418e0dc..31786a9a318 100644 ---- a/lib/ldb/tests/ldb_msg.c -+++ b/lib/ldb/tests/ldb_msg.c -@@ -13,6 +13,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/ldb_tdb_test.c b/lib/ldb/tests/ldb_tdb_test.c -index 686a35104ea..2e312e60a3c 100644 ---- a/lib/ldb/tests/ldb_tdb_test.c -+++ b/lib/ldb/tests/ldb_tdb_test.c -@@ -40,6 +40,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c -index 06e80d94379..663cf0e7564 100644 ---- a/lib/ldb/tests/test_ldb_qsort.c -+++ b/lib/ldb/tests/test_ldb_qsort.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/lib/util/tests/test_ms_fnmatch.c b/lib/util/tests/test_ms_fnmatch.c -index 7fe8ed05e28..d11c7bed4be 100644 ---- a/lib/util/tests/test_ms_fnmatch.c -+++ b/lib/util/tests/test_ms_fnmatch.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c -index e87a0a276d4..65c7b086008 100644 ---- a/libcli/auth/tests/ntlm_check.c -+++ b/libcli/auth/tests/ntlm_check.c -@@ -40,6 +40,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c -index d1e21d5431e..6a526c96b61 100644 ---- a/libcli/smb/test_smb1cli_session.c -+++ b/libcli/smb/test_smb1cli_session.c -@@ -1,5 +1,6 @@ - #include - #include -+#include - #include - #include - -diff --git a/source3/lib/test_tldap.c b/source3/lib/test_tldap.c -index a6c2f2117cb..659c5a7371a 100644 ---- a/source3/lib/test_tldap.c -+++ b/source3/lib/test_tldap.c -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - --- -2.19.0 - diff --git a/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch b/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch deleted file mode 100644 index ad8712634e..0000000000 --- a/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 3cd608170b99492bdd5fe3b7b8e7db61af199845 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 9 Aug 2018 09:59:06 +0200 -Subject: [PATCH] Disable build of manpages and documentation - -This patch fixes a bug described in an upstream bug report -https://bugzilla.samba.org/show_bug.cgi?id=9515 -which was closed as WONTFIX by disabling the build of manpages and -documentation. - -If installed on the host, samba4 uses the docbook-xsl package to build -parts of the documentation. This package is broken, on Debian for -example the bug reported to samba4 was fixed in the docbook-xsl package: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567 - -Since we do not provide a host version of docbook-xsl we need to disable -the build of manpages and documentation. - -Patch was downloaded from -https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch - -[Bernd: rebased for samba-4.8.5] -Signed-off-by: Bernd Kuhls ---- - buildtools/wafsamba/wafsamba.py | 10 ++++----- - docs-xml/wscript_build | 40 ++++++++++++++++----------------- - source4/scripting/wscript_build | 4 ++-- - 3 files changed, 27 insertions(+), 27 deletions(-) - -diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py -index 4bb19d070e2..a255d841111 100644 ---- a/buildtools/wafsamba/wafsamba.py -+++ b/buildtools/wafsamba/wafsamba.py -@@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source, - else: - bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) - -- if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and -- bld.env['XSLTPROC_MANPAGES']): -- bld.MANPAGES(manpages, install) -+# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and -+# bld.env['XSLTPROC_MANPAGES']): -+# bld.MANPAGES(manpages, install) - - - Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY -@@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source, - samba_ldflags = pie_ldflags - ) - -- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: -- bld.MANPAGES(manpages, install) -+# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: -+# bld.MANPAGES(manpages, install) - - Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY - -diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build -index ec5d28fc62a..f81c125bcd4 100644 ---- a/docs-xml/wscript_build -+++ b/docs-xml/wscript_build -@@ -148,23 +148,23 @@ bld.SAMBA_GENERATOR(parameter_all, - rule=smbdotconf_generate_parameter_list, - dep_vars=bld.dynconfig_varnames()) - --def SMBDOTCONF_MANPAGE(bld, target): -- ''' assemble and build smb.conf.5 manual page''' -- bld.SAMBAMANPAGES(target, parameter_all) -- --if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): -- -- SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') -- bld.SAMBAMANPAGES(manpages) -- -- if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): -- bld.SAMBAMANPAGES(pam_winbind_manpages) -- -- if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): -- bld.SAMBAMANPAGES(krb5_locator_manpages) -- -- if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): -- bld.SAMBAMANPAGES(krb5_localauth_manpages) -- -- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): -- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') -+#def SMBDOTCONF_MANPAGE(bld, target): -+# ''' assemble and build smb.conf.5 manual page''' -+# bld.SAMBAMANPAGES(target, parameter_all) -+# -+#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): -+# -+# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5') -+# bld.SAMBAMANPAGES(manpages) -+# -+# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): -+# bld.SAMBAMANPAGES(pam_winbind_manpages) -+# -+# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): -+# bld.SAMBAMANPAGES(krb5_locator_manpages) -+# -+# if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): -+# bld.SAMBAMANPAGES(krb5_localauth_manpages) -+# -+# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): -+# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') -diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build -index 2f53cce12b7..9841ae0a116 100644 ---- a/source4/scripting/wscript_build -+++ b/source4/scripting/wscript_build -@@ -12,8 +12,8 @@ if sbin_files: - bld.INSTALL_FILES('${SBINDIR}', - sbin_files, - chmod=MODE_755, python_fixup=True, flat=True) -- if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: -- bld.MANPAGES(man_files, True) -+# if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: -+# bld.MANPAGES(man_files, True) - - if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): - bld.INSTALL_FILES('${BINDIR}', --- -2.18.0 - diff --git a/package/samba4/0004-test_regfio.c-include-stdint.h-before-cmoka.h.patch b/package/samba4/0004-test_regfio.c-include-stdint.h-before-cmoka.h.patch new file mode 100644 index 0000000000..2415d57d70 --- /dev/null +++ b/package/samba4/0004-test_regfio.c-include-stdint.h-before-cmoka.h.patch @@ -0,0 +1,38 @@ +From bed8720dce64181c188c23a28506a88cd2e1ee4f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 11 May 2019 00:07:50 +0200 +Subject: [PATCH] test_regfio.c: include stdint.h before cmoka.h + +This fix the following build failure on mips64el: +/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t' + typedef unsigned long int uintptr_t; + ^ +In file included from ../source3/registry/tests/test_regfio.c:23:0: +../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here + typedef unsigned int uintptr_t; + +Fixes: + - http://autobuild.buildroot.org/results/bae0508e84c905dc23ad7cf1153cd1e9d8e4d734 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/samba-team/samba/merge_requests/442] +--- + source3/registry/tests/test_regfio.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source3/registry/tests/test_regfio.c b/source3/registry/tests/test_regfio.c +index 86a217661f3..f945e653708 100644 +--- a/source3/registry/tests/test_regfio.c ++++ b/source3/registry/tests/test_regfio.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.20.1 + diff --git a/package/samba4/0005-test_regfio.c-include-stdint.h-before-cmoka.h.patch b/package/samba4/0005-test_regfio.c-include-stdint.h-before-cmoka.h.patch deleted file mode 100644 index 2415d57d70..0000000000 --- a/package/samba4/0005-test_regfio.c-include-stdint.h-before-cmoka.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bed8720dce64181c188c23a28506a88cd2e1ee4f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 11 May 2019 00:07:50 +0200 -Subject: [PATCH] test_regfio.c: include stdint.h before cmoka.h - -This fix the following build failure on mips64el: -/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t' - typedef unsigned long int uintptr_t; - ^ -In file included from ../source3/registry/tests/test_regfio.c:23:0: -../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here - typedef unsigned int uintptr_t; - -Fixes: - - http://autobuild.buildroot.org/results/bae0508e84c905dc23ad7cf1153cd1e9d8e4d734 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/samba-team/samba/merge_requests/442] ---- - source3/registry/tests/test_regfio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source3/registry/tests/test_regfio.c b/source3/registry/tests/test_regfio.c -index 86a217661f3..f945e653708 100644 ---- a/source3/registry/tests/test_regfio.c -+++ b/source3/registry/tests/test_regfio.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - - #include --- -2.20.1 -