diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 6843245939..0ce1effd47 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -3,10 +3,11 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="samba" -PKG_VERSION="4.9.14" -PKG_SHA256="14d249bd02f0227156dd77cf98e57cfef8fc5a9ec85e03873737cea7c386350a" +PKG_VERSION="4.10.9" +PKG_SHA256="366df54dc43ff8cb2d3f94fad2a8e8561a398d94ab64b86761778843b5e61678" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" +#PKG_URL="https://github.com/samba-team/samba/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python3 zlib readline popt libaio connman" PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)" @@ -54,7 +55,6 @@ configure_package() { $SMB_AESNI \ --disable-cups \ --disable-iprint \ - --disable-gnutls \ --with-relro \ --with-sendfile-support \ --without-acl-support \ @@ -79,7 +79,7 @@ configure_package() { --bundled-libraries='ALL,!asn1_compile,!compile_et,!zlib' \ --without-quotas \ --with-syslog \ - --without-json-audit \ + --without-json \ --without-ldb-lmdb \ --nopyc --nopyo" diff --git a/packages/network/samba/patches/samba-000-4.10-fix-cross-compile.patch b/packages/network/samba/patches/samba-000-4.10-fix-cross-compile.patch new file mode 100644 index 0000000000..45655a9c4c --- /dev/null +++ b/packages/network/samba/patches/samba-000-4.10-fix-cross-compile.patch @@ -0,0 +1,94 @@ +From a197e0cafb276a9b732f914b1f679ebb487b47f1 Mon Sep 17 00:00:00 2001 +From: pinglin +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. + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/003-samba-4-10-cross_compile-fix.patch + +Signed-off-by: Bernd Kuhls +--- + 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 + diff --git a/packages/network/samba/patches/samba-000-4.10-fix-heimdal-cross-issue-bso13856.patch b/packages/network/samba/patches/samba-000-4.10-fix-heimdal-cross-issue-bso13856.patch new file mode 100644 index 0000000000..08d8382ab0 --- /dev/null +++ b/packages/network/samba/patches/samba-000-4.10-fix-heimdal-cross-issue-bso13856.patch @@ -0,0 +1,31 @@ +From 189440643157fbc872a1670b3e30b6c459dbd930 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 21 Jul 2019 15:12:03 +0200 +Subject: [PATCH] heimdal_build/wscript_build: do not add host include + patch + +Fixes cross-compile. + +Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856 + +Signed-off-by: Bernd Kuhls +--- + source4/heimdal_build/wscript_build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build +index 45938b88315..e896c3e9454 100644 +--- a/source4/heimdal_build/wscript_build ++++ b/source4/heimdal_build/wscript_build +@@ -131,7 +131,7 @@ def HEIMDAL_ASN1(name, source, + samba_cflags = CURRENT_CFLAGS(bld, name, ''), + depends_on = '', + samba_deps = to_list('roken replace'), +- samba_includes = includes + ["/usr/include/heimdal"], ++ samba_includes = includes, + local_include = True) + + +-- +2.20.1 + diff --git a/packages/network/samba/patches/samba-950-no-man.patch b/packages/network/samba/patches/samba-950-no-man.patch index 69867e9f75..00885fd81b 100644 --- a/packages/network/samba/patches/samba-950-no-man.patch +++ b/packages/network/samba/patches/samba-950-no-man.patch @@ -1,37 +1,48 @@ -diff -Naur samba-4.5.5/buildtools/wafsamba/wafsamba.py samba-4.5.5.patch/buildtools/wafsamba/wafsamba.py ---- samba-4.5.5/buildtools/wafsamba/wafsamba.py 2016-08-11 09:51:04.000000000 +0200 -+++ samba-4.5.5.patch/buildtools/wafsamba/wafsamba.py 2017-02-17 15:33:36.453169574 +0100 -@@ -330,9 +330,9 @@ - if pc_files is not None and not private_library: - bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) +From 0cb025d911dd3e2f9a9184293f571214192e3a54 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Tue, 19 Mar 2019 12:39:41 +0000 +Subject: [PATCH] disable man pages + +--- + buildtools/wafsamba/wafsamba.py | 8 -------- + docs-xml/wscript_build | 22 ---------------------- + 2 files changed, 30 deletions(-) + +diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py +index a077026..2a897d0 100644 +--- a/buildtools/wafsamba/wafsamba.py ++++ b/buildtools/wafsamba/wafsamba.py +@@ -328,11 +328,6 @@ 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 -@@ -437,8 +437,8 @@ + + +@@ -437,9 +432,6 @@ 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 -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript_build ---- samba-4.5.5/docs-xml/wscript_build 2016-08-11 09:51:04.000000000 +0200 -+++ samba-4.5.5.patch/docs-xml/wscript_build 2017-02-17 15:44:45.142392019 +0100 -@@ -127,23 +127,23 @@ + +diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build +index 86600ae..ba3c7e0 100644 +--- a/docs-xml/wscript_build ++++ b/docs-xml/wscript_build +@@ -150,25 +150,3 @@ bld.SAMBA_GENERATOR(parameter_all, + target=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) @@ -50,38 +61,9 @@ diff -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript - 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') ---- a/source4/scripting/wscript_build 2018-03-20 12:19:12.059332486 +0100 -+++ b/source4/scripting/wscript_build 2018-03-20 12:19:32.087429756 +0100 -@@ -12,8 +12,8 @@ - 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}', +- for manpage in vfs_module_manpages: +- if bld.SAMBA3_IS_ENABLED_MODULE(manpage): +- bld.SAMBAMANPAGES('manpages/%s.8' % manpage) +-- +2.7.4 +