From 335f81efdc81de7bc804bb63945ca489accf036f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 26 Nov 2024 16:57:28 +0300 Subject: [PATCH] import libassuan-2.5.6-5.el10 --- .gitignore | 2 + .libassuan.metadata | 2 + SOURCES/libassuan-2.5.2-multilib.patch | 28 ++ SOURCES/libassuan-2.5.5-coverity.patch | 22 ++ SPECS/libassuan.spec | 344 +++++++++++++++++++++++++ 5 files changed, 398 insertions(+) create mode 100644 .gitignore create mode 100644 .libassuan.metadata create mode 100644 SOURCES/libassuan-2.5.2-multilib.patch create mode 100644 SOURCES/libassuan-2.5.5-coverity.patch create mode 100644 SPECS/libassuan.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f9dce61 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/libassuan-2.5.6.tar.bz2 +SOURCES/libassuan-2.5.6.tar.bz2.sig diff --git a/.libassuan.metadata b/.libassuan.metadata new file mode 100644 index 0000000..66a7c59 --- /dev/null +++ b/.libassuan.metadata @@ -0,0 +1,2 @@ +b1e8754dbf89b3a3eb175f5df75048dbca1fce57 SOURCES/libassuan-2.5.6.tar.bz2 +1f2710b6733cf04e9d9ab30f26eb7440edda4c23 SOURCES/libassuan-2.5.6.tar.bz2.sig diff --git a/SOURCES/libassuan-2.5.2-multilib.patch b/SOURCES/libassuan-2.5.2-multilib.patch new file mode 100644 index 0000000..8c3345c --- /dev/null +++ b/SOURCES/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 diff --git a/SOURCES/libassuan-2.5.5-coverity.patch b/SOURCES/libassuan-2.5.5-coverity.patch new file mode 100644 index 0000000..196141c --- /dev/null +++ b/SOURCES/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/SPECS/libassuan.spec b/SPECS/libassuan.spec new file mode 100644 index 0000000..fe82fff --- /dev/null +++ b/SPECS/libassuan.spec @@ -0,0 +1,344 @@ +Name: libassuan +Summary: GnuPG IPC library +Version: 2.5.6 +Release: 5%{?dist} + +# The library is LGPLv2+, the documentation 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: https://www.gnupg.org/ + +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 +packages. + +%package devel +Summary: GnuPG IPC library +Provides: libassuan2-devel = %{version}-%{release} +Provides: libassuan2-devel%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig +%description devel +This is the IPC static library used by GnuPG 2, GPGME and a few other +packages. + +This package contains files needed to develop applications using %{name}. + + +%prep +%setup -q + +%patch 1 -p1 -b .multilib +%patch 2 -p1 -b .coverity + + +%build +%configure \ + --includedir=%{_includedir}/libassuan2 + +%make_build + + +%install +%make_install + +## Unpackaged files +rm -fv %{buildroot}%{_infodir}/dir +rm -fv %{buildroot}%{_libdir}/lib*.la + + +%check +make check + + +%ldconfig_scriptlets + +%files +%license COPYING COPYING.LIB +%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 +* 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 + +* Sat Feb 03 2018 Igor Gnatenko - 2.5.1-2 +- Switch to %%ldconfig_scriptlets + +* Fri Dec 08 2017 Tomáš Mráz 2.5.1-1 +- new upstream release 2.5.1 + +* Fri Nov 24 2017 Tomáš Mráz 2.4.4-1 +- new upstream release 2.4.4 + +* Mon Aug 07 2017 Rex Dieter - 2.4.3-6 +- .spec cosmetics, update source URLs + +* Mon Aug 07 2017 Igor Gnatenko - 2.4.3-5 +- Drop unneeded pth-devel dependencies + +* Thu Aug 03 2017 Fedora Release Engineering - 2.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jul 14 2016 Tomáš Mráz 2.4.3-1 +- new upstream release + +* Thu Feb 04 2016 Fedora Release Engineering - 2.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Dec 3 2015 Tomáš Mráz 2.4.2-1 +- new upstream release + +* Tue Nov 24 2015 Tomáš Mráz 2.4.1-1 +- new upstream release + +* Wed Sep 2 2015 Tomáš Mráz 2.3.0-1 +- new upstream release + +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Dec 19 2014 Tomáš Mráz 2.2.0-1 +- new upstream release + +* Thu Sep 11 2014 Tomáš Mráz 2.1.2-1 +- new upstream release + +* Sun Aug 17 2014 Fedora Release Engineering - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 17 2014 Tom Callaway - 2.1.0-4 +- fix license handling + +* Sat Jun 07 2014 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 15 2013 Tomáš Mráz 2.1.0-1 +- new upstream release + +* Thu Feb 14 2013 Fedora Release Engineering - 2.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Dec 3 2012 Tomáš Mráz 2.0.3-4 +- multilib conflict in libassuan-config fixed + +* Thu Jul 19 2012 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Apr 19 2012 Tomáš Mráz 2.0.3-2 +- add missing requires of base package + +* Wed Apr 18 2012 Tomáš Mráz 2.0.3-1 +- new upstream release + +* Fri Jan 13 2012 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jul 15 2011 Tomáš Mráz 2.0.1-1 +- new upstream release + +* Thu Apr 14 2011 Rex Dieter 2.0.0-4 +- Missing ldconfig calls (#696787) + +* Mon Feb 07 2011 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Aug 10 2010 Rex Dieter - 2.0.0-2 +- -devel: Provides: libassuan2-devel + +* Tue Jul 27 2010 Rex Dieter - 2.0.0-1 +- libassuan-2.0.0 (#573796) + +* Thu Dec 17 2009 Rex Dieter - 1.0.5-4 +- better versioning for Obsoletes +- better (upstreamable) multilib patch + +* Thu Dec 17 2009 Tomas Mraz - 1.0.5-3 +- Fix license tag - the documentation is GPLv3+ + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat Jun 20 2009 Rex Dieter - 1.0.5-1 +- libassuan-1.0.5 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Apr 03 2008 Rex Dieter 1.0.4-3 +- multiarch conflicts (#341911) + +* Fri Feb 08 2008 Rex Dieter 1.0.4-2 +- respin (gcc43) + +* Wed Dec 12 2007 Rex Dieter - 1.0.4-1 +- libassuan-1.0.4 +- License: LGPLv2+ +- disable useless -debuginfo (static libs only) + +* Sun Aug 26 2007 Rex Dieter - 1.0.3-2 +- BR: gawk (to reenable pth support) + +* Fri Aug 24 2007 Rex Dieter - 1.0.3-1 +- libassuan-1.0.3 +- License: LGPLv2 + +* Thu Aug 02 2007 Rex Dieter - 1.0.2-2 +- License: LGPLv3 (clarification, changed from LGPLv2 1.0.1 -> 1.0.2) + +* Fri Jul 06 2007 Rex Dieter - 1.0.2-1 +- libassuan-1.0.2 +- rename -static -> -devel + +* Sat Nov 25 2006 Rex Dieter - 1.0.1-1 +- libassuan-1.0.1 + +* Mon Nov 13 2006 Rex Dieter - 1.0.0-1 +- libassuan-1.0.0 +- rename -devel -> -static (+Obsoletes/Provides: %%name-devel) + +* Wed Oct 18 2006 Rex Dieter - 0.9.3-2 +- another libassuan.m4 patch + +* Tue Oct 10 2006 Rex Dieter - 0.9.3-1 +- 0.9.3 +- BR: pth-devel, -devel: Requires: pth-devel + +* Wed Oct 04 2006 Rex Dieter - 0.9.2-1 +- 0.9.2 + +* Mon Oct 02 2006 Rex Dieter - 0.9.0-3 +- respin + +* Tue Sep 26 2006 Rex Dieter - 0.6.10-3 +- fc6 respin + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 +- Build PIC only for x86_64. + +* Fri Jul 1 2005 Ville Skyttä - 0.6.10-1 +- 0.6.10, macro patch no longer needed (#162262). + +* Sun May 8 2005 Michael Schwendt - 0.6.9-4 +- rebuilt + +* Fri Mar 18 2005 Ville Skyttä - 0.6.9-3 +- Fix FC4 build and source URLs. + +* Thu Feb 3 2005 Michael Schwendt - 0.6.9-2 +- Build PIC to fix x86_64 linking. + +* Thu Jan 06 2005 Rex Dieter - 0.6.9-1 +- 0.6.9 + +* Sat Oct 23 2004 Rex Dieter - 0.6.7-0.fdr.3 +- *really* fix description this time. + +* Fri Oct 22 2004 Rex Dieter - 0.6.7-0.fdr.2 +- remove "We decided..." part of description +- remove hard-coded .gz info references +- Req(preun)->Preq(postun): /sbin/install-info + +* Thu Oct 21 2004 Rex Dieter - 0.6.7-0.fdr.1 +- cleanup, make presentable. + +* Tue Oct 19 2004 Rex Dieter - 0.6.7-0.fdr.0 +- first try