diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2021-06-05 21:48:16 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-06-05 08:19:06 -0700 |
commit | dd422c5467077c14fadec412750c369d2d273e0b (patch) | |
tree | c962b76809e58065d87394694f00fff2ced32397 /meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch | |
parent | 861c0955dde202fbbc53e972293f449f72bb7a1a (diff) | |
download | meta-openembedded-dd422c5467077c14fadec412750c369d2d273e0b.tar.gz |
samba: upgrade 4.10.18 -> 4.14.4
The 4.10.x is EOL: https://wiki.samba.org/index.php/Samba_Release_Planning
Upgrade to latest 4.14.x.
Remove PACKAGECONFIG[gnutls] since the gnutls is now the mandatory
requirement for samba. See:
https://wiki.samba.org/index.php/Package_Dependencies_Required_to_Build_Samba#Mandatory
Refresh patches:
16-do-not-check-xsltproc-manpages.patch
20-do-not-import-target-module-while-cross-compile.patch
21-add-config-option-without-valgrind.patch
0001-Add-options-to-configure-the-use-of-libbsd.patch
dnsserver-4.7.0.patch
iconv-4.7.0.patch
0001-samba-fix-musl-lib-without-innetgr.patch
Drop patches:
0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch
0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch
0001-waf-add-support-of-cross_compile.patch
0002-util_sec.c-Move-__thread-variable-to-global-scope.patch
CVE-2020-14318.patch
CVE-2020-14383.patch
glibc_only.patch
smb_conf-4.7.0.patch
Add new patches:
0007-wscript_configure_system_gnutls-disable-check-gnutls.patch
0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch
source3-wscript-disable-check-fcntl-RW_HINTS.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch deleted file mode 100644 index 3f2921ed33..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch +++ /dev/null @@ -1,67 +0,0 @@ -From cc0576405803bcae45ee353c4333c449cead9207 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 25 Jun 2019 14:25:08 +0800 -Subject: [PATCH] do not import target module while cross compile - -Some modules such as dynamic library maybe cann't be imported -while cross compile, we just check whether does the module exist. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -update to version 4.10.5, and switch to python3 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 60ce7da..5468a36 100644 ---- a/buildtools/wafsamba/samba_bundled.py -+++ b/buildtools/wafsamba/samba_bundled.py -@@ -4,6 +4,7 @@ import sys - from waflib import Build, Options, Logs - from waflib.Configure import conf - from wafsamba import samba_utils -+import importlib.util, os - - def PRIVATE_NAME(bld, name, private_extension, private_library): - '''possibly rename a library to include a bundled extension''' -@@ -249,17 +250,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): - # versions - minversion = minimum_library_version(conf, libname, minversion) - -- try: -- m = __import__(modulename) -- except ImportError: -- found = False -- else: -+ # Find module in PYTHONPATH -+ spec = importlib.util._find_spec_from_path(modulename, [os.environ["PYTHONPATH"]]) -+ if spec: - try: -- version = m.__version__ -- except AttributeError: -+ module = importlib.util.module_from_spec(spec) -+ spec.loader.load_module(module) -+ except ImportError: - found = False -+ -+ if conf.env.CROSS_COMPILE: -+ # Some modules such as dynamic library maybe cann't be imported -+ # while cross compile, we just check whether the module exist -+ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (spec.name)) -+ found = True - else: -- found = tuplize_version(version) >= tuplize_version(minversion) -+ try: -+ version = module.__version__ -+ except AttributeError: -+ found = False -+ else: -+ found = tuplize_version(version) >= tuplize_version(minversion) - if not found and not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) - sys.exit(1) --- -2.7.4 - |