!44 [sync] PR-40: 回合上游社区高版本补丁,补丁数量：1

From: @openeuler-sync-bot 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng

backport-fix-memory-leak-in-destroy_addr.patch

@@ -0,0 +1,27 @@
+From 6951a9c3139c9c7dbb0bdae70737996011fc7a37 Mon Sep 17 00:00:00 2001
+From: Herb Wartens <wartens2@llnl.gov>
+Date: Mon, 18 Mar 2024 11:07:15 -0400
+Subject: [PATCH] rpcb_clnt.c: memory leak in destroy_addr
+
+Piece was dropped from original fix.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2225226
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ src/rpcb_clnt.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
+index 68fe69a..d909efc 100644
+--- a/src/rpcb_clnt.c
++++ b/src/rpcb_clnt.c
+@@ -121,6 +121,7 @@ destroy_addr(addr)
+ 			free(addr->ac_taddr->buf);
+ 			addr->ac_taddr->buf = NULL;
+ 		}
++		free(addr->ac_taddr);
+ 		addr->ac_taddr = NULL;
+ 	}
+ 	free(addr);
+-- 
+1.8.3.1

backport-fix-rpc_gss_seccreate-passed-in-cred.patch

@@ -0,0 +1,35 @@
+From 22b1c0cd6076dcd7df822cd1181e98278dc865db Mon Sep 17 00:00:00 2001
+From: Olga Kornievskaia <kolga@netapp.com>
+Date: Wed, 3 Jan 2024 17:50:42 -0500
+Subject: [PATCH] gssapi: fix rpc_gss_seccreate passed in cred
+
+Fix rpc_gss_seccreate() usage of the passed in gss credential.
+
+Fixes: 5f1fe4dde861 ("Pass time_req and input_channel_bindings through to init_sec_context")
+
+Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
+Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ src/auth_gss.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/auth_gss.c b/src/auth_gss.c
+index e317664..9d18f96 100644
+--- a/src/auth_gss.c
++++ b/src/auth_gss.c
+@@ -842,9 +842,9 @@ rpc_gss_seccreate(CLIENT *clnt, char *principal, char *mechanism,
+ 	gd->sec = sec;
+ 
+ 	if (req) {
+-		sec.req_flags = req->req_flags;
++		gd->sec.req_flags = req->req_flags;
+ 		gd->time_req = req->time_req;
+-		sec.cred = req->my_cred;
++		gd->sec.cred = req->my_cred;
+ 		gd->icb = req->input_channel_bindings;
+ 	}
+ 
+-- 
+2.25.1
+

libtirpc.spec

@@ -1,11 +1,13 @@
 Name:           libtirpc
-Version:        1.3.3
-Release:        2
+Version:        1.3.4
+Release:        4
 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/%{name}-%{version}.tar.bz2
 Patch0:	        0001-update-libtirpc-to-enable-tcp-port-listening.patch
+Patch1:         backport-fix-memory-leak-in-destroy_addr.patch
+Patch2:         backport-fix-rpc_gss_seccreate-passed-in-cred.patch
 BuildRequires:  automake autoconf libtool pkgconfig krb5-devel
 
 %description
@@ -14,7 +16,7 @@ Libtirpc is a Transport-Independent RPC library for Linux
 %package        devel
 Summary:        Development files for the %{name}
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig man-db
+Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains development files for %{name}.
@@ -27,7 +29,11 @@ The %{name}-devel package contains development files for %{name}.
 %build
 sh autogen.sh
 autoreconf -fisv
+%if 0%{?build_cross} == 1
+%configure --disable-gssapi
+%else
 %configure
+%endif
 %make_build
 
 %install
@@ -38,9 +44,6 @@ mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t
 
 %ldconfig_scriptlets
 
-%post devel
-%postun devel
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS
@@ -62,6 +65,36 @@ mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 10 2024 Wenhua Huang <huangwenhua@kylinos.cn> - 1.3.4-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix rpc_gss_seccreate passed in cred
+
+* Tue Jul 09 2024 gaihuiying <eaglegai@163.com> - 1.3.4-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:add macros to control if gssapi is support
+
+* Thu May 09 2024 zhangyaqi <zhangyaqi@kylinos.cn> - 1.3.4-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix memory leak in destroy_addr
+
+* Tue Dec 26 2023 gaihuiying <eaglegai@163.com> - 1.3.4-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC: update libtirpc to 1.3.4
+
+* Sat Jun 17 2023 gaihuiying <eaglegai@163.com> - 1.3.3-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: remove useless dependency man-db
+
 * Tue Feb 28 2023 gaihuiying <eaglegai@163.com> - 1.3.3-2
 - Type:bugfix
 - ID:NA