diff options
Diffstat (limited to 'app-crypt/gpgme')
| -rw-r--r-- | app-crypt/gpgme/Manifest | 3 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.16.0-glibc-2.34.patch | 33 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.16.0.ebuild | 4 |
3 files changed, 39 insertions, 1 deletions
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index 2e35742699ea..2f65ff8abf2d 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,5 +1,6 @@ +AUX gpgme-1.16.0-glibc-2.34.patch 1259 BLAKE2B 28ced8db5bc6010eeb0b870b927dba3baca3c1c1beda563263ebbf938fee37d56599e6f4816d3e701bed3b2734e68ec4bff8c4134af5a3c7891c5cdc8f1678ca SHA512 46900e8d2f816b3c1cc9e222b7f11d2ef89684a6d43b2dd84cb0e7ed5becd539f28654a3d3c0bac83e970c66a2079dc5263ab5d131a52be0719cbc595cbf7a76 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4 EBUILD gpgme-1.15.1.ebuild 2671 BLAKE2B 259c3eebdcb359d6e6636dba2b9588f14f2bba426511b2d8b560192c31917dac28d85952443dbeed12e8a8ddbf61aa4eee3ec68add965503bfc8fc9e1a473c0b SHA512 ef99b8044daa6e1f3371f4958dd9acda2c1cbd9594970c9f06dcd70e45f6c83e78ec4792a3228d5c29f6689693b93c529fceded96f255df23539452c8b9bd105 -EBUILD gpgme-1.16.0.ebuild 2685 BLAKE2B a6d145a9fa4614e4530fa5e98cbfea585f2301bd7e21b60628d0e37bb7437ab2e3fccce8d47168402c1558ec50887396dc4d591029dbf818fd281d19d8d54f3d SHA512 6ae5a93c381e1f4a4c3414c73fae4fb3386296673d29341dbac6ce7db9b240f7ebc2c09fc779ae7247540bda1a900661df6ee310219c89bf3c139da0cefb0734 +EBUILD gpgme-1.16.0.ebuild 2735 BLAKE2B a3975eb847e70cafabf93312f9f9e620c97ccb8a46c3987e3211c752c9f0731f61552341caa0ba79e01e1fa918a03563d523000d4dd3d4cb05e4b25598de446c SHA512 02f8c979c22abaaf644109d84c441d8dbf4171910472f3c0d3ae987a7198634515b732ddcbf8b16c39a7a93d03a18fa28e951a15fe4bc2f8c44a95c40caa702d MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334 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 000000000000..f328e4540ae3 --- /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 <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 */ diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild index ed9a1cc7e57a..d8df58daf471 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 |