Skip to contentSkip to conversation

libldb: upgrade 2.3.3 -> 2.3.4

PATCH In review Yi Zhao 2 participants 5 messages Aug 26, 2022 – Aug 27, 2022

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/3 libldb: upgrade 2.3.3 -> 2.3.4

Required by samba 4.14.14.

---
 .../libldb/{libldb_2.3.3.bb => libldb_2.3.4.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/libldb/{libldb_2.3.3.bb => libldb_2.3.4.bb} (95%)
meta-networking/recipes-support/libldb/libldb_2.3.4.bb renamed from meta-networking/recipes-support/libldb/libldb_2.3.3.bb +2 -2
similarity index 95%
rename from meta-networking/recipes-support/libldb/libldb_2.3.3.bb
rename to meta-networking/recipes-support/libldb/libldb_2.3.4.bb
index 6dd3ec3a9..af5f0427d 100644
@@ -32,8 +32,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
                     file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \
                     file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42"
 
-SRC_URI[md5sum] = "6824f69ea3bb58cb8a3be4c179e7569a"
-SRC_URI[sha256sum] = "9ef39700ff05b3e8f5801d2a39fe1ba023218650f81c9d377caca22f49076807"
+SRC_URI[md5sum] = "b01d6913a06901c22c5bc6caedc548ac"
+SRC_URI[sha256sum] = "f2e88dcab7b6007d92724b62f8a16e7c6e77275885c60eb4f87097e4aa4082c1"
 
 inherit pkgconfig waf-samba
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/3 samba: upgrade 4.14.13 -> 4.14.14

This is a security release in order to address the following defects:

CVE-2022-2031: Samba AD users can bypass certain restrictions associated
with changing passwords.
https://www.samba.org/samba/security/CVE-2022-2031.html

CVE-2022-32744: Samba AD users can forge password change requests for

                any user.
                https://www.samba.org/samba/security/CVE-2022-32744.html

CVE-2022-32745: Samba AD users can crash the server process with an LDAP
add or modify request.
https://www.samba.org/samba/security/CVE-2022-32745.html

CVE-2022-32746: Samba AD users can induce a use-after-free in the server
process with an LDAP add or modify request.
https://www.samba.org/samba/security/CVE-2022-32746.html

CVE-2022-32742: Server memory information leak via SMB1.

                https://www.samba.org/samba/security/CVE-2022-32742.html

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

---
 .../samba/{samba_4.14.13.bb => samba_4.14.14.bb}                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-connectivity/samba/{samba_4.14.13.bb => samba_4.14.14.bb} (99%)
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb renamed from meta-networking/recipes-connectivity/samba/samba_4.14.13.bb +1 -1
similarity index 99%
rename from meta-networking/recipes-connectivity/samba/samba_4.14.13.bb
rename to meta-networking/recipes-connectivity/samba/samba_4.14.14.bb
index 49e93fc53..cb3678d7b 100644
@@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \
            file://samba-fix-musl-lib-without-innetgr.patch \
            "
 
-SRC_URI[sha256sum] = "e1df792818a17d8d21faf33580d32939214694c92b84fb499464210d86a7ff75"
+SRC_URI[sha256sum] = "abd5e9e6aa45e55114b188ba189ebdfc8fd3d7718d43f749e477ce7f791e5519"
 
 UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz"
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/3 samba: fix buildpaths issue

In reply to Yi Zhao

The test case tfork_cmd_send in smbtorture fails on target as it requries a script located in the source directory:

$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send
test: tfork_cmd_send
/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh:
Failed to exec child - No such file or directory

This also triggers the buildpaths warning:
QA Issue: File /usr/bin/smbtorture in package samba-testsuite contains reference to TMPDIR [buildpaths]

Skip this test case in smbtorture to avoid the warning. And also disable rpath build.

---
 ...orture-skip-test-case-tfork_cmd_send.patch | 38 +++++++++++++++++++
 .../samba/samba_4.14.14.bb                    |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/samba/samba/0001-smbtorture-skip-test-case-tfork_cmd_send.patch
meta-networking/recipes-connectivity/samba/samba/0001-smbtorture-skip-test-case-tfork_cmd_send.patch new file +38 -0
new file mode 100644
index 000000000..90ee31786
@@ -0,0 +1,38 @@
+From 059b517f9ef6cbdc696e0983ce255b1728042827 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Thu, 25 Aug 2022 16:46:04 +0800
+Subject: [PATCH] smbtorture: skip test case tfork_cmd_send
+
+The test case tfork_cmd_send fails on target as it requires a script
+located in the source directory:
+
+$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send
+test: tfork_cmd_send
+/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh:
+Failed to exec child - No such file or directory
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ lib/util/tests/tfork.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/util/tests/tfork.c b/lib/util/tests/tfork.c
+index 70ae975..4826ce6 100644
+--- a/lib/util/tests/tfork.c
++++ b/lib/util/tests/tfork.c
+@@ -839,10 +839,6 @@ struct torture_suite *torture_local_tfork(TALLOC_CTX *mem_ctx)
+ 				      "tfork_threads",
+ 				      test_tfork_threads);
+ 
+-	torture_suite_add_simple_test(suite,
+-				      "tfork_cmd_send",
+-				      test_tfork_cmd_send);
+-
+ 	torture_suite_add_simple_test(suite,
+ 				      "tfork_event_file_handle",
+ 				      test_tfork_event_file_handle);
+-- 
+2.25.1
+
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +2 -0
index cb3678d7b..8877b8e1a 100644
@@ -21,6 +21,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
            file://0004-Add-options-to-configure-the-use-of-libbsd.patch \
            file://0005-samba-build-dnsserver_common-code.patch \
            file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \
+           file://0001-smbtorture-skip-test-case-tfork_cmd_send.patch \
            "
 
 SRC_URI:append:libc-musl = " \
@@ -114,6 +115,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --with-modulesdir=${libdir}/samba \
                  --with-lockdir=${localstatedir}/lib/samba \
                  --with-cachedir=${localstatedir}/lib/samba \
+                 --disable-rpath \
                  --disable-rpath-install \
                  --with-shared-modules=${SAMBA4_MODULES} \
                  --bundled-libraries=${SAMBA4_LIBS} \
Signature · 1 line
2.25.1
#3 lore raw

Re: [oe] [meta-networking][PATCH 3/3] samba: fix buildpaths issue

Quoted 79 lines · Yi Zhao

The test case tfork_cmd_send in smbtorture fails on target as it requries a script located in the source directory:

$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send
test: tfork_cmd_send
/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh:
Failed to exec child - No such file or directory

This also triggers the buildpaths warning:
QA Issue: File /usr/bin/smbtorture in package samba-testsuite contains reference to TMPDIR [buildpaths]

Skip this test case in smbtorture to avoid the warning. And also disable rpath build.

---
 ...orture-skip-test-case-tfork_cmd_send.patch | 38 +++++++++++++++++++
 .../samba/samba_4.14.14.bb                    |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/samba/samba/0001-smbtorture-skip-test-case-tfork_cmd_send.patch
meta-networking/recipes-connectivity/samba/samba/0001-smbtorture-skip-test-case-tfork_cmd_send.patch new file +38 -0
new file mode 100644
index 000000000..90ee31786
@@ -0,0 +1,38 @@
+From 059b517f9ef6cbdc696e0983ce255b1728042827 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Thu, 25 Aug 2022 16:46:04 +0800
+Subject: [PATCH] smbtorture: skip test case tfork_cmd_send
+
+The test case tfork_cmd_send fails on target as it requires a script
+located in the source directory:
+
+$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send
+test: tfork_cmd_send
+/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh:
+Failed to exec child - No such file or directory
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ lib/util/tests/tfork.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/util/tests/tfork.c b/lib/util/tests/tfork.c
+index 70ae975..4826ce6 100644
+--- a/lib/util/tests/tfork.c
++++ b/lib/util/tests/tfork.c
+@@ -839,10 +839,6 @@ struct torture_suite *torture_local_tfork(TALLOC_CTX *mem_ctx)
+                                     "tfork_threads",
+                                     test_tfork_threads);
+
+-      torture_suite_add_simple_test(suite,
+-                                    "tfork_cmd_send",
+-                                    test_tfork_cmd_send);
+-
+       torture_suite_add_simple_test(suite,
+                                     "tfork_event_file_handle",
+                                     test_tfork_event_file_handle);
+--
+2.25.1
+
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +1 -0
index cb3678d7b..8877b8e1a 100644
@@ -21,6 +21,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
            file://0004-Add-options-to-configure-the-use-of-libbsd.patch \
            file://0005-samba-build-dnsserver_common-code.patch \
            file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \
+           file://0001-smbtorture-skip-test-case-tfork_cmd_send.patch \
            "
 
 SRC_URI:append:libc-musl = " \

meta-networking/recipes-connectivity/samba/samba_4.14.14.bb EXTRA_OECONF += "--enable-fhs \ · line 118

Quoted 4 lines
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +1 -0
@@ -114,6 +115,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --with-modulesdir=${libdir}/samba \
                  --with-lockdir=${localstatedir}/lib/samba \
                  --with-cachedir=${localstatedir}/lib/samba \
+                 --disable-rpath \

this means that private libs installed in /usr/lib/samba are not detected by dependent packages anymore
try to build meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb

It errors like this
https://errors.yoctoproject.org/Errors/Details/669955/

but the real error is a configure test failure

/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/smbnetfs/0.6.3-r0/recipe-sysroot-native/usr/bin/x86_64-yoe-linux-musl/x86_64-yoe-linux-musl-ld:
warning: liblibsmb-samba4.so, needed by /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/smbnetfs/0.6.3-r0/recipe-sysroot/usr/lib/libsmbclient.so,
not found (try using -rpath or -rpath-link)

this library is in usr/lib/samba

Quoted 15 lines
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +0 -1
                  --disable-rpath-install \
                  --with-shared-modules=${SAMBA4_MODULES} \
                  --bundled-libraries=${SAMBA4_LIBS} \
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#98439): https://lists.openembedded.org/g/openembedded-devel/message/98439
Mute This Topic: https://lists.openembedded.org/mt/93261519/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#4 lore raw

Re: [oe] [meta-networking][PATCH 3/3] samba: fix buildpaths issue

Quoted 90 lines · Khem Raj
Quoted 78 lines · Yi Zhao

The test case tfork_cmd_send in smbtorture fails on target as it requries a script located in the source directory:

$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send
test: tfork_cmd_send
/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh:
Failed to exec child - No such file or directory

This also triggers the buildpaths warning:
QA Issue: File /usr/bin/smbtorture in package samba-testsuite contains reference to TMPDIR [buildpaths]

Skip this test case in smbtorture to avoid the warning. And also disable rpath build.

---
  ...orture-skip-test-case-tfork_cmd_send.patch | 38 +++++++++++++++++++
  .../samba/samba_4.14.14.bb                    |  2 +
  2 files changed, 40 insertions(+)

create mode 100644 meta-networking/recipes-connectivity/samba/samba/0001-smbtorture-skip-test-case-tfork_cmd_send.patch

meta-networking/recipes-connectivity/samba/samba/0001-smbtorture-skip-test-case-tfork_cmd_send.patch new file +38 -0
new file mode 100644
index 000000000..90ee31786
@@ -0,0 +1,38 @@
+From 059b517f9ef6cbdc696e0983ce255b1728042827 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Thu, 25 Aug 2022 16:46:04 +0800
+Subject: [PATCH] smbtorture: skip test case tfork_cmd_send
+
+The test case tfork_cmd_send fails on target as it requires a script
+located in the source directory:
+
+$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send
+test: tfork_cmd_send
+/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh:
+Failed to exec child - No such file or directory
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ lib/util/tests/tfork.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/util/tests/tfork.c b/lib/util/tests/tfork.c
+index 70ae975..4826ce6 100644
+--- a/lib/util/tests/tfork.c
++++ b/lib/util/tests/tfork.c
+@@ -839,10 +839,6 @@ struct torture_suite *torture_local_tfork(TALLOC_CTX *mem_ctx)
+                                     "tfork_threads",
+                                     test_tfork_threads);
+
+-      torture_suite_add_simple_test(suite,
+-                                    "tfork_cmd_send",
+-                                    test_tfork_cmd_send);
+-
+       torture_suite_add_simple_test(suite,
+                                     "tfork_event_file_handle",
+                                     test_tfork_event_file_handle);
+--
+2.25.1
+
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +1 -0
index cb3678d7b..8877b8e1a 100644
@@ -21,6 +21,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
             file://0004-Add-options-to-configure-the-use-of-libbsd.patch \
             file://0005-samba-build-dnsserver_common-code.patch \
             file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \
+           file://0001-smbtorture-skip-test-case-tfork_cmd_send.patch \
             "
 
  SRC_URI:append:libc-musl = " \

meta-networking/recipes-connectivity/samba/samba_4.14.14.bb EXTRA_OECONF += "--enable-fhs \ · line 118

Quoted 4 lines
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +1 -0
@@ -114,6 +115,7 @@ EXTRA_OECONF += "--enable-fhs \
                   --with-modulesdir=${libdir}/samba \
                   --with-lockdir=${localstatedir}/lib/samba \
                   --with-cachedir=${localstatedir}/lib/samba \
+                 --disable-rpath \

this means that private libs installed in /usr/lib/samba are not detected by dependent packages anymore
try to build meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb

It errors like this
https://errors.yoctoproject.org/Errors/Details/669955/

Quoted 8 lines

but the real error is a configure test failure

/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/smbnetfs/0.6.3-r0/recipe-sysroot-native/usr/bin/x86_64-yoe-linux-musl/x86_64-yoe-linux-musl-ld:
warning: liblibsmb-samba4.so, needed by /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/smbnetfs/0.6.3-r0/recipe-sysroot/usr/lib/libsmbclient.so,
not found (try using -rpath or -rpath-link)

this library is in usr/lib/samba

I can not reproduce this on my host. I have sent a V2 patch without this change.

//Yi

Quoted 15 lines
Quoted 15 lines
meta-networking/recipes-connectivity/samba/samba_4.14.14.bb +0 -1
                   --disable-rpath-install \
                   --with-shared-modules=${SAMBA4_MODULES} \
                   --bundled-libraries=${SAMBA4_LIBS} \
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#98439): https://lists.openembedded.org/g/openembedded-devel/message/98439
Mute This Topic: https://lists.openembedded.org/mt/93261519/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-