diff --git a/4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch b/4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch new file mode 100644 index 0000000..8b12c17 --- /dev/null +++ b/4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch @@ -0,0 +1,32 @@ +From 4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e Mon Sep 17 00:00:00 2001 +From: Jiri Kucera +Date: Sun, 25 Jul 2021 11:35:54 +0200 +Subject: [PATCH] core: Support closefrom also for glibc. + +* src/posix-io.c (_gpgme_io_spawn): Use glibc's closefrom. +-- + +Since 2.34, glibc introduces closefrom (the implementation +follows *BSD standard). + +Signed-off-by: Werner Koch +--- + src/posix-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/posix-io.c b/src/posix-io.c +index e712ef28..2a3a81fc 100644 +--- a/src/posix-io.c ++++ b/src/posix-io.c +@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, + if (fd_list[i].fd > fd) + fd = fd_list[i].fd; + fd++; +-#if defined(__sun) || defined(__FreeBSD__) ++#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__) + closefrom (fd); + max_fds = fd; + #else /*!__sun */ +-- +2.11.0 + diff --git a/gpgme.spec b/gpgme.spec index 3266048..173e5a1 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -9,7 +9,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.15.1 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: https://gnupg.org/related_software/gpgme/ @@ -23,6 +23,9 @@ Patch1001: 0001-don-t-add-extra-libraries-for-linking.patch Patch1002: gpgme-1.3.2-largefile.patch # Let's fix stupid AX_PYTHON_DEVEL Patch1003: 0001-fix-stupid-ax_python_devel.patch +# Fix build with glibc >=2.34 +# See: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e +Patch1004: 4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch #BuildRequires: autoconf #BuildRequires: automake @@ -212,6 +215,9 @@ make check %{python3_sitearch}/gpg/ %changelog +* Tue Nov 02 2021 Frantisek Sumsal - 1.15.1-6 +- Fix build with glibc >=2.34 (RHBZ#1984691, RHBZ#1987561) + * Thu Jul 22 2021 Fedora Release Engineering - 1.15.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild