Browse Source
samba4: revert to 4.9.11
* revert to 4.9.x series (4.10 needs too many unofficial patches and has weird waf bugs) * cleanup patches * enable AD_DC build option again Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>lilik-openwrt-22.03
Andy Walsh
5 years ago
7 changed files with 48 additions and 204 deletions
Split View
Diff Options
-
+14 -0net/samba4/Config.in
-
+32 -43net/samba4/Makefile
-
+0 -89net/samba4/patches/003-samba-4-10-cross_compile-fix.patch
-
+0 -25net/samba4/patches/004-samba-4-10-rpath-fix.patch
-
+0 -32net/samba4/patches/005-samba-4.10-disable_gnutls_build_fix.patch
-
+0 -13net/samba4/patches/006-samba-4-10-musl_rm_unistd_incl.patch
-
+2 -2net/samba4/patches/010-source3-msgsock-nvram-fix.patch
+ 14
- 0
net/samba4/Config.in
View File
+ 32
- 43
net/samba4/Makefile
View File
+ 0
- 89
net/samba4/patches/003-samba-4-10-cross_compile-fix.patch
View File
| @ -1,89 +0,0 @@ | |||
| From a197e0cafb276a9b732f914b1f679ebb487b47f1 Mon Sep 17 00:00:00 2001 | |||
| From: pinglin <pinglin@synology.com> | |||
| Date: Tue, 19 Mar 2019 20:46:27 +0800 | |||
| Subject: [PATCH] cross_compile argument doesn't apply | |||
| reproduce: | |||
| ./configure --cross-compile --cross-answers=XXX | |||
| The output log now will show correct cross-answers. | |||
| --- | |||
| third_party/waf/waflib/Context.py | 20 ++++++++++++++++++-- | |||
| third_party/waf/waflib/Tools/c_config.py | 11 +++++++---- | |||
| 2 files changed, 25 insertions(+), 6 deletions(-) | |||
| diff --git a/third_party/waf/waflib/Context.py b/third_party/waf/waflib/Context.py | |||
| index 3222fb1551c..d1c87512095 100644 | |||
| --- a/third_party/waf/waflib/Context.py | |||
| +++ b/third_party/waf/waflib/Context.py | |||
| @@ -359,8 +359,16 @@ class Context(ctx): | |||
| encoding = kw.pop('decode_as', default_encoding) | |||
| + exec_args = kw.pop('exec_args', []) | |||
| + if isinstance(cmd, str): | |||
| + cmd = [cmd] + exec_args | |||
| + elif isinstance(cmd, list): | |||
| + cmd = cmd + exec_args | |||
| try: | |||
| - ret, out, err = Utils.run_process(cmd, kw, cargs) | |||
| + if exec_args: | |||
| + ret, out, err = Utils.run_regular_process(cmd, kw, cargs) | |||
| + else: | |||
| + ret, out, err = Utils.run_process(cmd, kw, cargs) | |||
| except Exception as e: | |||
| raise Errors.WafError('Execution failure: %s' % str(e), ex=e) | |||
| @@ -438,8 +446,16 @@ class Context(ctx): | |||
| encoding = kw.pop('decode_as', default_encoding) | |||
| + exec_args = kw.pop('exec_args', []) | |||
| + if isinstance(cmd, str): | |||
| + cmd = [cmd] + exec_args | |||
| + elif isinstance(cmd, list): | |||
| + cmd = cmd + exec_args | |||
| try: | |||
| - ret, out, err = Utils.run_process(cmd, kw, cargs) | |||
| + if exec_args: | |||
| + ret, out, err = Utils.run_regular_process(cmd, kw, cargs) | |||
| + else: | |||
| + ret, out, err = Utils.run_process(cmd, kw, cargs) | |||
| except Exception as e: | |||
| raise Errors.WafError('Execution failure: %s' % str(e), ex=e) | |||
| diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py | |||
| index 76082152cd9..25e468b0844 100644 | |||
| --- a/third_party/waf/waflib/Tools/c_config.py | |||
| +++ b/third_party/waf/waflib/Tools/c_config.py | |||
| @@ -660,20 +660,23 @@ class test_exec(Task.Task): | |||
| """ | |||
| color = 'PINK' | |||
| def run(self): | |||
| + exec_args = Utils.to_list(self.generator.exec_args) | |||
| + | |||
| if getattr(self.generator, 'rpath', None): | |||
| if getattr(self.generator, 'define_ret', False): | |||
| - self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) | |||
| + self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], exec_args=exec_args) | |||
| else: | |||
| - self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) | |||
| + self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], exec_args=exec_args) | |||
| else: | |||
| env = self.env.env or {} | |||
| env.update(dict(os.environ)) | |||
| for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): | |||
| env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') | |||
| + | |||
| if getattr(self.generator, 'define_ret', False): | |||
| - self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) | |||
| + self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env, exec_args=exec_args) | |||
| else: | |||
| - self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) | |||
| + self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env, exec_args=exec_args) | |||
| @feature('test_exec') | |||
| @after_method('apply_link') | |||
| -- | |||
| 2.17.1 | |||
+ 0
- 25
net/samba4/patches/004-samba-4-10-rpath-fix.patch
View File
| @ -1,25 +0,0 @@ | |||
| From f68bd76eab9a6e93b42f396a81aed64f65b99d1c Mon Sep 17 00:00:00 2001 | |||
| From: pinglin <pinglin@synology.com> | |||
| Date: Mon, 25 Mar 2019 20:43:54 +0800 | |||
| Subject: [PATCH] fix rpath error, this commit related to the previous one | |||
| --- | |||
| buildtools/wafsamba/samba_waf18.py | 2 +- | |||
| 1 file changed, 1 insertion(+), 1 deletion(-) | |||
| diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py | |||
| index cc310fbf512..47acc5b3c06 100644 | |||
| --- a/buildtools/wafsamba/samba_waf18.py | |||
| +++ b/buildtools/wafsamba/samba_waf18.py | |||
| @@ -220,7 +220,7 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None): | |||
| args = conf.SAMBA_CROSS_ARGS(msg=msg) | |||
| env = dict(os.environ) | |||
| env['LD_LIBRARY_PATH'] = self.inputs[0].parent.abspath() + os.pathsep + env.get('LD_LIBRARY_PATH', '') | |||
| - self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) | |||
| + self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env, exec_args=args) | |||
| o.post() | |||
| bld(rule=run_app, source=o.link_task.outputs[0]) | |||
| -- | |||
| 2.17.1 | |||
+ 0
- 32
net/samba4/patches/005-samba-4.10-disable_gnutls_build_fix.patch
View File
| @ -1,32 +0,0 @@ | |||
| From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001 | |||
| From: Andrew Bartlett <abartlet@samba.org> | |||
| Date: Wed, 20 Mar 2019 13:57:50 +1300 | |||
| Subject: [PATCH] build: Allow build when --disable-gnutls is set | |||
| BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844 | |||
| Signed-off-by: Andrew Bartlett <abartlet@samba.org> | |||
| --- | |||
| lib/mscat/wscript | 6 +++++- | |||
| 1 file changed, 5 insertions(+), 1 deletion(-) | |||
| diff --git a/lib/mscat/wscript b/lib/mscat/wscript | |||
| index 7ca9ef567ee..4d1f752a3c1 100644 | |||
| --- a/lib/mscat/wscript | |||
| +++ b/lib/mscat/wscript | |||
| @@ -12,7 +12,11 @@ def configure(conf): | |||
| if not conf.find_program('asn1Parser', var='ASN1PARSER'): | |||
| Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)') | |||
| - conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') | |||
| + # GnuTLS is currently able to be disabled | |||
| + if conf.env.enable_gnutls: | |||
| + conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') | |||
| + else: | |||
| + Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built') | |||
| def build(bld): | |||
| if (bld.CONFIG_SET('HAVE_LIBTASN1') and | |||
| -- | |||
| 2.11.0 | |||
+ 0
- 13
net/samba4/patches/006-samba-4-10-musl_rm_unistd_incl.patch
View File
| @ -1,13 +0,0 @@ | |||
| --- a/lib/replace/replace.h | |||
| +++ b/lib/replace/replace.h | |||
| @@ -162,10 +162,6 @@ | |||
| #include <bsd/unistd.h> | |||
| #endif | |||
| -#ifdef HAVE_UNISTD_H | |||
| -#include <unistd.h> | |||
| -#endif | |||
| - | |||
| #ifdef HAVE_STRING_H | |||
| #include <string.h> | |||
| #endif | |||