main/glib: upgrade to 2.74.2

2 files changed, 3 insertions, 123 deletions

diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index db345f54ae..5088e51630 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=glib
-pkgver=2.74.1
-pkgrel=2
+pkgver=2.74.2
+pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="https://developer.gnome.org/glib/"
 arch="all"
@@ -25,7 +25,6 @@ source="https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
 	0001-gquark-fix-initialization-with-c-constructors.patch
 	deprecated-no-warn.patch
 	0001-gslice-remove-slice-allocator.patch
-	Revert-Handling-collision-between-standard-io-file.patch
 	"
 options="!check" # don't like to be run without first being installed
 
@@ -70,9 +69,8 @@ static() {
 }
 
 sha512sums="
-21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3  glib-2.74.1.tar.xz
+90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895  glib-2.74.2.tar.xz
 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b  0001-gquark-fix-initialization-with-c-constructors.patch
 744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1  deprecated-no-warn.patch
 b47f1330d1747aac74eec5cf670f43084471acebc2f455e1c3374e3d642e7cdf415e11fc6c3910681f4c422d9bfff66f0aa96935c28d282c3a38faaf4271da68  0001-gslice-remove-slice-allocator.patch
-b5974e75567dda7ec2831fc4a86da4c65d3da059a27ad3d75a2899996b5779591b4391d11512b56d34874d0451ed1c6511f95668925420811f83dfdfd6d557f7  Revert-Handling-collision-between-standard-io-file.patch
 "
diff --git a/main/glib/Revert-Handling-collision-between-standard-io-file.patch b/main/glib/Revert-Handling-collision-between-standard-io-file.patch
deleted file mode 100644
index 843076aed2..0000000000
--- a/main/glib/Revert-Handling-collision-between-standard-io-file.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From ca905744dffb844663b5bd6b42f33e2d44f9b4cd Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Fri, 28 Oct 2022 11:21:04 -0400
-Subject: [PATCH] Revert "Handling collision between standard i/o file
- descriptors and newly created ones"
-
-g_unix_open_pipe tries to avoid the standard io fd range
-when getting pipe fds. This turns out to be a bad idea because
-certain buggy programs rely on it using that range.
-
-This reverts commit d9ba6150909818beb05573f54f26232063492c5b
-and adds a test to ensure we don't inadvertently do it again later.
-
-Closes: https://gitlab.gnome.org/GNOME/glib/-/issues/2795
----
- glib/glib-unix.c  | 24 ------------------------
- glib/tests/unix.c | 29 +++++++++++++++++++++++++++++
- 2 files changed, 29 insertions(+), 24 deletions(-)
-
-diff --git a/glib/glib-unix.c b/glib/glib-unix.c
-index 4710c51168..bc152d7663 100644
---- a/glib/glib-unix.c
-+++ b/glib/glib-unix.c
-@@ -108,17 +108,6 @@ g_unix_open_pipe (int     *fds,
-     ecode = pipe2 (fds, pipe2_flags);
-     if (ecode == -1 && errno != ENOSYS)
-       return g_unix_set_error_from_errno (error, errno);
--    /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
--    else if (fds[0] < 3 || fds[1] < 3)
--      {
--        int old_fds[2] = { fds[0], fds[1] };
--        gboolean result = g_unix_open_pipe (fds, flags, error);
--        close (old_fds[0]);
--        close (old_fds[1]);
--
--        if (!result)
--          g_unix_set_error_from_errno (error, errno);
--      }
-     else if (ecode == 0)
-       return TRUE;
-     /* Fall through on -ENOSYS, we must be running on an old kernel */
-@@ -127,19 +116,6 @@ g_unix_open_pipe (int     *fds,
-   ecode = pipe (fds);
-   if (ecode == -1)
-     return g_unix_set_error_from_errno (error, errno);
--  /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
--  else if (fds[0] < 3 || fds[1] < 3)
--    {
--      int old_fds[2] = { fds[0], fds[1] };
--      gboolean result = g_unix_open_pipe (fds, flags, error);
--      close (old_fds[0]);
--      close (old_fds[1]);
--
--      if (!result)
--        g_unix_set_error_from_errno (error, errno);
--
--      return result;
--    }
- 
-   if (flags == 0)
-     return TRUE;
-diff --git a/glib/tests/unix.c b/glib/tests/unix.c
-index 2112cab6bf..5dde2b52cc 100644
---- a/glib/tests/unix.c
-+++ b/glib/tests/unix.c
-@@ -26,6 +26,7 @@
- #include "glib-unix.h"
- #include <string.h>
- #include <pwd.h>
-+#include <unistd.h>
- 
- static void
- test_pipe (void)
-@@ -52,6 +53,33 @@ test_pipe (void)
-   g_assert (g_str_has_prefix (buf, "hello"));
- }
- 
-+static void
-+test_pipe_stdio_overwrite (void)
-+{
-+  GError *error = NULL;
-+  int pipefd[2], ret;
-+  gboolean res;
-+  int stderr_fd;
-+
-+  stderr_fd = dup (STDERR_FILENO);
-+  g_assert_cmpint (stderr_fd, >, 0);
-+  close (STDERR_FILENO);
-+
-+  res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
-+  g_assert (res);
-+  g_assert_no_error (error);
-+
-+  g_assert_cmpint (pipefd[0], ==, STDERR_FILENO);
-+
-+  close (pipefd[0]);
-+  close (pipefd[1]);
-+
-+  ret = dup2 (stderr_fd, STDERR_FILENO);
-+  g_assert_cmpint (ret, >=, 0);
-+
-+  close (stderr_fd);
-+}
-+
- static void
- test_error (void)
- {
-@@ -337,6 +365,7 @@ main (int   argc,
-   g_test_init (&argc, &argv, NULL);
- 
-   g_test_add_func ("/glib-unix/pipe", test_pipe);
-+  g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite);
-   g_test_add_func ("/glib-unix/error", test_error);
-   g_test_add_func ("/glib-unix/nonblocking", test_nonblocking);
-   g_test_add_func ("/glib-unix/sighup", test_sighup);
--- 
-GitLab
-