diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch | 29 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch new file mode 100644 index 0000000000..6ff25fc535 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 8 Jul 2021 17:26:43 -0700 | ||
4 | Subject: [PATCH] correctly use 3 parameters for close_range | ||
5 | |||
6 | libc implementation has 3 parameter e.g. | ||
7 | https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | glib/gspawn.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/glib/gspawn.c b/glib/gspawn.c | ||
16 | index 899647c2f..3073a10a4 100644 | ||
17 | --- a/glib/gspawn.c | ||
18 | +++ b/glib/gspawn.c | ||
19 | @@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) | ||
20 | * | ||
21 | * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, | ||
22 | * fall back to safe_fdwalk(). */ | ||
23 | - if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) | ||
24 | + if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) | ||
25 | #endif /* HAVE_CLOSE_RANGE */ | ||
26 | (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); | ||
27 | #endif | ||
28 | -- | ||
29 | 2.32.0 | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb index 62c8d49464..cbce6eae61 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb | |||
@@ -18,6 +18,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
19 | file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ | 19 | file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ |
20 | file://time-test.patch \ | 20 | file://time-test.patch \ |
21 | file://0001-correctly-use-3-parameters-for-close_range.patch \ | ||
21 | " | 22 | " |
22 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 23 | SRC_URI_append_class-native = " file://relocate-modules.patch" |
23 | 24 | ||