mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-06 04:49:29 +00:00
Code Issues Projects Releases Wiki Activity

samba: upgrade 4.18.9 -> 4.19.3

Browse Source 
According to samba release planning[1], 4.18 is already in maintenance
mode and will be EOL in Sep 2024. Upgrade to current stable release
4.19.

Release Notes
https://www.samba.org/samba/history/samba-4.19.0.html
https://www.samba.org/samba/history/samba-4.19.3.html

[1] https://wiki.samba.org/index.php/Samba_Release_Planning

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2024-01-01 15:49:58 +08:00
committed by Khem Raj
parent 5905144554
commit 5260f11b04
26 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
View File

@@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
View File

@@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-arm.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-armeb.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-i586.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-i686.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-mips.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
View File

@@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt
View File

@@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt
View File

@@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
View File

@@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

2
meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
View File

@@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO
Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK
Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports flags to send direct I/O availability signals: NO
Checking whether fcntl supports setting/geting hints: NO Checking whether fcntl supports setting/getting hints: NO
Checking for readlink breakage: NO Checking for readlink breakage: NO
Checking for gnutls fips mode support: NO Checking for gnutls fips mode support: NO

8
meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch
View File

@@ -1,4 +1,4 @@
From f6fa33bfc2e1272198db6ea08910b4162b364b18 Mon Sep 17 00:00:00 2001 From 5c5418038e392cc00d3293e00ea0cd20b5e19c9a Mon Sep 17 00:00:00 2001
From: Bian Naimeng <biannm@cn.fujitsu.com> From: Bian Naimeng <biannm@cn.fujitsu.com>
Date: Mon, 18 Apr 2016 17:00:53 -0400 Date: Mon, 18 Apr 2016 17:00:53 -0400
Subject: [PATCH] Don't check xsltproc manpages Subject: [PATCH] Don't check xsltproc manpages
@@ -16,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
3 files changed, 3 insertions(+), 3 deletions(-) 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/ldb/wscript b/lib/ldb/wscript diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 60bb7cf..b7b0152 100644 index ed5d45f..de3c648 100644
--- a/lib/ldb/wscript --- a/lib/ldb/wscript
+++ b/lib/ldb/wscript +++ b/lib/ldb/wscript
@@ -144,7 +144,7 @@ def configure(conf): @@ -144,7 +144,7 @@ def configure(conf):
@@ -29,7 +29,7 @@ index 60bb7cf..b7b0152 100644
# we need this for the ldap backend # we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
diff --git a/lib/talloc/wscript b/lib/talloc/wscript diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3089663..76cd65e 100644 index 075f1ec..9bd9f73 100644
--- a/lib/talloc/wscript --- a/lib/talloc/wscript
+++ b/lib/talloc/wscript +++ b/lib/talloc/wscript
@@ -48,7 +48,7 @@ def configure(conf): @@ -48,7 +48,7 @@ def configure(conf):
@@ -42,7 +42,7 @@ index 3089663..76cd65e 100644
conf.CHECK_HEADERS('sys/auxv.h') conf.CHECK_HEADERS('sys/auxv.h')
conf.CHECK_FUNCS('getauxval') conf.CHECK_FUNCS('getauxval')
diff --git a/lib/tdb/wscript b/lib/tdb/wscript diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 71ada31..accd474 100644 index 5e6a928..f13cf2a 100644
--- a/lib/tdb/wscript --- a/lib/tdb/wscript
+++ b/lib/tdb/wscript +++ b/lib/tdb/wscript
@@ -95,7 +95,7 @@ def configure(conf): @@ -95,7 +95,7 @@ def configure(conf):

10
meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch
View File

@@ -1,4 +1,4 @@
From f7b8e2e149b06a8033e31f4242c392573fa9ab52 Mon Sep 17 00:00:00 2001 From ba492aead265edfd1da2a6c45dd7661c248309cb Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 25 Jun 2019 14:25:08 +0800 Date: Tue, 25 Jun 2019 14:25:08 +0800
Subject: [PATCH] do not import target module while cross compile Subject: [PATCH] do not import target module while cross compile
@@ -6,18 +6,18 @@ Subject: [PATCH] do not import target module while cross compile
Some modules such as dynamic library maybe cann't be imported Some modules such as dynamic library maybe cann't be imported
while cross compile, we just check whether does the module exist. while cross compile, we just check whether does the module exist.
Upstream-Status: Pending
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
update to version 4.10.5, and switch to python3 update to version 4.10.5, and switch to python3
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
Upstream-Status: Pending
buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-) 1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 7d2d855..01dcb56 100644 index 2300565..26d9e8c 100644
--- a/buildtools/wafsamba/samba_bundled.py --- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py
@@ -4,6 +4,7 @@ import sys @@ -4,6 +4,7 @@ import sys
@@ -28,7 +28,7 @@ index 7d2d855..01dcb56 100644
def PRIVATE_NAME(bld, name): def PRIVATE_NAME(bld, name):
'''possibly rename a library to include a bundled extension''' '''possibly rename a library to include a bundled extension'''
@@ -241,17 +242,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): @@ -245,17 +246,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
# versions # versions
minversion = minimum_library_version(conf, libname, minversion) minversion = minimum_library_version(conf, libname, minversion)

34
meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch
View File

@@ -1,4 +1,4 @@
From 556bb3cf17ccdf0b0ee0d82801c4b20cf0990ae4 Mon Sep 17 00:00:00 2001 From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 20 Jun 2019 14:11:16 +0800 Date: Thu, 20 Jun 2019 14:11:16 +0800
Subject: [PATCH] Add config option without-valgrind Subject: [PATCH] Add config option without-valgrind
@@ -9,38 +9,44 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Update patch to version 4.10.5 Update patch to version 4.10.5
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
Rebase to 4.19.3
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
--- ---
lib/replace/wscript | 5 +++-- lib/replace/wscript | 5 +++--
wscript | 4 ++++ wscript | 7 +++++++
2 files changed, 7 insertions(+), 2 deletions(-) 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/replace/wscript b/lib/replace/wscript diff --git a/lib/replace/wscript b/lib/replace/wscript
index 2f17999..9ef9bd9 100644 index 37d7759..9dd9b48 100644
--- a/lib/replace/wscript --- a/lib/replace/wscript
+++ b/lib/replace/wscript +++ b/lib/replace/wscript
@@ -114,8 +114,9 @@ def configure(conf): @@ -113,8 +113,9 @@ def configure(conf):
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') - conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
+ if not Options.options.disable_valgrind: + if Options.options.enable_valgrind:
+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') + conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
diff --git a/wscript b/wscript diff --git a/wscript b/wscript
index 3af4207..54d7e9e 100644 index 95ddd9e..6d9577a 100644
--- a/wscript --- a/wscript
+++ b/wscript +++ b/wscript
@@ -116,6 +116,10 @@ def options(opt): @@ -123,6 +123,13 @@ def options(opt):
help=("Disable RELRO builds"), help=('Disable kernely keyring support for credential storage'),
action="store_false", dest='enable_relro') action='store_false', dest='enable_keyring')
+ opt.add_option('--with-valgrind',
+ help=("Enable use of valgrind"),
+ action="store_true", dest='enable_valgrind')
+ opt.add_option('--without-valgrind', + opt.add_option('--without-valgrind',
+ help=("Disable use of the valgrind headers"), + help=("Disable use of valgrind"),
+ action="store_true", dest='disable_valgrind', default=False) + action="store_false", dest='enable_valgrind', default=False)
+ +
gr = opt.option_group('developer options') gr = opt.option_group('developer options')

9
meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch
View File

@@ -1,9 +1,10 @@
From 515f2455b4b69f5fcd2c61a532663280785db737 Mon Sep 17 00:00:00 2001 From d302d9a4ac6eb2bbafd248064a878ba287d636b8 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com> From: Peter Kjellerstedt <pkj@axis.com>
Date: Tue, 28 Apr 2020 02:05:33 +0200 Date: Tue, 28 Apr 2020 02:05:33 +0200
Subject: [PATCH] Add options to configure the use of libbsd Subject: [PATCH] Add options to configure the use of libbsd
Upstream-Status: Inappropriate [oe deterministic build specific] Upstream-Status: Inappropriate [oe deterministic build specific]
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Rebase to 4.14.4 Rebase to 4.14.4
@@ -15,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
3 files changed, 29 insertions(+), 15 deletions(-) 3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 8729b08..1c55428 100644 index 30cb366..d167551 100644
--- a/buildtools/wafsamba/wscript --- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript
@@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), @@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''),
@@ -33,10 +34,10 @@ index 8729b08..1c55428 100644
gr.add_option('-C', gr.add_option('-C',
diff --git a/lib/replace/wscript b/lib/replace/wscript diff --git a/lib/replace/wscript b/lib/replace/wscript
index 9ef9bd9..d47de4f 100644 index 9dd9b48..a22ae59 100644
--- a/lib/replace/wscript --- a/lib/replace/wscript
+++ b/lib/replace/wscript +++ b/lib/replace/wscript
@@ -439,20 +439,21 @@ def configure(conf): @@ -444,20 +444,21 @@ def configure(conf):
strlcpy_in_bsd = False strlcpy_in_bsd = False

6
meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch
View File

@@ -1,4 +1,4 @@
From a8b4a40b535a2c69eb408f649e7169bcc1975fc1 Mon Sep 17 00:00:00 2001 From d2a2d0f82a37d0bf21123671774b0b03ffa976cf Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com> From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 24 Nov 2021 13:33:35 +0800 Date: Wed, 24 Nov 2021 13:33:35 +0800
Subject: [PATCH] Fix pyext_PATTERN for cross compilation Subject: [PATCH] Fix pyext_PATTERN for cross compilation
@@ -46,10 +46,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
index a23bd01..af202e0 100644 index b2dd1a9..2bd3545 100644
--- a/third_party/waf/waflib/Tools/python.py --- a/third_party/waf/waflib/Tools/python.py
+++ b/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py
@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): @@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'):
x = 'MACOSX_DEPLOYMENT_TARGET' x = 'MACOSX_DEPLOYMENT_TARGET'
if dct[x]: if dct[x]:
env[x] = conf.environ[x] = str(dct[x]) env[x] = conf.environ[x] = str(dct[x])

2
meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch
View File

@@ -1,4 +1,4 @@
From 950b5977ea7e72343067d0070cc35fb0dc5163d4 Mon Sep 17 00:00:00 2001 From 4fd04fc7c94d6981f3409d088ab8d32c48460010 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com> From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 25 Aug 2022 16:46:04 +0800 Date: Thu, 25 Aug 2022 16:46:04 +0800
Subject: [PATCH] smbtorture: skip test case tfork_cmd_send Subject: [PATCH] smbtorture: skip test case tfork_cmd_send

11
meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch
View File

@@ -1,4 +1,4 @@
From f783bb9c87ce11e824dfefca473d0dcf6edad238 Mon Sep 17 00:00:00 2001 From bf5552f937c745940081e29ef32d52ae26bfd8c1 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@fujitsu.com> From: Lei Maohui <leimaohui@fujitsu.com>
Date: Sun, 30 Oct 2022 11:59:31 +0900 Date: Sun, 30 Oct 2022 11:59:31 +0900
Subject: [PATCH] Deleted settiong of python to fix the install conflict error Subject: [PATCH] Deleted settiong of python to fix the install conflict error
@@ -22,7 +22,8 @@ sys.path.insert(0, "/usr/lib/python3.10/site-packages")
But this setting is for environment when running from source tree. There But this setting is for environment when running from source tree. There
is no necessary on target. is no necessary on target.
Upstream-Status: Inappropriate Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
--- ---
source4/scripting/bin/samba-gpupdate | 1 - source4/scripting/bin/samba-gpupdate | 1 -
@@ -47,7 +48,7 @@ index 4b3f057..08fec2d 100755
import optparse import optparse
from samba import getopt as options from samba import getopt as options
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index f8a70a6..3c818de 100755 index b02ad4d..f69ae10 100755
--- a/source4/scripting/bin/samba-tool --- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool +++ b/source4/scripting/bin/samba-tool
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
@@ -59,7 +60,7 @@ index f8a70a6..3c818de 100755
# make sure the script dies immediately when hitting control-C, # make sure the script dies immediately when hitting control-C,
# rather than raising KeyboardInterrupt. As we do all database # rather than raising KeyboardInterrupt. As we do all database
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 1ce53f5..2cdfbf8 100755 index 69821e2..4037870 100755
--- a/source4/scripting/bin/samba_dnsupdate --- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate
@@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' @@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1'
@@ -95,7 +96,7 @@ index 67d801e..2fc0d6a 100755
import optparse import optparse
import time import time
diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
index 84ff771..b6fe041 100755 index b421886..5e18ad9 100755
--- a/source4/scripting/bin/samba_spnupdate --- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate +++ b/source4/scripting/bin/samba_spnupdate
@@ -32,7 +32,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' @@ -32,7 +32,6 @@ os.environ['PYTHONUNBUFFERED'] = '1'

8
meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch
View File

@@ -1,4 +1,4 @@
From 08003ea30d86a8b983be89f6a161d3baacdaa038 Mon Sep 17 00:00:00 2001 From e5d9527e6b3b386229747f799c725fcd68bc5228 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 6 Nov 2016 23:40:54 -0800 Date: Sun, 6 Nov 2016 23:40:54 -0800
Subject: [PATCH] Musl does not have _r versions of getent() and getpwent() Subject: [PATCH] Musl does not have _r versions of getent() and getpwent()
@@ -7,15 +7,15 @@ Subject: [PATCH] Musl does not have _r versions of getent() and getpwent()
Taken from gentoo Taken from gentoo
http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
source4/torture/local/nss_tests.c | 13 ++++++++----- source4/torture/local/nss_tests.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-) 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
index 2943122..bc185ca 100644 index e911aa2..2b39b74 100644
--- a/source4/torture/local/nss_tests.c --- a/source4/torture/local/nss_tests.c
+++ b/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c
@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, @@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx,

12
meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
View File

@@ -1,22 +1,22 @@
From 6822c61ade5617c9f109e32ad4cdc115fa9e12c8 Mon Sep 17 00:00:00 2001 From c533bdced677e2104565fc06602e7e63d9c79ac0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 6 Nov 2016 23:40:54 -0800 Date: Sun, 6 Nov 2016 23:40:54 -0800
Subject: [PATCH] Lifted from gentoo and ported to 4.4.5 Subject: [PATCH] Lifted from gentoo and ported to 4.4.5
http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
source3/wscript | 13 ++++++++++++- source3/wscript | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-) 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/source3/wscript b/source3/wscript diff --git a/source3/wscript b/source3/wscript
index 22be17a..ee9ce52 100644 index b7f96f3..ed12b1e 100644
--- a/source3/wscript --- a/source3/wscript
+++ b/source3/wscript +++ b/source3/wscript
@@ -862,7 +862,7 @@ msg.msg_accrightslen = sizeof(fd); @@ -863,7 +863,7 @@ msg.msg_accrightslen = sizeof(fd);
if conf.env.with_iconv: if conf.env.with_iconv:
conf.DEFINE('HAVE_ICONV', 1) conf.DEFINE('HAVE_ICONV', 1)
@@ -25,7 +25,7 @@ index 22be17a..ee9ce52 100644
use_pam=True use_pam=True
conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
@@ -939,6 +939,17 @@ int i; i = PAM_RADIO_TYPE; @@ -940,6 +940,17 @@ int i; i = PAM_RADIO_TYPE;
"or headers not found. Use --without-pam to disable " "or headers not found. Use --without-pam to disable "
"PAM support."); "PAM support.");

6
meta-networking/recipes-connectivity/samba/samba_4.18.9.bb → meta-networking/recipes-connectivity/samba/samba_4.19.3.bb
View File

@@ -31,9 +31,9 @@ SRC_URI:append:libc-musl = " \
file://samba-4.3.9-remove-getpwent_r.patch \ file://samba-4.3.9-remove-getpwent_r.patch \
" "
SRC_URI[sha256sum] = "f455c1d6351ed3a36fc2cb6e8ab1bfd0effe54a56686ffd495d64ab52d50f245" SRC_URI[sha256sum] = "280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96"
UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz"
inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig
@@ -85,7 +85,7 @@ PACKAGECONFIG[sasl] = ",,cyrus-sasl"
PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi"
PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi"
PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
PACKAGECONFIG[lttng] = "--with-lttng,--without-lttng,lttng-ust" PACKAGECONFIG[lttng] = "--with-lttng,--without-lttng,lttng-ust"
PACKAGECONFIG[archive] = "--with-libarchive,--without-libarchive,libarchive" PACKAGECONFIG[archive] = "--with-libarchive,--without-libarchive,libarchive"
PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"