From 884abec1009d7fd7eec0225772e4dbd8e27f57e3 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:05:40 +0000 Subject: [PATCH] import UBI libassuan-2.5.6-6.el10 --- .fmf/version | 1 - .gitignore | 8 +- ci.fmf | 1 - gating.yaml | 9 -- ...ib.patch => libassuan-2.5.2-multilib.patch | 14 +-- libassuan-2.5.5-coverity.patch | 22 +++++ libassuan.spec | 99 +++++++++++++++---- plans/ci.fmf | 26 ----- sources | 4 +- 9 files changed, 114 insertions(+), 70 deletions(-) delete mode 100644 .fmf/version delete mode 100644 ci.fmf delete mode 100644 gating.yaml rename libassuan-2.1.0-multilib.patch => libassuan-2.5.2-multilib.patch (54%) create mode 100644 libassuan-2.5.5-coverity.patch delete mode 100644 plans/ci.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index edb196b..43bd6c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -/libassuan-2.4.3.tar.bz2 -/libassuan-2.4.3.tar.bz2.sig -/libassuan-2.4.4.tar.bz2 -/libassuan-2.4.4.tar.bz2.sig -/libassuan-2.5.1.tar.bz2 -/libassuan-2.5.1.tar.bz2.sig +libassuan-2.5.6.tar.bz2 +libassuan-2.5.6.tar.bz2.sig diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0a833f3..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-disabled.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-enabled.functional} diff --git a/libassuan-2.1.0-multilib.patch b/libassuan-2.5.2-multilib.patch similarity index 54% rename from libassuan-2.1.0-multilib.patch rename to libassuan-2.5.2-multilib.patch index f6ec6aa..8c3345c 100644 --- a/libassuan-2.1.0-multilib.patch +++ b/libassuan-2.5.2-multilib.patch @@ -1,16 +1,16 @@ -diff -up libassuan-2.1.0/src/libassuan-config.in.multilib libassuan-2.1.0/src/libassuan-config.in ---- libassuan-2.1.0/src/libassuan-config.in.multilib 2013-05-15 12:41:33.376279564 +0200 -+++ libassuan-2.1.0/src/libassuan-config.in 2013-05-15 12:40:11.565515616 +0200 -@@ -18,7 +18,7 @@ lib="@LIBASSUAN_CONFIG_LIB@" - extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs" +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="none" ++my_host="myhost" prefix=@prefix@ exec_prefix=@exec_prefix@ includes="" -@@ -121,13 +121,7 @@ if test "$echo_cflags" = "yes"; then +@@ -131,13 +131,7 @@ if test "$echo_cflags" = "yes"; then fi if test "$echo_libs" = "yes"; then diff --git a/libassuan-2.5.5-coverity.patch b/libassuan-2.5.5-coverity.patch new file mode 100644 index 0000000..196141c --- /dev/null +++ b/libassuan-2.5.5-coverity.patch @@ -0,0 +1,22 @@ +commit f2bf4b1e81d46dc00e3d478dd88fd994a944d4d5 +Author: Jakub Jelen +Date: Wed Apr 7 12:09:59 2021 +0200 + + tests: Avoid leaking file descriptors on errors + + -- + + Signed-off-by: Jakub Jelen + +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; + } diff --git a/libassuan.spec b/libassuan.spec index dc61e48..caf4eca 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -1,18 +1,21 @@ Name: libassuan Summary: GnuPG IPC library -Version: 2.5.1 -Release: 3%{?dist} +Version: 2.5.6 +Release: 6%{?dist} # The library is LGPLv2+, the documentation GPLv3+ -License: LGPLv2+ and GPLv3+ +License: GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later Source0: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2 Source1: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig -URL: http://www.gnupg.org/ +URL: https://www.gnupg.org/ -Patch1: libassuan-2.1.0-multilib.patch +Patch1: libassuan-2.5.2-multilib.patch +Patch2: libassuan-2.5.5-coverity.patch +BuildRequires: gcc BuildRequires: gawk BuildRequires: libgpg-error-devel >= 1.8 +BuildRequires: make %description This is the IPC library used by GnuPG 2, GPGME and a few other @@ -23,8 +26,7 @@ Summary: GnuPG IPC library Provides: libassuan2-devel = %{version}-%{release} Provides: libassuan2-devel%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires: pkgconfig %description devel This is the IPC static library used by GnuPG 2, GPGME and a few other packages. @@ -35,7 +37,8 @@ This package contains files needed to develop applications using %{name}. %prep %setup -q -%patch1 -p1 -b .multilib +%patch 1 -p1 -b .multilib +%patch 2 -p1 -b .coverity %build @@ -59,29 +62,89 @@ 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 %license COPYING COPYING.LIB -%doc AUTHORS ChangeLog NEWS README THANKS TODO +%doc AUTHORS NEWS README %{_libdir}/libassuan.so.0* %files devel %{_bindir}/libassuan-config %{_includedir}/libassuan2/ %{_libdir}/libassuan.so +%{_libdir}/pkgconfig/libassuan.pc %{_datadir}/aclocal/libassuan.m4 %{_infodir}/assuan.info* %changelog +* Tue Oct 29 2024 Troy Dawson - 2.5.6-6 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.5.6-5 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 2.5.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.5.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 19 2023 Jakub Jelen - 2.5.6-1 +- New upstream release (#2215873) + +* Thu Jan 19 2023 Fedora Release Engineering - 2.5.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.5.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.5.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.5.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Apr 07 2021 Jakub Jelen - 2.5.5-2 +- Address non-important coverity scan issues + +* Mon Mar 22 2021 Jakub Jelen - 2.5.5-1 +- New upstream release (#1941663) + +* Tue Jan 26 2021 Fedora Release Engineering - 2.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 01 2020 Jakub Jelen - 2.5.4-1 +- New upstream release (#1891067) + +* Tue Jul 28 2020 Fedora Release Engineering - 2.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 2.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Aug 19 2019 Tomáš Mráz 2.5.3-2 +- add includedir to pkg-config --cflags (#1742986) + +* Sat Aug 3 2019 Peter Robinson 2.5.3-1 +- new upstream release 2.5.3 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 08 2019 Tomáš Mráz 2.5.2-1 +- new upstream release 2.5.2 +- drop obsolete install-info scriptlets + +* Fri Jul 13 2018 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 32584dd..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,26 +0,0 @@ -/fips-disabled-buildroot-disabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/libassuan - name: /plans/ci/fips-disabled-buildroot-disabled - - -/fips-disabled-buildroot-enabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/libassuan - name: /plans/ci/fips-disabled-buildroot-enabled - - -/fips-enaled-buildroot-disabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/libassuan - name: /plans/ci/fips-enabled-buildroot-disabled - - -/fips-enaled-buildroot-enabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/libassuan - name: /plans/ci/fips-enabled-buildroot-enabled diff --git a/sources b/sources index f899895..69a712c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libassuan-2.5.1.tar.bz2) = c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d -SHA512 (libassuan-2.5.1.tar.bz2.sig) = 08fc136b3fa8a4b6137d6956ada0748a206d7d467ed1c1d4d3e893e8b837b053e0d06b6c1a03fac938c1f192ebdcda00e58d107fd7a28d88313126d2311c37f2 +SHA512 (libassuan-2.5.6.tar.bz2) = dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee +SHA512 (libassuan-2.5.6.tar.bz2.sig) = c7765530618128a12f1118278d35d8c33d32b560073dbd691cb92c0d94b75fd5fde65cd3f5db717ddfb907b266fdddc1e7a1e2b15b1b89b7470941dbde8162e3