From 1aa6a95b0fa125f52f80e9cf30d4b6e4dc9d0366 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mon, 7 Aug 2023 11:45:47 -0400
Subject: [PATCH] Updated to the latest upstream RC release: libtirpc-1-3-4-rc2

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 ....3.4-rc1.patch => libtirpc-1.3.4-rc2.patch | 58 ++++++++++++++++++-
 libtirpc.spec                                 |  7 ++-
 2 files changed, 60 insertions(+), 5 deletions(-)
 rename libtirpc-1.3.4-rc1.patch => libtirpc-1.3.4-rc2.patch (69%)

diff --git a/libtirpc-1.3.4-rc1.patch b/libtirpc-1.3.4-rc2.patch
similarity index 69%
rename from libtirpc-1.3.4-rc1.patch
rename to libtirpc-1.3.4-rc2.patch
index abe369d..125e52c 100644
--- a/libtirpc-1.3.4-rc1.patch
+++ b/libtirpc-1.3.4-rc2.patch
@@ -65,10 +65,62 @@ index cfd33c2..d547dce 100644
  
      /*
 diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
-index 9a9de69..d178d86 100644
+index 9a9de69..68fe69a 100644
 --- a/src/rpcb_clnt.c
 +++ b/src/rpcb_clnt.c
-@@ -496,11 +496,7 @@ getpmaphandle(nconf, hostname, tgtaddr)
+@@ -104,17 +104,27 @@ destroy_addr(addr)
+ {
+ 	if (addr == NULL)
+ 		return;
+-	if(addr->ac_host != NULL)
++	if (addr->ac_host != NULL) {
+ 		free(addr->ac_host);
+-	if(addr->ac_netid != NULL)
++		addr->ac_host = NULL;
++	}
++	if (addr->ac_netid != NULL) {
+ 		free(addr->ac_netid);
+-	if(addr->ac_uaddr != NULL)
++		addr->ac_netid = NULL;
++	}
++	if (addr->ac_uaddr != NULL) {
+ 		free(addr->ac_uaddr);
+-	if(addr->ac_taddr != NULL) {
+-		if(addr->ac_taddr->buf != NULL)
++		addr->ac_uaddr = NULL;
++	}
++	if (addr->ac_taddr != NULL) {
++		if(addr->ac_taddr->buf != NULL) {
+ 			free(addr->ac_taddr->buf);
++			addr->ac_taddr->buf = NULL;
++		}
++		addr->ac_taddr = NULL;
+ 	}
+ 	free(addr);
++	addr = NULL;
+ }
+ 
+ /*
+@@ -252,12 +262,15 @@ delete_cache(addr)
+ 	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
+ 		if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
+ 			/* Unlink from cache. We'll destroy it after releasing the mutex. */
+-			if (cptr->ac_uaddr)
++			if (cptr->ac_uaddr) {
+ 				free(cptr->ac_uaddr);
+-			if (prevptr)
++				cptr->ac_uaddr = NULL;
++			}
++			if (prevptr) {
+ 				prevptr->ac_next = cptr->ac_next;
+-			else
++			} else {
+ 				front = cptr->ac_next;
++			}
+ 			cachesize--;
+ 			break;
+ 		}
+@@ -496,11 +509,7 @@ getpmaphandle(nconf, hostname, tgtaddr)
  	CLIENT *client = NULL;
  	rpcvers_t pmapvers = 2;
  
@@ -81,7 +133,7 @@ index 9a9de69..d178d86 100644
  		struct netconfig *newnconf;
  
  		if ((newnconf = getnetconfigent("udp")) == NULL) {
-@@ -509,7 +505,8 @@ getpmaphandle(nconf, hostname, tgtaddr)
+@@ -509,7 +518,8 @@ getpmaphandle(nconf, hostname, tgtaddr)
  		}
  		client = getclnthandle(hostname, newnconf, tgtaddr);
  		freenetconfigent(newnconf);
diff --git a/libtirpc.spec b/libtirpc.spec
index fc3487e..33e442b 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -2,13 +2,13 @@
 
 Name:			libtirpc
 Version:		1.3.3
-Release:		1.rc1%{?dist}.1
+Release:		1.rc2%{?dist}
 Summary:		Transport Independent RPC Library
 License:		SISSL and BSD
 URL:  			http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary
 Source0:		http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
 
-Patch 001: libtirpc-1.3.4-rc1.patch
+Patch 001: libtirpc-1.3.4-rc2.patch
 
 BuildRequires:		automake, autoconf, libtool, pkgconfig
 BuildRequires:		krb5-devel
@@ -114,6 +114,9 @@ mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug  7 2023 Steve Dickson <steved@redhat.com> - 1.3.3-1.rc2
+- Updated to the latest upstream RC release: libtirpc-1-3-4-rc2
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-1.rc1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild