diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2021-09-06 09:17:18 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-09-06 09:18:07 +0200 |
commit | e4f93d3d9d0608a84aaa8afcafc410a1b705e71a (patch) | |
tree | a9dad157a44244ed700ce7c86133ce878dd0cfda /app-crypt/gpgme/files | |
parent | net-ftp/pure-ftpd: Revbump to fix quota check (diff) | |
download | gentoo-e4f93d3d9d0608a84aaa8afcafc410a1b705e71a.tar.gz gentoo-e4f93d3d9d0608a84aaa8afcafc410a1b705e71a.tar.bz2 gentoo-e4f93d3d9d0608a84aaa8afcafc410a1b705e71a.zip |
Revert "app-crypt/gpgme: backport glibc-2.34 patch"
This reverts commit 87834abded7c46005d3e53d0cfc1282c1d03507c.
Commit done without maintainer consent.
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-crypt/gpgme/files')
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch | 33 |
1 files changed, 0 insertions, 33 deletions
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 deleted file mode 100644 index f328e4540ae3..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/803557 -https://dev.gnupg.org/T5587 - -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -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 <fontaine.fabrice@gmail.com> ---- 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 */ |