public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libntirpc] rawhide: update 0002-7.2plus patch for ganesha-9.16
@ 2026-06-15 11:59 Kaleb S. KEITHLEY
  0 siblings, 0 replies; only message in thread
From: Kaleb S. KEITHLEY @ 2026-06-15 11:59 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/libntirpc
Branch : rawhide
Commit : c9a931c15cbc92a0d4866718777d464bd6b5e4b2
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date   : 2026-06-15T07:57:13-04:00
Stats  : +346/-75 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/libntirpc/c/c9a931c15cbc92a0d4866718777d464bd6b5e4b2?branch=rawhide

Log:
update 0002-7.2plus patch for ganesha-9.16

---
diff --git a/0002-7.2plus.patch b/0002-7.2plus.patch
index d7e0e7e..a1cf8ad 100644
--- a/0002-7.2plus.patch
+++ b/0002-7.2plus.patch
@@ -1,7 +1,7 @@
-diff -ur ntirpc-7.2/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/CMakeLists.txt
---- ntirpc-7.2/CMakeLists.txt	2026-03-18 11:45:40.359470436 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/CMakeLists.txt	2026-05-18 19:40:20.000000000 -0400
-@@ -37,18 +37,7 @@
+diff -ur ntirpc-7.2/CMakeLists.txt ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/CMakeLists.txt
+--- ntirpc-7.2/CMakeLists.txt	2025-09-23 10:05:19.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/CMakeLists.txt	2026-06-11 14:12:17.000000000 -0400
+@@ -36,18 +37,7 @@
  
  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
  
@@ -21,7 +21,7 @@ diff -ur ntirpc-7.2/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
  
  include(GetGitRevisionDescription)
  get_git_head_revision(GIT_REFSPEC _GIT_HEAD_COMMIT)
-@@ -317,21 +306,19 @@
+@@ -324,21 +306,19 @@
  endif (NOT TARGET dist)
  
  if (NOT TARGET rpm)
@@ -48,11 +48,10 @@ diff -ur ntirpc-7.2/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
 +install(FILES  ${PROJECT_BINARY_DIR}/libntirpc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 +install(DIRECTORY  ${NTIRPC_BASE_DIR}/ntirpc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +install(FILES  ${PROJECT_BINARY_DIR}/ntirpc/version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ntirpc)
-Only in ntirpc-7.2: CMakeLists.txt.orig
-Only in ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1: .github
-diff -ur ntirpc-7.2/libntirpc.pc.in.cmake ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/libntirpc.pc.in.cmake
+Only in ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633: .github
+diff -ur ntirpc-7.2/libntirpc.pc.in.cmake ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/libntirpc.pc.in.cmake
 --- ntirpc-7.2/libntirpc.pc.in.cmake	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/libntirpc.pc.in.cmake	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/libntirpc.pc.in.cmake	2026-06-11 14:12:17.000000000 -0400
 @@ -1,6 +1,6 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=${prefix}
@@ -61,9 +60,9 @@ diff -ur ntirpc-7.2/libntirpc.pc.in.cmake ntirpc-5c761bb186e9ea3f8a5bab77347ee12
  includedir=${prefix}/include/ntirpc
  
  Name: libntirpc
-diff -ur ntirpc-7.2/ntirpc/lttng/ntirpc_traces.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/lttng/ntirpc_traces.h
+diff -ur ntirpc-7.2/ntirpc/lttng/ntirpc_traces.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/lttng/ntirpc_traces.h
 --- ntirpc-7.2/ntirpc/lttng/ntirpc_traces.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/lttng/ntirpc_traces.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/lttng/ntirpc_traces.h	2026-06-11 14:12:17.000000000 -0400
 @@ -32,6 +32,12 @@
  #define __S2(x) __S1(x)
  #define LINE_AS_STRING __S2(__LINE__)
@@ -93,9 +92,9 @@ diff -ur ntirpc-7.2/ntirpc/lttng/ntirpc_traces.h ntirpc-5c761bb186e9ea3f8a5bab77
 -#endif // __NTIRPC_TRACES_H__
 \ No newline at end of file
 +#endif // __NTIRPC_TRACES_H__
-diff -ur ntirpc-7.2/ntirpc/rpc/clnt.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/clnt.h
+diff -ur ntirpc-7.2/ntirpc/rpc/clnt.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/clnt.h
 --- ntirpc-7.2/ntirpc/rpc/clnt.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/clnt.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/clnt.h	2026-06-11 14:12:17.000000000 -0400
 @@ -115,6 +115,7 @@
  	mutex_t cl_lock;	/* serialize private data */
  	struct rpc_err cl_error; /* specific error code */
@@ -104,31 +103,66 @@ diff -ur ntirpc-7.2/ntirpc/rpc/clnt.h ntirpc-5c761bb186e9ea3f8a5bab77347ee129782
  	uint16_t cl_flags;	/* state flags */
  
  } CLIENT;
-@@ -489,6 +490,11 @@
+@@ -457,9 +458,27 @@
+  * Generic TLI create routine. Only provided for compatibility.
+  */
+ 
+-extern CLIENT *clnt_tli_ncreate(const int, const struct netconfig *,
+-				struct netbuf *, const rpcprog_t,
+-				const rpcvers_t, const u_int, const u_int);
++extern CLIENT *clnt_tli_ncreate_opt(const int, const struct netconfig *,
++				    struct netbuf *, struct netbuf *,
++				    const rpcprog_t, const rpcvers_t,
++				    const u_int, const u_int, int);
++
++static inline CLIENT *
++clnt_tli_ncreate(int fd, const struct netconfig *nconf,
++		 struct netbuf *bindaddr, struct netbuf *svcaddr,
++		 rpcprog_t prog, rpcvers_t vers,
++		 u_int sendsz, u_int recvsz)
++{
++#ifdef SOL_IPV6
++	int opts = IPV6_V6ONLY;
++#else
++	int opts = 0;
++#endif
++
++	return clnt_tli_ncreate_opt(fd, nconf, bindaddr, svcaddr, prog, vers,
++				    sendsz, recvsz, opts);
++}
++
+ /*
+  * const register int fd;  -- fd
+  * const struct netconfig *nconf; -- netconfig structure
+@@ -489,6 +508,13 @@
  				const rpcprog_t, const rpcvers_t,
  				const u_int, const u_int, const uint32_t);
  
++#ifdef USE_RPC_RDMA
 +CLIENT *
 +clnt_rdma_create(int fd, char *host, int port, int recv_sz,
 +    int send_sz, int page_sz, const rpcprog_t prog,
 +    const rpcvers_t vers, const uint32_t flags);
++#endif
 +
  static inline CLIENT *
  clnt_vc_ncreate(const int fd, const struct netbuf *raddr,
  		const rpcprog_t prog, const rpcvers_t vers,
-@@ -503,6 +509,9 @@
+@@ -503,6 +529,11 @@
   */
  extern CLIENT *clnt_vc_ncreate_svc(const SVCXPRT *, const rpcprog_t,
  				   const rpcvers_t, const uint32_t);
 +
++#if defined(_USE_NFS_RDMA) || defined(USE_RPC_RDMA)
 +extern CLIENT *clnt_rdma_ncreatef(const SVCXPRT *, const rpcprog_t,
 +				  const rpcvers_t, const uint32_t, bool);
++#endif
  /*
   *      const SVCXPRT *xprt;                    -- active service xprt
   *      const rpcprog_t prog;                   -- RPC program number
-diff -ur ntirpc-7.2/ntirpc/rpc/haproxy.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/haproxy.h
+diff -ur ntirpc-7.2/ntirpc/rpc/haproxy.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/haproxy.h
 --- ntirpc-7.2/ntirpc/rpc/haproxy.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/haproxy.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/haproxy.h	2026-06-11 14:12:17.000000000 -0400
 @@ -30,6 +30,13 @@
  
  #include "config.h"
@@ -159,9 +193,41 @@ diff -ur ntirpc-7.2/ntirpc/rpc/haproxy.h ntirpc-5c761bb186e9ea3f8a5bab77347ee129
  _Static_assert(
  	sizeof(struct proxy_header_addr_ip6_part) == PP2_ADDR_LEN_INET6,
  	"proxy_header_addr_ip6_part size is not equal to PP2_ADDR_LEN_INET6");
-diff -ur ntirpc-7.2/ntirpc/rpc/svc.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/svc.h
+diff -ur ntirpc-7.2/ntirpc/rpc/rpc.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/rpc.h
+--- ntirpc-7.2/ntirpc/rpc/rpc.h	2025-09-23 10:05:19.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/rpc.h	2026-06-11 14:12:17.000000000 -0400
+@@ -91,8 +91,26 @@
+  * and rpcbind use only. Do not use, they may change without notice.
+  */
+ __BEGIN_DECLS
+-int __rpc_nconf2fd(const struct netconfig *);
+-int __rpc_nconf2fd_flags(const struct netconfig *, int);
++int __rpc_nconf2fd_flags_opt(const struct netconfig *, int, int);
++
++static inline int
++__rpc_nconf2fd_flags(const struct netconfig *nconf, int flags)
++{
++#ifdef SOL_IPV6
++	int opts = IPV6_V6ONLY;
++#else
++	int opts = 0;
++#endif
++
++	return __rpc_nconf2fd_flags_opt(nconf, flags, opts);
++}
++
++static inline int
++__rpc_nconf2fd(const struct netconfig *nconf)
++{
++	return __rpc_nconf2fd_flags(nconf, 0);
++}
++
+ int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
+ int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
+ u_int __rpc_get_t_size(int, int, int);
+diff -ur ntirpc-7.2/ntirpc/rpc/svc.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/svc.h
 --- ntirpc-7.2/ntirpc/rpc/svc.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/svc.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/svc.h	2026-06-11 14:12:17.000000000 -0400
 @@ -180,6 +180,7 @@
  #define SVC_XPRT_FLAG_REMOTE_ADDR_SET	0x0200	/* remote addr was final set */
  #define SVC_XPRT_FLAG_READY		0x0400	/* ready to use */
@@ -202,9 +268,9 @@ diff -ur ntirpc-7.2/ntirpc/rpc/svc.h ntirpc-5c761bb186e9ea3f8a5bab77347ee1297825
  };
  
  #define XPRT_FMT "xprt: [ptr = {},flags = {},fd = {},type = {},refcnt = {}]"
-diff -ur ntirpc-7.2/ntirpc/rpc/xdr.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/xdr.h
+diff -ur ntirpc-7.2/ntirpc/rpc/xdr.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/xdr.h
 --- ntirpc-7.2/ntirpc/rpc/xdr.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/xdr.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/xdr.h	2026-06-11 14:12:17.000000000 -0400
 @@ -123,7 +123,7 @@
  	VIO_DATA,               /* data buffer */
  	VIO_TRAILER_LEN,	/* length field for following TRAILER buffer */
@@ -235,9 +301,9 @@ diff -ur ntirpc-7.2/ntirpc/rpc/xdr.h ntirpc-5c761bb186e9ea3f8a5bab77347ee1297825
  } xdr_uio;
  
  /* Op flags */
-diff -ur ntirpc-7.2/ntirpc/rpc/xdr_inline.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/xdr_inline.h
+diff -ur ntirpc-7.2/ntirpc/rpc/xdr_inline.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/xdr_inline.h
 --- ntirpc-7.2/ntirpc/rpc/xdr_inline.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/ntirpc/rpc/xdr_inline.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/ntirpc/rpc/xdr_inline.h	2026-06-11 14:12:17.000000000 -0400
 @@ -52,6 +52,17 @@
  #include <rpc/types.h>
  #include <rpc/xdr.h>
@@ -292,10 +358,100 @@ diff -ur ntirpc-7.2/ntirpc/rpc/xdr_inline.h ntirpc-5c761bb186e9ea3f8a5bab77347ee
 +#endif /* extern "C" */
 +
  #endif				/* _TIRPC_INLINE_XDR_H */
-diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_generic.c
+diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_generic.c
 --- ntirpc-7.2/src/clnt_generic.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_generic.c	2026-05-18 19:40:20.000000000 -0400
-@@ -447,10 +447,43 @@
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_generic.c	2026-06-11 14:12:17.000000000 -0400
+@@ -252,7 +252,7 @@
+ 	CLIENT *cl = NULL;	/* client handle */
+ 
+ 	if (nconf == NULL) {
+-		__warnx(TIRPC_DEBUG_FLAG_ERROR, "%s: %s",
++		__warnx(TIRPC_DEBUG_FLAG_ERROR, "%s: %s nconf is NULL",
+ 			__func__, clnt_sperrno(RPC_TLIERROR));
+ 		cl = clnt_raw_ncreate(prog, vers);
+ 		cl->cl_error.re_status = RPC_TLIERROR;
+@@ -272,8 +272,8 @@
+ 	}
+ 	if (cl == NULL) {
+ 		/* __rpc_findaddr_timed failed? */
+-		cl = clnt_tli_ncreate(RPC_ANYFD, nconf, svcaddr, prog, vers, 0,
+-				      0);
++		cl = clnt_tli_ncreate(RPC_ANYFD, nconf, NULL, svcaddr, prog,
++				      vers, 0, 0);
+ 	}
+ 	if (CLNT_SUCCESS(cl)) {
+ 		/* Reuse the CLIENT handle and change the appropriate fields */
+@@ -286,8 +286,8 @@
+ 			(void)CLNT_CONTROL(cl, CLSET_VERS, (void *)&vers);
+ 		} else {
+ 			CLNT_DESTROY(cl);
+-			cl = clnt_tli_ncreate(RPC_ANYFD, nconf, svcaddr, prog,
+-					      vers, 0, 0);
++			cl = clnt_tli_ncreate(RPC_ANYFD, nconf, NULL, svcaddr,
++					      prog, vers, 0, 0);
+ 		}
+ 	}
+ 	mem_free(svcaddr->buf, sizeof(*svcaddr->buf));
+@@ -304,9 +304,10 @@
+  * If sizes are 0; appropriate defaults will be chosen.
+  */
+ CLIENT *
+-clnt_tli_ncreate(int fd, const struct netconfig *nconf,
+-		 struct netbuf *svcaddr, rpcprog_t prog,
+-		 rpcvers_t vers, u_int sendsz, u_int recvsz)
++clnt_tli_ncreate_opt(int fd, const struct netconfig *nconf,
++		     struct netbuf *bindaddr, struct netbuf *svcaddr,
++		     rpcprog_t prog, rpcvers_t vers,
++		     u_int sendsz, u_int recvsz, int opt)
+ {
+ 	CLIENT *cl;		/* client handle */
+ 	struct __rpc_sockinfo si;
+@@ -318,14 +319,14 @@
+ 
+ 	if (fd == RPC_ANYFD) {
+ 		if (nconf == NULL) {
+-			__warnx(TIRPC_DEBUG_FLAG_ERROR, "%s: %s",
++			__warnx(TIRPC_DEBUG_FLAG_ERROR, "%s: %s nconf is NULL",
+ 				__func__, clnt_sperrno(RPC_TLIERROR));
+ 			cl = clnt_raw_ncreate(prog, vers);
+ 			cl->cl_error.re_status = RPC_TLIERROR;
+ 			return (cl);
+ 		}
+ 
+-		fd = __rpc_nconf2fd(nconf);
++		fd = __rpc_nconf2fd_flags_opt(nconf, 0, opt);
+ 
+ 		if (fd == -1)
+ 			goto err;
+@@ -335,7 +336,26 @@
+ 		servtype = nconf->nc_semantics;
+ 		if (!__rpc_fd2sockinfo(fd, &si))
+ 			goto err;
+-		bindresvport(fd, NULL);
++		if (bindaddr == NULL)
++			bindresvport(fd, NULL);
++		else {
++			struct sockaddr *addr;
++
++			addr = (struct sockaddr *)bindaddr->buf;
++
++			if (si.si_af != addr->sa_family) {
++				__warnx(TIRPC_DEBUG_FLAG_ERROR,
++					"%s: %s address family mismatch",
++					__func__,
++					clnt_sperrno(RPC_TLIERROR));
++				cl = clnt_raw_ncreate(prog, vers);
++				/* XXX */
++				cl->cl_error.re_status = RPC_TLIERROR;
++				goto err1;
++			}
++
++			bindresvport(fd, (struct sockaddr_in *)addr);
++		}
+ 	} else {
+ 		if (!__rpc_fd2sockinfo(fd, &si))
+ 			goto err;
+@@ -447,10 +467,43 @@
  	return (1);
  }
  
@@ -340,7 +496,7 @@ diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
  
  	return CLNT_CALL_ONCE(cc);
  }
-@@ -492,6 +525,20 @@
+@@ -492,6 +545,20 @@
  	return (RPC_SUCCESS);
  }
  
@@ -361,7 +517,7 @@ diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
  void
  clnt_req_reset(struct clnt_req *cc)
  {
-@@ -505,7 +552,12 @@
+@@ -505,7 +572,12 @@
  					   CLNT_REQ_FLAG_ACKSYNC |
  					   CLNT_REQ_FLAG_EXPIRING)
  	    & CLNT_REQ_FLAG_EXPIRING) {
@@ -375,7 +531,7 @@ diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
  		cc->cc_expire_ms = 0;	/* atomic barrier(s) */
  	}
  }
-@@ -525,6 +577,7 @@
+@@ -525,6 +597,7 @@
  	cc->cc_refreshes = 2;
  	cc->cc_timeout = timeout;
  
@@ -383,7 +539,7 @@ diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
  	if (timeout.tv_nsec < 0 || timeout.tv_nsec > 999999999
  	 || timeout.tv_sec < 0) {
  		__warnx(TIRPC_DEBUG_FLAG_ERROR,
-@@ -585,7 +638,11 @@
+@@ -585,7 +658,11 @@
  	if (atomic_postclear_uint16_t_bits(&cc->cc_flags,
  					   CLNT_REQ_FLAG_EXPIRING)
  	    & CLNT_REQ_FLAG_EXPIRING) {
@@ -396,9 +552,9 @@ diff -ur ntirpc-7.2/src/clnt_generic.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
  		cc->cc_expire_ms = 0;	/* atomic barrier(s) */
  	}
  
-diff -ur ntirpc-7.2/src/clnt_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_internal.h
+diff -ur ntirpc-7.2/src/clnt_internal.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_internal.h
 --- ntirpc-7.2/src/clnt_internal.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_internal.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_internal.h	2026-06-11 14:12:17.000000000 -0400
 @@ -64,5 +64,9 @@
  /* in svc_rqst.c */
  void svc_rqst_expire_insert(struct clnt_req *);
@@ -410,9 +566,9 @@ diff -ur ntirpc-7.2/src/clnt_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee1297
 +void rdma_clnt_req_expire_remove(struct clnt_req *);
 +bool clnt_data_isvalid(struct rpc_client *);
  #endif				/* _CLNT_INTERNAL_H */
-diff -ur ntirpc-7.2/src/clnt_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_rdma.c
+diff -ur ntirpc-7.2/src/clnt_rdma.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_rdma.c
 --- ntirpc-7.2/src/clnt_rdma.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_rdma.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_rdma.c	2026-06-11 14:12:17.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <err.h>
  #include "rpc_com.h"
@@ -608,9 +764,9 @@ diff -ur ntirpc-7.2/src/clnt_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256
  	return (RPC_SUCCESS);
  }
  
-diff -ur ntirpc-7.2/src/clnt_vc.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_vc.c
+diff -ur ntirpc-7.2/src/clnt_vc.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_vc.c
 --- ntirpc-7.2/src/clnt_vc.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/clnt_vc.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/clnt_vc.c	2026-06-11 14:12:17.000000000 -0400
 @@ -73,6 +73,9 @@
  #include "svc_ioq.h"
  #include "clnt_internal.h"
@@ -671,9 +827,9 @@ diff -ur ntirpc-7.2/src/clnt_vc.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd
  /*
   * Create a client handle for a connection.
   * Default options are set, which the user can change using clnt_control()'s.
-diff -ur ntirpc-7.2/src/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/CMakeLists.txt
+diff -ur ntirpc-7.2/src/CMakeLists.txt ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/CMakeLists.txt
 --- ntirpc-7.2/src/CMakeLists.txt	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/CMakeLists.txt	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/CMakeLists.txt	2026-06-11 14:12:17.000000000 -0400
 @@ -5,9 +5,6 @@
    -D_GNU_SOURCE
  )
@@ -701,10 +857,15 @@ diff -ur ntirpc-7.2/src/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
  
  ########### install files ###############
  
-diff -ur ntirpc-7.2/src/libntirpc.map.in.cmake ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/libntirpc.map.in.cmake
+diff -ur ntirpc-7.2/src/libntirpc.map.in.cmake ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/libntirpc.map.in.cmake
 --- ntirpc-7.2/src/libntirpc.map.in.cmake	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/libntirpc.map.in.cmake	2026-05-18 19:40:20.000000000 -0400
-@@ -70,6 +70,8 @@
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/libntirpc.map.in.cmake	2026-06-11 14:12:17.000000000 -0400
+@@ -66,10 +66,13 @@
+     clnt_req_wait_reply;
+     clnt_sperrno;
+     clnt_tli_create;
++    clnt_tli_ncreate_opt;
+     clnt_tp_ncreate_timed;
      clnt_vc_get_client_xprt;
      clnt_vc_ncreatef;
      clnt_vc_ncreate_svc;
@@ -713,9 +874,9 @@ diff -ur ntirpc-7.2/src/libntirpc.map.in.cmake ntirpc-5c761bb186e9ea3f8a5bab7734
  
      # e*
      endnetconfig;
-diff -ur ntirpc-7.2/src/lttng/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/lttng/CMakeLists.txt
+diff -ur ntirpc-7.2/src/lttng/CMakeLists.txt ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/lttng/CMakeLists.txt
 --- ntirpc-7.2/src/lttng/CMakeLists.txt	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/lttng/CMakeLists.txt	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/lttng/CMakeLists.txt	2026-06-11 14:12:17.000000000 -0400
 @@ -22,7 +22,7 @@
    SOVERSION "${NTIRPC_MAJOR_VERSION}${NTIRPC_MINOR_VERSION}"
  )
@@ -725,9 +886,9 @@ diff -ur ntirpc-7.2/src/lttng/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347e
  
  add_library(ntirpc_lttng STATIC lttng_defines.c)
  #add_sanitizers(ntirpc_lttng)
-diff -ur ntirpc-7.2/src/metrics_libntirpc.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/metrics_libntirpc.h
+diff -ur ntirpc-7.2/src/metrics_libntirpc.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/metrics_libntirpc.h
 --- ntirpc-7.2/src/metrics_libntirpc.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/metrics_libntirpc.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/metrics_libntirpc.h	2026-06-11 14:12:17.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <rpc/auth_gss.h>
  #endif
@@ -736,9 +897,9 @@ diff -ur ntirpc-7.2/src/metrics_libntirpc.h ntirpc-5c761bb186e9ea3f8a5bab77347ee
  
  typedef enum gss_svc_auth_step {
  	VALIDATE_AUTH_DATA = 0,
-diff -ur ntirpc-7.2/src/monitoring/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/monitoring/CMakeLists.txt
+diff -ur ntirpc-7.2/src/monitoring/CMakeLists.txt ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/monitoring/CMakeLists.txt
 --- ntirpc-7.2/src/monitoring/CMakeLists.txt	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/monitoring/CMakeLists.txt	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/monitoring/CMakeLists.txt	2026-06-11 14:12:17.000000000 -0400
 @@ -8,13 +8,13 @@
  
  add_library(ntirpcmonitoring SHARED ${ntirpcmonitoring_SRCS})
@@ -756,10 +917,56 @@ diff -ur ntirpc-7.2/src/monitoring/CMakeLists.txt ntirpc-5c761bb186e9ea3f8a5bab7
  ########### install files ###############
 -install(FILES  include/monitoring.h DESTINATION include/ntirpc)
 +install(FILES  include/monitoring.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ntirpc)
-diff -ur ntirpc-7.2/src/rpc_dplx_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/rpc_dplx_internal.h
+diff -ur ntirpc-7.2/src/rpcb_clnt.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpcb_clnt.c
+--- ntirpc-7.2/src/rpcb_clnt.c	2025-09-23 10:05:19.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpcb_clnt.c	2026-06-11 14:12:17.000000000 -0400
+@@ -284,7 +284,7 @@
+ 	if (ad_cache != NULL) {
+ 		addr = ad_cache->ac_taddr;
+ 		client =
+-		    clnt_tli_ncreate(RPC_ANYFD, nconf, addr,
++		    clnt_tli_ncreate(RPC_ANYFD, nconf, NULL, addr,
+ 				     (rpcprog_t) RPCBPROG,
+ 				     (rpcvers_t) RPCBVERS4, 0, 0);
+ 		if (CLNT_SUCCESS(client)) {
+@@ -400,7 +400,7 @@
+ 		}
+ #endif
+ 		client =
+-		    clnt_tli_ncreate(RPC_ANYFD, nconf, &taddr,
++		    clnt_tli_ncreate(RPC_ANYFD, nconf, NULL, &taddr,
+ 				     (rpcprog_t) RPCBPROG,
+ 				     (rpcvers_t) RPCBVERS4, 0, 0);
+ 		if (CLNT_SUCCESS(client)) {
+diff -ur ntirpc-7.2/src/rpc_com.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_com.h
+--- ntirpc-7.2/src/rpc_com.h	2025-09-23 10:05:19.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_com.h	2026-06-11 14:12:17.000000000 -0400
+@@ -54,8 +54,13 @@
+ #define RPC_MAXADDRSIZE 1024
+ 
+ #ifndef __RPC_GETXID
++#ifdef __RPC_GETXID_LEGACY
+ #define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \
+ 			   (u_int32_t)((now)->tv_nsec))
++#else
++#include <stdlib.h>
++#define __RPC_GETXID(now) ((u_int32_t)random())
++#endif
+ #endif				/* !__RPC_GETXID */
+ 
+ __BEGIN_DECLS
+diff -ur ntirpc-7.2/src/rpc_dplx_internal.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_dplx_internal.h
 --- ntirpc-7.2/src/rpc_dplx_internal.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/rpc_dplx_internal.h	2026-05-18 19:40:20.000000000 -0400
-@@ -57,6 +57,7 @@
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_dplx_internal.h	2026-06-11 14:12:17.000000000 -0400
+@@ -34,6 +34,7 @@
+ #include <rpc/xdr_ioq.h>
+ #include <rpc/pool_queue.h>
+ #include <rpc/haproxy.h>
++#include "rpc_com.h"
+ 
+ /* Svc event strategy */
+ enum svc_event_type {
+@@ -57,6 +58,7 @@
  	struct xdr_ioq ioq;
  	struct poolq_head writeq;	/**< poolq for write requests */
  	struct opr_rbtree call_replies;
@@ -767,7 +974,7 @@ diff -ur ntirpc-7.2/src/rpc_dplx_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee
  	struct opr_rbtree_node fd_node;
  	struct {
  		rpc_dplx_lock_t lock;
-@@ -114,11 +115,16 @@
+@@ -114,11 +116,16 @@
  	cond_destroy(&lock->we.cv);
  }
  
@@ -784,9 +991,57 @@ diff -ur ntirpc-7.2/src/rpc_dplx_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee
  	mutex_init(&rec->xprt.xp_lock, NULL);
  	TAILQ_INIT(&rec->writeq.qh);
  	mutex_init(&rec->writeq.qmutex, NULL);
-diff -ur ntirpc-7.2/src/rpc_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/rpc_rdma.c
+@@ -127,6 +134,7 @@
+ 	(void)clock_gettime(CLOCK_MONOTONIC_FAST, &(rec->recv.ts));
+ 
+ 	rec->xprt.xp_refcnt = 1;
++	rec->call_xid = __RPC_GETXID(&(rec->recv.ts));
+ 
+ 	// Init TLV headers, network id values in case they are not set later on
+ 	rec->xprt.proxy_protocol_tlv_headers.tlv_count = 0;
+diff -ur ntirpc-7.2/src/rpc_generic.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_generic.c
+--- ntirpc-7.2/src/rpc_generic.c	2025-09-23 10:05:19.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_generic.c	2026-06-11 14:12:17.000000000 -0400
+@@ -689,7 +689,7 @@
+ }
+ 
+ int
+-__rpc_nconf2fd_flags(const struct netconfig *nconf, int flags)
++__rpc_nconf2fd_flags_opt(const struct netconfig *nconf, int flags, int opt)
+ {
+ 	struct __rpc_sockinfo si;
+ 	int fd;
+@@ -701,9 +701,11 @@
+ 	if ((fd >= 0) &&
+ 	    (si.si_af == AF_INET6)) {
+ #ifdef SOL_IPV6
+-		int val = 1;
+-		(void) setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val,
+-				  sizeof(val));
++		if ((opt & IPV6_V6ONLY) != 0) {
++			int val = 1;
++			(void) setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val,
++					  sizeof(val));
++		}
+ #endif
+ 	}
+ 
+@@ -711,12 +713,6 @@
+ }
+ 
+ int
+-__rpc_nconf2fd(const struct netconfig *nconf)
+-{
+-	return __rpc_nconf2fd_flags(nconf, 0);
+-}
+-
+-int
+ __rpc_sockinfo2netid(struct __rpc_sockinfo *sip, const char **netid)
+ {
+ 	int i;
+diff -ur ntirpc-7.2/src/rpc_rdma.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_rdma.c
 --- ntirpc-7.2/src/rpc_rdma.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/rpc_rdma.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_rdma.c	2026-06-11 14:12:17.000000000 -0400
 @@ -74,6 +74,7 @@
  #include "misc/abstract_atomic.h"
  #include "rpc_rdma.h"
@@ -1497,9 +1752,9 @@ diff -ur ntirpc-7.2/src/rpc_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
  }
  
  extern mutex_t ops_lock;
-diff -ur ntirpc-7.2/src/rpc_rdma.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/rpc_rdma.h
+diff -ur ntirpc-7.2/src/rpc_rdma.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_rdma.h
 --- ntirpc-7.2/src/rpc_rdma.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/rpc_rdma.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/rpc_rdma.h	2026-06-11 14:12:17.000000000 -0400
 @@ -87,6 +87,10 @@
  #define CBC_FLAG_NONE		0x0000
  #define CBC_FLAG_RELEASE	0x0001
@@ -1550,9 +1805,9 @@ diff -ur ntirpc-7.2/src/rpc_rdma.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
 +void svc_rdma_ops(SVCXPRT *);
 +
  #endif /* !_TIRPC_RPC_RDMA_H */
-diff -ur ntirpc-7.2/src/svc.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc.c
+diff -ur ntirpc-7.2/src/svc.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc.c
 --- ntirpc-7.2/src/svc.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc.c	2026-06-11 14:12:17.000000000 -0400
 @@ -378,7 +378,7 @@
   rpcb_it:
  	rwlock_unlock(&svc_lock);
@@ -1562,9 +1817,21 @@ diff -ur ntirpc-7.2/src/svc.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/sr
  		/*LINTED const castaway */
  		dummy =
  		    rpcb_set(prog, vers, (struct netconfig *)nconf,
-diff -ur ntirpc-7.2/src/svc_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_internal.h
+diff -ur ntirpc-7.2/src/svc_dg.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_dg.c
+--- ntirpc-7.2/src/svc_dg.c	2025-09-23 10:05:19.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_dg.c	2026-06-11 14:12:17.000000000 -0400
+@@ -319,6 +319,8 @@
+ 
+ 	SVC_REF(xprt, SVC_REF_FLAG_NONE);
+ 	newxprt->xp_parent = xprt;
++	if (xprt->xp_netid)
++		newxprt->xp_netid = mem_strdup(xprt->xp_netid);
+ 
+ 	atomic_set_uint16_t_bits(&newxprt->xp_flags,
+ 		SVC_XPRT_FLAG_READY);
+diff -ur ntirpc-7.2/src/svc_internal.h ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_internal.h
 --- ntirpc-7.2/src/svc_internal.h	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_internal.h	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_internal.h	2026-06-11 14:12:17.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
@@ -1620,9 +1887,9 @@ diff -ur ntirpc-7.2/src/svc_internal.h ntirpc-5c761bb186e9ea3f8a5bab77347ee12978
 +}
 +
  #endif				/* TIRPC_SVC_INTERNAL_H */
-diff -ur ntirpc-7.2/src/svc_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_rdma.c
+diff -ur ntirpc-7.2/src/svc_rdma.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_rdma.c
 --- ntirpc-7.2/src/svc_rdma.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_rdma.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_rdma.c	2026-06-11 14:12:17.000000000 -0400
 @@ -60,7 +60,6 @@
  #include <rpc/svc_rqst.h>
  #include <rpc/svc_auth.h>
@@ -1727,9 +1994,9 @@ diff -ur ntirpc-7.2/src/svc_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
  svc_rdma_ops(SVCXPRT *xprt)
  {
  	static struct xp_ops ops;
-diff -ur ntirpc-7.2/src/svc_rqst.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_rqst.c
+diff -ur ntirpc-7.2/src/svc_rqst.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_rqst.c
 --- ntirpc-7.2/src/svc_rqst.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_rqst.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_rqst.c	2026-06-11 14:12:17.000000000 -0400
 @@ -297,7 +297,7 @@
  static void svc_rqst_epoll_loop(struct work_pool_entry *wpe);
  static void svc_complete_task(struct svc_rqst_rec *sr_rec, bool finished);
@@ -1748,9 +2015,9 @@ diff -ur ntirpc-7.2/src/svc_rqst.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
  svc_rqst_expire_task(struct work_pool_entry *wpe)
  {
  	struct clnt_req *cc = opr_containerof(wpe, struct clnt_req, cc_wpe);
-diff -ur ntirpc-7.2/src/svc_vc.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_vc.c
+diff -ur ntirpc-7.2/src/svc_vc.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_vc.c
 --- ntirpc-7.2/src/svc_vc.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_vc.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_vc.c	2026-06-11 14:12:17.000000000 -0400
 @@ -74,6 +74,7 @@
  #include <rpc/svc_auth.h>
  #include <rpc/svc_rqst.h>
@@ -1949,9 +2216,9 @@ diff -ur ntirpc-7.2/src/svc_vc.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1
  		xdr_ioq_destroy(xioq, xioq->ioq_s.qsize);
  		SVC_DESTROY(xprt);
  
-diff -ur ntirpc-7.2/src/svc_xprt.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_xprt.c
+diff -ur ntirpc-7.2/src/svc_xprt.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_xprt.c
 --- ntirpc-7.2/src/svc_xprt.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/svc_xprt.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/svc_xprt.c	2026-06-11 14:12:17.000000000 -0400
 @@ -414,11 +414,17 @@
  					goto restart;
  				}
@@ -1972,9 +2239,9 @@ diff -ur ntirpc-7.2/src/svc_xprt.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
  		}		/* curr partition */
  		rwlock_unlock(&t->lock); /* t !LOCKED */
  		p_ix++;
-diff -ur ntirpc-7.2/src/xdr_ioq.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/xdr_ioq.c
+diff -ur ntirpc-7.2/src/xdr_ioq.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/xdr_ioq.c
 --- ntirpc-7.2/src/xdr_ioq.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/xdr_ioq.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/xdr_ioq.c	2026-06-11 14:12:17.000000000 -0400
 @@ -260,6 +260,7 @@
  		    &rdma_xprt->last_extra_buf_allocation_time);
  	}
@@ -2062,9 +2329,9 @@ diff -ur ntirpc-7.2/src/xdr_ioq.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd
  
  		__warnx(TIRPC_DEBUG_FLAG_XDR,
  			"Calling xdr_ioq_use_or_allocate for idx %d for %s",
-diff -ur ntirpc-7.2/src/xdr_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/xdr_rdma.c
+diff -ur ntirpc-7.2/src/xdr_rdma.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/xdr_rdma.c
 --- ntirpc-7.2/src/xdr_rdma.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/src/xdr_rdma.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/src/xdr_rdma.c	2026-06-11 14:12:17.000000000 -0400
 @@ -211,17 +211,18 @@
  	int ret = 0;
  	int32_t write_waits = atomic_dec_int32_t(&cbc->write_waits);
@@ -2685,9 +2952,9 @@ diff -ur ntirpc-7.2/src/xdr_rdma.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256b
  	__warnx(TIRPC_DEBUG_FLAG_XDR, "%s: cbc %p recvq %p %d sendq %p %d rdma_xprt %p",
  		__func__, cbc, &cbc->recvq, cbc->recvq.ioq_uv.uvqh.qcount, &cbc->sendq,
  		cbc->sendq.ioq_uv.uvqh.qcount, rdma_xprt);
-diff -ur ntirpc-7.2/tests/rpcping.c ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/tests/rpcping.c
+diff -ur ntirpc-7.2/tests/rpcping.c ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/tests/rpcping.c
 --- ntirpc-7.2/tests/rpcping.c	2025-09-23 10:05:19.000000000 -0400
-+++ ntirpc-5c761bb186e9ea3f8a5bab77347ee12978256bd1/tests/rpcping.c	2026-05-18 19:40:20.000000000 -0400
++++ ntirpc-bb333cca2f4af379f1eece69388fcd876ecbd633/tests/rpcping.c	2026-06-11 14:12:17.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <rpc/rpc.h>
  #include <rpc/svc_auth.h>

diff --git a/libntirpc.spec b/libntirpc.spec
index 9d23e09..6806a7f 100644
--- a/libntirpc.spec
+++ b/libntirpc.spec
@@ -3,7 +3,7 @@
 
 Name:		libntirpc
 Version:	7.2
-Release:	4%{?dev:%{dev}}%{?dist}
+Release:	5%{?dev:%{dev}}%{?dist}
 Summary:	New Transport Independent RPC Library
 License:	BSD-3-Clause
 Url:		https://github.com/nfs-ganesha/ntirpc
@@ -93,9 +93,13 @@ ln -s %{name}.so.%{version} %{buildroot}%{_libdir}/%{name}.so.7
 %{_libdir}/pkgconfig/libntirpc.pc
 
 %changelog
+* Mon Jun 15 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> 7.2-5
+- ntirpc-7.2, ntirpc did not tag/release required updates for
+  ganesha-8.1 and later (nfs-ganesha-9.16)
+
 * Fri Jun 12 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> 7.2-4
 - ntirpc-7.2, ntirpc did not tag/release required updates for
-  ganesha-8.1 and later
+  ganesha-8.1 and later (nfs-ganesha-9.15)
 
 * Wed Mar 18 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> 7.2-3
 - ntirpc-7.2, eliminate libnsl* dependency

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-15 11:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-15 11:59 [rpms/libntirpc] rawhide: update 0002-7.2plus patch for ganesha-9.16 Kaleb S. KEITHLEY

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox