From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA5CA158041 for ; Sun, 5 Sep 2021 23:58:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB0EDE0845; Sun, 5 Sep 2021 23:58:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71883E0845 for ; Sun, 5 Sep 2021 23:58:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F6AD340E25 for ; Sun, 5 Sep 2021 23:58:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EDC756 for ; Sun, 5 Sep 2021 23:58:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1630886305.87834abded7c46005d3e53d0cfc1282c1d03507c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/, app-crypt/gpgme/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch app-crypt/gpgme/gpgme-1.16.0.ebuild X-VCS-Directories: app-crypt/gpgme/ app-crypt/gpgme/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 87834abded7c46005d3e53d0cfc1282c1d03507c X-VCS-Branch: master Date: Sun, 5 Sep 2021 23:58:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76138222-7fab-42a3-a7b7-a66df2de7614 X-Archives-Hash: df2adfd653173058f5be4e961030bfc6 commit: 87834abded7c46005d3e53d0cfc1282c1d03507c Author: Sam James gentoo org> AuthorDate: Sun Sep 5 23:58:25 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 5 23:58:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87834abd app-crypt/gpgme: backport glibc-2.34 patch Maintainer timeout. Closes: https://bugs.gentoo.org/803557 Signed-off-by: Sam James gentoo.org> .../gpgme/files/gpgme-1.16.0-glibc-2.34.patch | 33 ++++++++++++++++++++++ app-crypt/gpgme/gpgme-1.16.0.ebuild | 4 +++ 2 files changed, 37 insertions(+) diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch new file mode 100644 index 00000000000..f328e4540ae --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/803557 +https://dev.gnupg.org/T5587 + +From: Fabrice Fontaine +Date: Sun, 5 Sep 2021 00:05:00 +0200 +Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34 + +Fix the following build failure with glibc >= 2.34 raised because +closefrom doesn't return an int but a void since its addition with +https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c + +``` +posix-io.c: In function '_gpgme_io_spawn': +posix-io.c:577:23: error: void value not ignored as it ought to be + 577 | while ((i = closefrom (fd)) && errno == EINTR) + | ^ +``` + +Fixes: + - http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff + +Signed-off-by: Fabrice Fontaine +--- 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__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) + closefrom (fd); + max_fds = fd; + #else /*!__sun */ diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild index ed9a1cc7e57..d8df58daf47 100644 --- a/app-crypt/gpgme/gpgme-1.16.0.ebuild +++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild @@ -29,6 +29,10 @@ BDEPEND="python? ( dev-lang/swig )" REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/${P}-glibc-2.34.patch +) + do_python() { if use python; then pushd "lang/python" > /dev/null || die