diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
| commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
| tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-libs/glib | |
| parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) | |
gentoo resync : 07.08.2021
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch | 32 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.68.3-r1.ebuild | 1 |
3 files changed, 35 insertions, 1 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 26c60214ad08..ca4a72e2ca3a 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,6 +1,7 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116 +AUX glib-2.68.3-glibc-2.34-close_range.patch 1102 BLAKE2B 4f3b747288a531d36b85aa648847892e12744c8e18bd71803531397f175dacfc99f22fdb4a3a8c6ad7563673e789aacd431dd7c5c9a300f34868f2047eacad7c SHA512 737941830ec974d0a18fec69ecc2ebdf6144021984c8f8237cf607cd1417b10f2233747ad470fe9fb14b46e2b3c5081a6d5bb1bd8992030653d940ce0cec6b00 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2 -EBUILD glib-2.68.3-r1.ebuild 10156 BLAKE2B 8208bd7df122b064999f881986b197f6735adbc471eae69e75215b1ab6fedbea8d648e0985c233a6db0e4c5d9287fe88890aaece7eb5ba464ecb061f37b55ece SHA512 da8538e163209a2d3c19f1b35b9972ce8812d81d7f985bb03f2e7d670945b6e8f40eb8ba3ddedaea523f26259d86ea7b4961ee91b92b45b5d311690e50f70c5a +EBUILD glib-2.68.3-r1.ebuild 10213 BLAKE2B 3b1abda925929a3ec3e40d002557371eb55d9fcfc5dc78bcc73cf827f5aaf2d73fccd921e27f181012ee7cb8967fd7c8efc613672101b4c6c7e140e9f0a3c31e SHA512 255330126e7e730b1887226b0fe348aa175c380078aae81320f80991081dea2db3515f148d49749afca538c7e583a2097accc194ba3827bb92ab2ca1f788c766 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56 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 000000000000..a84ccaaccbb9 --- /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 <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 4491252a2ced..ff067ae12a16 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() { |