[PATCH 1/3] nfs-utils: upgrade 2.8.4 -> 2.8.5

[PATCH 1/3] nfs-utils: upgrade 2.8.4 -> 2.8.5

[Randy.MacLeod]

From: Randy MacLeod <Randy.MacLeod@windriver.com>

Commits (aside from typo fixes):

4e9b31fe Release: 2.8.5
00e2e62b nfsdctl: add support for min-threads parameter
4c275442 systemd: drop Wants=network-online.target for rpc-statd-notify
03b9c540 nfsiostat: normalize the mountpoints passed in from the command line
59e85671 Rename CONFIG_NFSV41 to CONFIG_BLKMAPD and disable by default
3b7de50f nfsdctl: ignore ipv6 listener creation error
0e71be58 locktest: use correct build flags
077b70fe sm-notify: Do not drop privileges if running as non-root user
8600bbb7 gssd: protect kerberos ticket cache access

CONFIG_NFSV41 was renamed to CONFIG_BLKMAPD so update the associated PACKAGEONFIG option.

Drop: 0001-locktest-Makefile.am-Do-not-use-build-flags.patch which as merged in:
   0e71be58 locktest: use correct build flags

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 ...t-Makefile.am-Do-not-use-build-flags.patch | 36 -------------------
 ...{nfs-utils_2.8.4.bb => nfs-utils_2.8.5.bb} |  7 ++--
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.4.bb => nfs-utils_2.8.5.bb} (95%)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch
deleted file mode 100644
index 351407ddcd..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9efa7a0d37665d9bb0f46d2407883a5ab42c2b84 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 24 Jul 2023 20:39:16 -0700
-Subject: [PATCH] locktest: Makefile.am: Do not use build flags
-
-Using CFLAGS_FOR_BUILD etc. here means it is using wrong flags
-when thse flags are speficied different than target flags which
-is common when cross-building. It can pass wrong paths to linker
-and it would find incompatible libraries during link since they
-are from host system and target maybe not same as build host.
-
-Fixes subtle errors like
-| aarch64-yoe-linux-ld.lld: error: /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/nfs-utils/2.6.3-r0/recipe-sysroot-native/usr/lib/libsqlite3.so is incompatible with elf64-littleaarch64
-
-Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=169025681008001&w=2]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/locktest/Makefile.am | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
-index e8914655..2fd36971 100644
---- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -2,8 +2,5 @@
- 
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
--testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
--testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
--testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
--- 
-2.41.0
-
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.5.bb
similarity index 95%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.5.bb
index 65970f58e8..119e49e2a2 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.5.bb
@@ -21,12 +21,11 @@ USERADD_PARAM:${PN}-client = "--system  --home-dir /var/lib/nfs \
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
            file://nfsserver \
            file://nfscommon \
-           file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \
            file://0004-Use-nogroup-for-nobody-group.patch \
            file://0005-find-OE-provided-Kerberos.patch \
            "
 
-SRC_URI[sha256sum] = "11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5"
+SRC_URI[sha256sum] = "b13ca4a9df44186bdbe107514b22732d4243f785f95daf2fb86afc1edba15bbb"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.
@@ -61,8 +60,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \
 #krb5 is available in meta-oe
 PACKAGECONFIG[gssapi] = "--with-krb5=${STAGING_EXECPREFIXDIR} --enable-gss --enable-svcgss,--disable-gss --disable-svcgss,krb5"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-# libdevmapper is available in meta-oe
-PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmapper"
+# libdevmapper is available in meta-oe (PC name was nfsv41)
+PACKAGECONFIG[blkmapd] = "--enable-blkmapd,--disable-blkmapd,libdevmapper,libdevmapper"
 # keyutils is available in meta-oe
 PACKAGECONFIG[nfsv4] = "--enable-nfsv4 --enable-nfsdcltrack,--disable-nfsv4 --disable-nfsdcltrack,keyutils,python3-core"
 PACKAGECONFIG[nfsdctl] = "--enable-nfsdctl,--disable-nfsdctl,libnl readline,"
-- 
2.34.1

[PATCH 2/3] socat: Remove -fcommon from compiler flags

[Randy.MacLeod]

From: Khem Raj <raj.khem@gmail.com>

This is no longer needed with gcc or clang

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-connectivity/socat/socat_1.8.1.0.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-connectivity/socat/socat_1.8.1.0.bb b/meta/recipes-connectivity/socat/socat_1.8.1.0.bb
index 331133d6f9..b9a27c648e 100644
--- a/meta/recipes-connectivity/socat/socat_1.8.1.0.bb
+++ b/meta/recipes-connectivity/socat/socat_1.8.1.0.bb
@@ -43,8 +43,6 @@ PACKAGECONFIG ??= "readline openssl"
 PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
 
-CFLAGS += "-fcommon"
-
 do_install:prepend () {
     mkdir -p ${D}${bindir}
     install -d ${D}${bindir} ${D}${mandir}/man1
-- 
2.34.1

[PATCH 3/3] socat: upgrade 1.8.1.0 -> 1.8.1.1

[Randy.MacLeod]

From: Randy MacLeod <Randy.MacLeod@windriver.com>

Drop patch:
   0001-fix-compile-failed-with-musl.patch
which is merged upstream:
   a235f59 Avoid compilation issue in xio-netlink.c with Musl libc

commit log:

4ce8786 Version 1.8.1.1
f13b27d A few minor corrections
d5a2c46 Fixed a few buffer read overruns
b314687 Fixed issue with POSIXMQ in unidirectional context
a235f59 Avoid compilation issue in xio-netlink.c with Musl libc
a7058c9 Fixed strchr with const for new glibc
35d5da1 Fixed timestamps of -v and -x (really)

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 .../0001-fix-compile-failed-with-musl.patch   | 43 -------------------
 .../{socat_1.8.1.0.bb => socat_1.8.1.1.bb}    |  3 +-
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch
 rename meta/recipes-connectivity/socat/{socat_1.8.1.0.bb => socat_1.8.1.1.bb} (91%)

diff --git a/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch b/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch
deleted file mode 100644
index 1bbc8096ce..0000000000
--- a/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From baf05d4c74d35a98d65328b89627d1806bfd84a5 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 17 Dec 2025 11:31:29 +0800
-Subject: [PATCH] fix compile failed with musl
-
-...
-|../sources/socat-1.8.1.0/xio-netlink.c:33:59: error: initialization of 'int' from 'void *' makes integer from pointer without a cast [-Wint-conversion]
-|   33 |         struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-|      |                                                           ^~~~
-...
-
-The warning is due to the fact the NULL macro is defined (by most modern
-compilers) as ((void *)0), as it is intended to be used only for pointers.
-Assigning this value to the void *msg_control member of structure msghdr
-causes the warning.
-
-Make the 0/NULL initialization implicit
-
-Refer https://stackoverflow.com/questions/64535635/assignment-to-int-from-void-makes-integer-from-pointer-without-a-cast
-
-Upstream-Status: Submitted [socat@dest-unreach.org]
-Suggested-by: socat@dest-unreach.org
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- xio-netlink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xio-netlink.c b/xio-netlink.c
-index 533d78c..cb31c43 100644
---- a/xio-netlink.c
-+++ b/xio-netlink.c
-@@ -30,7 +30,7 @@ int xio_netlink_mtu(
- 	struct nlmsghdr buf[8192/sizeof(struct nlmsghdr)];
- 	struct iovec iov = { buf, sizeof(buf) };
- 	struct sockaddr_nl sa;
--	struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+	struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1};
- 	struct nlmsghdr *nh;
- 
- 	Info2("Setting interface %d MTU to %u using netlink", interface_index, mtu);
--- 
-2.49.0
-
diff --git a/meta/recipes-connectivity/socat/socat_1.8.1.0.bb b/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
similarity index 91%
rename from meta/recipes-connectivity/socat/socat_1.8.1.0.bb
rename to meta/recipes-connectivity/socat/socat_1.8.1.1.bb
index b9a27c648e..f6f2a3304b 100644
--- a/meta/recipes-connectivity/socat/socat_1.8.1.0.bb
+++ b/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
            file://0001-fix-compile-procan.c-failed.patch \
-           file://0001-fix-compile-failed-with-musl.patch \
 "
 
-SRC_URI[sha256sum] = "91f222ee65559036600c2505b999acebed48b899f0e2e53ae1c9c31d6986b6a4"
+SRC_URI[sha256sum] = "5ebc636b7f427053f98806696521653a614c7e06464910353cbf54e2327adc1b"
 
 inherit autotools
 
-- 
2.34.1