From 7f10dd0cc5589a503f795aa60d91d6eaacf4f554 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Mar 2023 09:25:34 +0000
Subject: [PATCH] import rpcbind-1.2.6-5.el9

---
 SOURCES/rpcbind-1.2.6-double-free.patch | 15 +++++++++++++++
 SPECS/rpcbind.spec                      | 23 ++++++++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 SOURCES/rpcbind-1.2.6-double-free.patch

diff --git a/SOURCES/rpcbind-1.2.6-double-free.patch b/SOURCES/rpcbind-1.2.6-double-free.patch
new file mode 100644
index 0000000..dd33f04
--- /dev/null
+++ b/SOURCES/rpcbind-1.2.6-double-free.patch
@@ -0,0 +1,15 @@
+diff -up rpcbind-1.2.6/src/rpcbind.c.orig rpcbind-1.2.6/src/rpcbind.c
+--- rpcbind-1.2.6/src/rpcbind.c.orig	2022-08-16 10:16:03.196903368 -0400
++++ rpcbind-1.2.6/src/rpcbind.c	2022-08-16 10:16:38.595062481 -0400
+@@ -562,8 +562,10 @@ init_transport(struct netconfig *nconf)
+ 				syslog(LOG_ERR, "cannot bind %s on %s: %m",
+ 					(hosts[nhostsbak] == NULL) ? "*" :
+ 					hosts[nhostsbak], nconf->nc_netid);
+-				if (res != NULL)
++				if (res != NULL) {
+ 					freeaddrinfo(res);
++					res = NULL;
++				}
+ 				continue;
+ 			} else
+ 				checkbind++;
diff --git a/SPECS/rpcbind.spec b/SPECS/rpcbind.spec
index 7e1f541..d39647f 100644
--- a/SPECS/rpcbind.spec
+++ b/SPECS/rpcbind.spec
@@ -4,7 +4,7 @@
 
 Name:           rpcbind
 Version:        1.2.6
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 License:        BSD
 URL:            https://sourceforge.net/projects/rpcbind/
@@ -22,6 +22,11 @@ Requires(post): systemd policycoreutils
 Requires(preun): systemd
 Requires(postun): systemd coreutils
 
+#
+# RHEL9.1
+#
+Patch001: rpcbind-1.2.6-double-free.patch
+
 Patch100: rpcbind-0.2.3-systemd-envfile.patch
 Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
 Patch102: rpcbind-0.2.4-runstatdir.patch
@@ -37,13 +42,8 @@ universal addresses.  It must be running on the host to be able to make
 RPC calls on a server on that machine.
 
 %prep
-%setup -q
+%autosetup -p1
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
 %build
 autoreconf -fisv
 %configure \
@@ -125,6 +125,15 @@ fi
 %attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
 
 %changelog
+* Tue Sep  6 2022 Steve Dickson <steved@redhat.com> - 1.2.6-5
+- Fixed a typo in changelog (bz 2115517)
+
+* Tue Aug 16 2022 Steve Dickson <steved@redhat.com> - 1.2.6-4
+- Use %autosetup -p1 to make sure patches apply (bz 2115517)
+
+* Tue Aug 16 2022 Steve Dickson <steved@redhat.com> - 1.2.6-3
+- Fixed a double free in init_transport (bz 2115517)
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.6-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688