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 F1CE9139360 for ; Thu, 5 Aug 2021 01:56:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D108E0970; Thu, 5 Aug 2021 01:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E4ACCE0970 for ; Thu, 5 Aug 2021 01:56:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 34B02342C8E for ; Thu, 5 Aug 2021 01:56:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C095A7BD for ; Thu, 5 Aug 2021 01:56:44 +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: <1628128455.99996faf6804d281f7a543541d4007919baa82be.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/, dev-libs/glib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch dev-libs/glib/glib-2.68.3-r1.ebuild X-VCS-Directories: dev-libs/glib/ dev-libs/glib/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99996faf6804d281f7a543541d4007919baa82be X-VCS-Branch: master Date: Thu, 5 Aug 2021 01:56:44 +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: a09883d2-53b0-4226-a2cb-4c14289e2c61 X-Archives-Hash: 9b32bf86cad0eab48b3d6a49e16ef4a9 commit: 99996faf6804d281f7a543541d4007919baa82be Author: Sam James gentoo org> AuthorDate: Thu Aug 5 01:54:15 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 5 01:54:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99996faf dev-libs/glib: fix build with glibc-2.34 Closes: https://bugs.gentoo.org/803632 Signed-off-by: Sam James gentoo.org> .../files/glib-2.68.3-glibc-2.34-close_range.patch | 32 ++++++++++++++++++++++ dev-libs/glib/glib-2.68.3-r1.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch b/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch new file mode 100644 index 00000000000..a84ccaaccbb --- /dev/null +++ b/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/803632 +https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864d1a0ddbead3c18872e95116e3843e81be.patch + +From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 8 Jul 2021 17:26:43 -0700 +Subject: [PATCH] correctly use 3 parameters for close_range + +libc implementation has 3 parameter e.g. +https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html + +Signed-off-by: Khem Raj +--- + glib/gspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 95f5b868e..a15fb1ca1 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd) + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). */ +- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) ++ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) + #endif /* HAVE_CLOSE_RANGE */ + (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); + #endif +-- +GitLab + diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild index 4491252a2ce..ff067ae12a1 100644 --- a/dev-libs/glib/glib-2.68.3-r1.ebuild +++ b/dev-libs/glib/glib-2.68.3-r1.ebuild @@ -69,6 +69,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.68.3-glibc-2.34-close_range.patch ) pkg_setup() {