!14 [sync] PR-12: tests Avoid leaking file descriptors on errors

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

backport-tests-Avoid-leaking-file-descriptors-on-errors.patch

@@ -0,0 +1,30 @@
+From 70b465e0bf65c9ac6d1f7e242d2b76a84afaac6a Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Wed, 7 Apr 2021 12:09:59 +0200
+Subject: [PATCH] tests: Avoid leaking file descriptors on errors
+
+* tests/fdpassing.c (client): Close fp on error
+--
+
+Signed-off-by: Jakub Jelen <jjelen@redhat.com>
+
+Conflict: NA
+Reference: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libassuan.git;a=commit;h=70b465e0bf65c9ac6d1f7e242d2b76a84afaac6a
+---
+ tests/fdpassing.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/fdpassing.c b/tests/fdpassing.c
+index 3e1b71b..0e23ffc 100644
+--- a/tests/fdpassing.c
++++ b/tests/fdpassing.c
+@@ -176,6 +176,7 @@ client (assuan_context_t ctx, const char *fname)
+       rc = assuan_sendfd (ctx, fileno (fp));
+       if (rc)
+         {
++          fclose (fp);
+           log_error ("assuan_sendfd failed: %s\n", gpg_strerror (rc));
+           return -1;
+         }
+-- 
+2.11.0

libassuan-2.5.2-multilib.patch

@@ -0,0 +1,28 @@
+diff -up libassuan-2.5.2/src/libassuan-config.in.multilib libassuan-2.5.2/src/libassuan-config.in
+--- libassuan-2.5.2/src/libassuan-config.in.multilib	2019-01-08 16:31:11.042204893 +0100
++++ libassuan-2.5.2/src/libassuan-config.in	2019-01-08 16:31:20.026048884 +0100
+@@ -19,7 +19,7 @@ lib="@LIBASSUAN_CONFIG_LIBS@"
+ extralibs="$gpg_error_libs"
+ cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags"
+ api_version="@LIBASSUAN_CONFIG_API_VERSION@"
+-my_host="@LIBASSUAN_CONFIG_HOST@"
++my_host="myhost"
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includes=""
+@@ -131,13 +131,7 @@ if test "$echo_cflags" = "yes"; then
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
+-      for i in $lib $extralibs ; do
+-	if test "$i" = "-L@libdir@" ; then
+-	  libdirs=""
+-	fi
+-      done
+-    fi
++    # libdir is always standard and implicitly searched
++    libdirs=""
+     echo $libdirs $lib $extralibs
+ fi

libassuan-2.5.3-includedir.patch

@@ -0,0 +1,11 @@
+diff -up libassuan-2.5.3/src/libassuan.pc.in.includedir libassuan-2.5.3/src/libassuan.pc.in
+--- libassuan-2.5.3/src/libassuan.pc.in.includedir	2018-10-25 11:20:28.000000000 +0200
++++ libassuan-2.5.3/src/libassuan.pc.in	2019-08-19 10:29:10.536279378 +0200
+@@ -9,6 +9,6 @@ Name: libassuan
+ Description: IPC library for the GnuPG components
+ Requires: gpg-error
+ Version: @PACKAGE_VERSION@
+-Cflags: @LIBASSUAN_CONFIG_CFLAGS@
++Cflags: @LIBASSUAN_CONFIG_CFLAGS@ -I${includedir}
+ Libs: @LIBASSUAN_CONFIG_LIBS@
+ URL: https://www.gnupg.org/related_software/libassuan/index.html

libassuan.spec

@@ -1,11 +1,15 @@
-Name:              libassuan		
-Version:	   2.5.1
-Release:	   6
+Name:          libassuan
+Version:	   2.5.3
+Release:	   2
 Summary:	   A small library implementing the so-called Assuan protocal
 License:	   LGPLv2+ and GPLv3+
 URL:		   https://ww.gnupg.org/
-Source0:           https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2
-Source1:           https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
+Source0:       https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+Source1:       https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
+
+Patch0000:     libassuan-2.5.2-multilib.patch
+Patch0001:     libassuan-2.5.3-includedir.patch
+Patch0002:     backport-tests-Avoid-leaking-file-descriptors-on-errors.patch
 
 BuildRequires:     gcc gawk libgpg-error-devel >= 1.8 
 
@@ -17,8 +21,7 @@ BuildRequires:     gcc gawk libgpg-error-devel >= 1.8
 Summary:          GnuPG IPC library
 Provides:         libassuan2-devel = %{version}-%{release}
 Requires:         %{name} = %{version}-%{release}
-Requires(post):   /sbin/install-info
-Requires(preun):  /sbin/install-info
+Requires:         pkgconfig
 
 %description devel
 Provide files which are needed to develop applications using %{name}.
@@ -44,14 +47,6 @@ make check
 
 %ldconfig_scriptlets
 
-%post devel
-/sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
-
-%preun devel
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
-fi
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS
@@ -64,6 +59,7 @@ fi
 %{_bindir}/libassuan-config
 %{_includedir}/libassuan2/assuan.*
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/libassuan.pc
 %{_datadir}/aclocal/lib*.m4
 %{_infodir}/assuan.info*
 
@@ -72,6 +68,18 @@ fi
 %doc ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Wed Oct 19 2022 xinghe <xinghe2@huawei.com> - 2.5.3-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: tests: Avoid leaking file descriptors on errors
+
+* Wed Aug 19 2020 yuboyun <yuboyun@huawei.com> - 2.5.3-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:upgrade to 2.5.3
+
 * Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.5.1-6
 - delete uesless info