[PATCH 09/11] rpcbind: upgrade 1.2.9 -> 1.3.1

[Richard Purdie <richard.purdie@linuxfoundation.org>]

    rpcbind: only free the forward slot if the reply xid matched the request xid
    rpcbind: check for null netmask in addrmerge()
    rpcbind: restrict RPCBPROC_GETSTAT to loopback callers
    rpcbind: fully disable remote calls when --enable-rmtcalls is unset
    rpcbind: bound stats lists in rpcbs_getaddr() and rpcbs_rmtcall()
    rpcbind: only log failures in check_callit() if connection logging is enabled
    rpcinfo: stack buffer overflow in rpcinfo rpcbdump()
    rpcbind: fix leak of nconf in main()

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../0001-systemd-use-EnvironmentFile.patch     |  2 +-
 ...rpcbind_add_option_to_fix_port_number.patch | 18 +++++++++---------
 .../{rpcbind_1.2.9.bb => rpcbind_1.3.1.bb}     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename meta/recipes-extended/rpcbind/{rpcbind_1.2.9.bb => rpcbind_1.3.1.bb} (96%)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
index 621cc343225..539a492ec75 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
@@ -1,4 +1,4 @@
-From 43908891b9344054e23a7d9f4d6fc5b34b2406cf Mon Sep 17 00:00:00 2001
+From 69c128f5df9a24a8b05d4d2680361fa7d8711687 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan.agner@toradex.com>
 Date: Wed, 27 Aug 2025 11:30:48 +0800
 Subject: [PATCH] systemd: use EnvironmentFile
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
index f0a4df04e49..bf07379e4ce 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
@@ -1,4 +1,4 @@
-From fc77df5fed834dd1cffc8c58adb4a13a9b97f5cf Mon Sep 17 00:00:00 2001
+From cfcfb89543b654c128708f81dc18458149398966 Mon Sep 17 00:00:00 2001
 From: Roy Li <rongqing.li@windriver.com>
 Date: Wed, 27 Aug 2025 11:24:53 +0800
 Subject: [PATCH] add option to make users able to use fixed port number
@@ -38,7 +38,7 @@ index 15b70f9..4a6ffbc 100644
  .Fl h
  option is specified,
 diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
-index 6d0d72d..2f10dac 100644
+index 2c007eb..4ea2002 100644
 --- a/src/rpcb_svc_com.c
 +++ b/src/rpcb_svc_com.c
 @@ -49,6 +49,7 @@
@@ -49,7 +49,7 @@ index 6d0d72d..2f10dac 100644
  #include <netconfig.h>
  #include <errno.h>
  #include <syslog.h>
-@@ -499,6 +500,7 @@ xdr_opaque_parms(XDR *xdrs, struct r_rmtcall_args *cap)
+@@ -503,6 +504,7 @@ xdr_opaque_parms(XDR *xdrs, struct r_rmtcall_args *cap)
  
  static struct rmtcallfd_list *rmthead;
  static struct rmtcallfd_list *rmttail;
@@ -57,7 +57,7 @@ index 6d0d72d..2f10dac 100644
  
  int
  create_rmtcall_fd(struct netconfig *nconf)
-@@ -506,6 +508,8 @@ create_rmtcall_fd(struct netconfig *nconf)
+@@ -510,6 +512,8 @@ create_rmtcall_fd(struct netconfig *nconf)
  	int fd;
  	struct rmtcallfd_list *rmt;
  	SVCXPRT *xprt;
@@ -66,7 +66,7 @@ index 6d0d72d..2f10dac 100644
  
  	if ((fd = __rpc_nconf2fd(nconf)) == -1) {
  		if (debugging)
-@@ -514,6 +518,19 @@ create_rmtcall_fd(struct netconfig *nconf)
+@@ -518,6 +522,19 @@ create_rmtcall_fd(struct netconfig *nconf)
  			nconf->nc_device, errno);
  		return (-1);
  	}
@@ -87,7 +87,7 @@ index 6d0d72d..2f10dac 100644
  	if (xprt == NULL) {
  		if (debugging)
 diff --git a/src/rpcbind.c b/src/rpcbind.c
-index 4212377..7e7f79d 100644
+index c39df97..f94b813 100644
 --- a/src/rpcbind.c
 +++ b/src/rpcbind.c
 @@ -112,6 +112,7 @@ int runasdaemon = 0;
@@ -98,7 +98,7 @@ index 4212377..7e7f79d 100644
  
  char **hosts = NULL;
  int nhosts = 0;
-@@ -963,7 +964,7 @@ parseargs(int argc, char *argv[])
+@@ -964,7 +965,7 @@ parseargs(int argc, char *argv[])
  {
  	int c;
  	oldstyle_local = 1;
@@ -107,7 +107,7 @@ index 4212377..7e7f79d 100644
  		switch (c) {
  		case 'a':
  			doabort = 1;	/* when debugging, do an abort on */
-@@ -981,6 +982,9 @@ parseargs(int argc, char *argv[])
+@@ -982,6 +983,9 @@ parseargs(int argc, char *argv[])
  			if (hosts[nhosts - 1] == NULL)
  				errx(1, "Out of memory");
  			break;
@@ -117,7 +117,7 @@ index 4212377..7e7f79d 100644
  		case 'i':
  			insecure = 1;
  			break;
-@@ -1003,7 +1007,7 @@ parseargs(int argc, char *argv[])
+@@ -1004,7 +1008,7 @@ parseargs(int argc, char *argv[])
  			break;
  #endif
  		default:	/* error */
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.9.bb b/meta/recipes-extended/rpcbind/rpcbind_1.3.1.bb
similarity index 96%
rename from meta/recipes-extended/rpcbind/rpcbind_1.2.9.bb
rename to meta/recipes-extended/rpcbind/rpcbind_1.3.1.bb
index 000ffe37040..bc7330e2942 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_1.2.9.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_1.3.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
            file://rpcbind_add_option_to_fix_port_number.patch \
            file://0001-systemd-use-EnvironmentFile.patch \
           "
-SRC_URI[sha256sum] = "ce5f1a87c566ef0b2897a28f50a75c1dc23fec413a46a7f4183423b6b6aa991b"
+SRC_URI[sha256sum] = "8e551b445f5172f8ef218845af342fb2a2d741b57ce8c777c781a01ea92f92a5"
 
 inherit autotools update-rc.d systemd pkgconfig update-alternatives sourceforge-releases