[epiphany] Revert "Revert "embed-shell: use a unix:dir address for the D-Bus server""



commit 298317661c0e02b8f3d53515726e98acb002bcaf
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Jul 24 14:13:11 2019 -0500

    Revert "Revert "embed-shell: use a unix:dir address for the D-Bus server""
    
    This reverts commit 038b77c7e9f171d02143f98f8369eb0a3332a6d4.

 embed/ephy-embed-shell.c | 8 ++++++--
 meson.build              | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 1cb979697..6c990f3e8 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -1035,7 +1035,11 @@ ephy_embed_shell_setup_web_process_extensions_server (EphyEmbedShell *shell)
   g_autofree char *address = NULL;
   g_autoptr (GError) error = NULL;
 
-  address = g_strdup_printf ("unix:tmpdir=%s", g_get_tmp_dir ());
+  /* Due to the bubblewrap sandbox, we cannot use any abstract sockets here.
+   * This means that unix:tmpdir= or unix:abstract= addresses will not work.
+   * Using unix:dir= guarantees that abstract sockets won't be used.
+   */
+  address = g_strdup_printf ("unix:dir=%s", ephy_file_tmp_dir ());
 
   observer = g_dbus_auth_observer_new ();
 
@@ -1055,7 +1059,7 @@ ephy_embed_shell_setup_web_process_extensions_server (EphyEmbedShell *shell)
                                               &error);
 
   if (error) {
-    g_warning ("Failed to start web process extension server on %s: %s", address, error->message);
+    g_warning ("Failed to start embed shell D-Bus server on %s: %s", address, error->message);
     return;
   }
 
diff --git a/meson.build b/meson.build
index 438b55aca..6c47fbe46 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,7 @@ config_h = declare_dependency(
   )
 )
 
-glib_requirement = '>= 2.56.0'
+glib_requirement = '>= 2.61.2'
 gtk_requirement = '>= 3.24.0'
 nettle_requirement = '>= 3.4'
 webkitgtk_requirement = '>= 2.25.1'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]