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

@@ -1,30 +0,0 @@
-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.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,14 +1,14 @@
 Name:          libassuan
-Version:	   2.5.6
+Version:	   2.5.3
 Release:	   2
 Summary:	   A small library implementing the so-called Assuan protocal
-License:	   GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later
+License:	   LGPLv2+ and GPLv3+
 URL:		   https://www.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
 
-Patch0:     backport-libassuan-2.5.2-multilib.patch
-Patch1:     backport-tests-Avoid-leaking-file-descriptors-on-errors.patch
+Patch0000:     libassuan-2.5.2-multilib.patch
+Patch0001:     libassuan-2.5.3-includedir.patch
 
 BuildRequires:     gcc gawk libgpg-error-devel >= 1.8 
 
@@ -67,36 +67,6 @@ make check
 %doc ChangeLog NEWS README THANKS TODO
 
 %changelog
-* Wed Aug 16 2023 xinghe <xinghe2@h-partners.com> - 2.5.6-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix the error of changelog
-
-* Sat Jul 15 2023 xinghe <xinghe2@h-partners.com> - 2.5.6-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC: update libassuan to 2.5.6
-
-* Wed Oct 19 2022 xinghe <xinghe2@h-partners.com> - 2.5.5-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: tests: Avoid leaking file descriptors on errors
-
-* Sat Mar 19 2022 xihaochen<xihaochen@h-partners.com> - 2.5.5-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC: update libassuan to 2.5.5
-
-* Tue Jan 26 2021 xihaochen<xihaochen@huawei.com> - 2.5.4-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC: update libassuan to 2.5.4
-
 * Tue Dec 15 2020 xihaochen <xihaochen@huawei.com> - 2.5.3-2
 - Type:requirement
 - Id:NA