Revert "Fix #2169622 for now by reverting the problematic commit"
This reverts commit 466bbb73bf
.
rpm-ostree has been adjusted to work with the changed glib2
behaviour. With any luck, nothing else is broken either.
This commit is contained in:
parent
466bbb73bf
commit
fd9079a755
@ -1,34 +0,0 @@
|
|||||||
From 74bf5dc0985f3e1f90db322a8119f451ecdc52c4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
Date: Tue, 14 Feb 2023 16:52:49 -0800
|
|
||||||
Subject: [PATCH 2/2] Revert "gio/gdbusserver: use non-abstract socket for
|
|
||||||
unix:tmpdir="
|
|
||||||
|
|
||||||
This reverts commit c0a1a3b384a27b4b18628174a5c4d9f3fb0a8c82.
|
|
||||||
---
|
|
||||||
gio/gdbusserver.c | 9 ++++++++-
|
|
||||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
|
|
||||||
index db0c9ab50..f144d129a 100644
|
|
||||||
--- a/gio/gdbusserver.c
|
|
||||||
+++ b/gio/gdbusserver.c
|
|
||||||
@@ -725,7 +725,14 @@ try_unix (GDBusServer *server,
|
|
||||||
for (n = 0; n < 8; n++)
|
|
||||||
g_string_append_c (s, random_ascii ());
|
|
||||||
|
|
||||||
- address = g_unix_socket_address_new (s->str);
|
|
||||||
+ /* prefer abstract namespace if available for tmpdir: addresses
|
|
||||||
+ * abstract namespace is disallowed for dir: addresses */
|
|
||||||
+ if (tmpdir != NULL && g_unix_socket_address_abstract_names_supported ())
|
|
||||||
+ address = g_unix_socket_address_new_with_type (s->str,
|
|
||||||
+ -1,
|
|
||||||
+ G_UNIX_SOCKET_ADDRESS_ABSTRACT);
|
|
||||||
+ else
|
|
||||||
+ address = g_unix_socket_address_new (s->str);
|
|
||||||
g_string_free (s, TRUE);
|
|
||||||
|
|
||||||
local_error = NULL;
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
@ -11,12 +11,6 @@ Source0: https://download.gnome.org/sources/glib/2.75/glib-%{version}.tar.xz
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
|
||||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
|
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
|
||||||
Patch0: gnutls-hmac.patch
|
Patch0: gnutls-hmac.patch
|
||||||
# Fixes a problem with rpm-ostree always failing:
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2169622
|
|
||||||
# per mcatanzaro, reverting is OK for a short-term downstream
|
|
||||||
# fix, correct fix will need to be something different either
|
|
||||||
# upstream or in rpm-ostree
|
|
||||||
Patch1: 0002-Revert-gio-gdbusserver-use-non-abstract-socket-for-u.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
Loading…
Reference in New Issue
Block a user