diff mbox series

[meta-networking] samba: upgrade 4.17.4 -> 4.17.5

Message ID 20230129014257.1705368-1-yi.zhao@windriver.com
State Under Review
Headers show
Series [meta-networking] samba: upgrade 4.17.4 -> 4.17.5 | expand

Commit Message

Yi Zhao Jan. 29, 2023, 1:42 a.m. UTC 
Release Notes:
https://www.samba.org/samba/history/samba-4.17.5.html

Drop 0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch
as the issue has been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...of-python-to-fix-the-install-confli.patch} |  0
 ...ith-Werror-implicit-function-declara.patch | 32 -------------------
 .../{samba_4.17.4.bb => samba_4.17.5.bb}      |  5 ++-
 3 files changed, 2 insertions(+), 35 deletions(-)
 rename meta-networking/recipes-connectivity/samba/samba/{0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch => 0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch} (100%)
 delete mode 100644 meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch
 rename meta-networking/recipes-connectivity/samba/{samba_4.17.4.bb => samba_4.17.5.bb} (98%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/samba/samba/0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch
similarity index 100%
rename from meta-networking/recipes-connectivity/samba/samba/0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch
rename to meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch
diff --git a/meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch b/meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch
deleted file mode 100644
index 91eb22967..000000000
--- a/meta-networking/recipes-connectivity/samba/samba/0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 95946ce8b6317f68c51338d19d237ce6da61d1c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Aug 2022 13:05:26 -0700
-Subject: [PATCH] waf: Fix errors with Werror=implicit-function-declaration
- turned on
-
-Clang-15 turns this option into errors by default, and it results in
-rpath check failures
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- 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 e2a078b..e145c77 100644
---- a/buildtools/wafsamba/samba_waf18.py
-+++ b/buildtools/wafsamba/samba_waf18.py
-@@ -209,7 +209,7 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None):
-         lib_node.parent.mkdir()
-         lib_node.write('int lib_func(void) { return 42; }\n', 'w')
-         main_node = bld.srcnode.make_node('main.c')
--        main_node.write('int main(void) {return !(lib_func() == 42);}', 'w')
-+        main_node.write('int lib_func(void); int main(void) {return !(lib_func() == 42);}', 'w')
-         linkflags = []
-         if version_script:
-             script = bld.srcnode.make_node('ldscript')
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb b/meta-networking/recipes-connectivity/samba/samba_4.17.5.bb
similarity index 98%
rename from meta-networking/recipes-connectivity/samba/samba_4.17.4.bb
rename to meta-networking/recipes-connectivity/samba/samba_4.17.5.bb
index 966eaf9bf..1548ffadc 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.17.4.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.17.5.bb
@@ -23,8 +23,7 @@  SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
            file://0004-Add-options-to-configure-the-use-of-libbsd.patch \
            file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \
            file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \
-           file://0007-waf-Fix-errors-with-Werror-implicit-function-declara.patch \
-           file://0008-Deleted-settiong-of-python-to-fix-the-install-confli.patch \
+           file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \
            "
 
 SRC_URI:append:libc-musl = " \
@@ -33,7 +32,7 @@  SRC_URI:append:libc-musl = " \
            file://cmocka-uintptr_t.patch \
            "
 
-SRC_URI[sha256sum] = "c0512079db4cac707ccea4c18aebbd6b2eb3acf6e90735e7f645a326be1f4537"
+SRC_URI[sha256sum] = "ebb7880d474ffc09d73b5fc77bcbd657f6235910337331a9c24d7f69ca11442b"
 
 UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.17(\.\d+)+).tar.gz"