diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-07-15 15:28:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-23 23:14:17 +0100 |
commit | e155627e5ed4380fd9cd3b191f122ad7ecab80fd (patch) | |
tree | c26c7d0388ff2c6f74f7d0bb6439183496dfb632 /meta/recipes-support/gpgme | |
parent | 5e2c22d7ee52f1322be8c0953ab069f461dbb054 (diff) | |
download | poky-e155627e5ed4380fd9cd3b191f122ad7ecab80fd.tar.gz |
gpgme: Use glibc provided closefrom API when available
glibc 2.34+ has added this API new
(From OE-Core rev: eaebf0884d7e1ffb8a14cc1ff947d0724e7bb6a1)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a2b2479d20d029f5a11dba8cf7f7ca3e4a5bbbe2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch | 24 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.13.1.bb | 3 |
2 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch new file mode 100644 index 0000000000..1c46684c6d --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 15 Jul 2021 12:33:13 -0700 | ||
4 | Subject: [PATCH] use closefrom() on linux and glibc 2.34+ | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | src/posix-io.c | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/posix-io.c b/src/posix-io.c | ||
13 | index e712ef2..ab8ded9 100644 | ||
14 | --- a/src/posix-io.c | ||
15 | +++ b/src/posix-io.c | ||
16 | @@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, | ||
17 | if (fd_list[i].fd > fd) | ||
18 | fd = fd_list[i].fd; | ||
19 | fd++; | ||
20 | -#if defined(__sun) || defined(__FreeBSD__) | ||
21 | +#if defined(__sun) || defined(__FreeBSD__) || (defined(__GLIBC__) && __GNUC_PREREQ(2, 34)) | ||
22 | closefrom (fd); | ||
23 | max_fds = fd; | ||
24 | #else /*!__sun */ | ||
diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb index 6e945d3165..dacc9896e4 100644 --- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb +++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb | |||
@@ -20,7 +20,8 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ | |||
20 | file://0006-fix-build-path-issue.patch \ | 20 | file://0006-fix-build-path-issue.patch \ |
21 | file://0007-python-Add-variables-to-tests.patch \ | 21 | file://0007-python-Add-variables-to-tests.patch \ |
22 | file://0008-do-not-auto-check-var-PYTHON.patch \ | 22 | file://0008-do-not-auto-check-var-PYTHON.patch \ |
23 | " | 23 | file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ |
24 | " | ||
24 | 25 | ||
25 | SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645" | 26 | SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645" |
26 | SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" | 27 | SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" |