From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 23 21:29:47 2022 Received: (at submit) by debbugs.gnu.org; 24 Feb 2022 02:29:47 +0000 Received: from localhost ([127.0.0.1]:46946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN3st-000897-2e for submit@debbugs.gnu.org; Wed, 23 Feb 2022 21:29:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:49148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN3sr-000890-8J for submit@debbugs.gnu.org; Wed, 23 Feb 2022 21:29:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nN3sq-00086T-VT for guix-patches@gnu.org; Wed, 23 Feb 2022 21:29:33 -0500 Received: from [2607:f8b0:4864:20::f33] (port=40489 helo=mail-qv1-xf33.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nN3so-0002at-A0 for guix-patches@gnu.org; Wed, 23 Feb 2022 21:29:32 -0500 Received: by mail-qv1-xf33.google.com with SMTP id fc19so1433424qvb.7 for ; Wed, 23 Feb 2022 18:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s/qTmNeJrsaTak0m4se+YcFOy8u6ID42qwo8ISlLZeo=; b=Cw8uexaUbZax6EenEGwvg0U91+fHML0iIMuKEVHAsOgHLRpnz5refoAq56OZU7l4fS LFV3SO8h5vRDrlJ89he/BX+wlcHOTwWUSiF64JNRpfqoLJqlqs9c/IZosonfm5BnwfLE /HDhuaxx4PYrjxGzebpjI0XblVMIz7oAl9S+O0ajkiUY2Z+NrvBXde6msN2WWwT1SHdf 1tfZ9iAXgcViRtp0jvlf/g9Uhmlp8isL/Z7qozwyinXB+e3VQFmIjAZZdtDlXlMSa4bq nEWA8ME5bp2T1E2jpVIdYElOBX+1jlnjy/48RR0Zy87XpMR6GCs3sWRy/yMuS3TSHTLG mVDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s/qTmNeJrsaTak0m4se+YcFOy8u6ID42qwo8ISlLZeo=; b=CKTmZltqeNXydI08ATfpVFNyjFbuqB9ihWc8G/i8HnqG2NcKJam6hxLAIQoRjxHunY P/6ONgeRRTLAQnjpukuBhFfsknR6rLiK2nTSliufNVXOOr5HfcDNN9gIhpYvnCiUOuJ+ ZcLGLP/oUU4W24/Ag51hAvo8lOtOqaQg/8yKl6BUYu3SZVebHqjc1N8S68WbvLfZ2xHt 9JlT1+FR8Q11/49xUg/L21U0Crm2S5UmqTQTA6mMZDlQ4DcODkRhrO0TmKmvjX57pX73 j7UaMr/fCUVrXV8+B7aT909P2TVMsmgKsFmiS/d/84AZoS26NmBOq3pdZDz74giRmOui RAfg== X-Gm-Message-State: AOAM5331s3bhsFlk1nz6NATcTKIm0qgjAfFwyHbywpfVZ3/6ISRUcT/9 mtFF3rpcbZfyIH9/J4hJF+7wYuXx3oI= X-Google-Smtp-Source: ABdhPJzzrN+JFOkWzUrtKROJFsF5biBaQfHkwScYy6z+SwiR04ILtw6RpOe0MbGTgAbASKHZGbETjQ== X-Received: by 2002:a0c:be89:0:b0:42c:35f0:3f39 with SMTP id n9-20020a0cbe89000000b0042c35f03f39mr402147qvi.106.1645669768941; Wed, 23 Feb 2022 18:29:28 -0800 (PST) Received: from localhost.localdomain (dsl-156-1.b2b2c.ca. [66.158.156.1]) by smtp.gmail.com with ESMTPSA id p70sm704094qka.62.2022.02.23.18.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 18:29:28 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH] gnu: webkitgtk: Adjust BubbleWrap wrapper. Date: Wed, 23 Feb 2022 21:29:11 -0500 Message-Id: <20220224022911.6574-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f33 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This revisits with a fix that doesn't require to have PULSE_CLIENTCONFIG point to an absolute store location, which will allow us to revert to have PULSE_CLIENTCONF [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [209.51.188.17 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 T_SCC_BODY_TEXT_LINE No description available. 1.5 SPOOFED_FREEMAIL No description available. 0.8 SPOOF_GMAIL_MID From Gmail but it doesn't seem to be... X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) This revisits with a fix that doesn't require to have PULSE_CLIENTCONFIG point to an absolute store location, which will allow us to revert to have PULSE_CLIENTCONFIG point to a fixed location under /etc. This would alleviate the need to reboot to have changes to the PulseAudio configuration effected. * gnu/packages/patches/webkitgtk-share-store.patch: Delete file. * gnu/packages/patches/webkitgtk-bubblewrap-paths.patch: Add file. * gnu/packages/patches/webkitgtk-canonicalize-paths.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Update patches list. * gnu/packages/webkit.scm (webkitgtk)[patches]: Adjust accordingly. --- gnu/local.mk | 3 +- .../webkitgtk-adjust-bubblewrap-paths.patch | 38 +++++++++++ .../patches/webkitgtk-bind-all-fonts.patch | 17 +++-- .../webkitgtk-canonicalize-paths.patch | 66 +++++++++++++++++++ .../patches/webkitgtk-share-store.patch | 19 ------ gnu/packages/webkit.scm | 7 +- 6 files changed, 118 insertions(+), 32 deletions(-) create mode 100644 gnu/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch create mode 100644 gnu/packages/patches/webkitgtk-canonicalize-paths.patch delete mode 100644 gnu/packages/patches/webkitgtk-share-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index dcee1611b2..c4869f538c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1925,8 +1925,9 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ - %D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ + %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ + %D%/packages/patches/webkitgtk-canonicalize-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch b/gnu/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch new file mode 100644 index 0000000000..18ddb645ad --- /dev/null +++ b/gnu/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch @@ -0,0 +1,38 @@ +Share /gnu/store in the BubbleWrap container and remove FHS mounts. + +This is a Guix-specific patch not meant to be upstreamed. +diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +index f0a5e4b05dff..88b11f806968 100644 +--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ++++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +@@ -854,27 +854,12 @@ GRefPtr bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces + "--ro-bind", "/sys/dev", "/sys/dev", + "--ro-bind", "/sys/devices", "/sys/devices", + +- "--ro-bind-try", "/usr/share", "/usr/share", +- "--ro-bind-try", "/usr/local/share", "/usr/local/share", + "--ro-bind-try", DATADIR, DATADIR, +- +- // We only grant access to the libdirs webkit is built with and +- // guess system libdirs. This will always have some edge cases. +- "--ro-bind-try", "/lib", "/lib", +- "--ro-bind-try", "/usr/lib", "/usr/lib", +- "--ro-bind-try", "/usr/local/lib", "/usr/local/lib", + "--ro-bind-try", LIBDIR, LIBDIR, +-#if CPU(ADDRESS64) +- "--ro-bind-try", "/lib64", "/lib64", +- "--ro-bind-try", "/usr/lib64", "/usr/lib64", +- "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64", +-#else +- "--ro-bind-try", "/lib32", "/lib32", +- "--ro-bind-try", "/usr/lib32", "/usr/lib32", +- "--ro-bind-try", "/usr/local/lib32", "/usr/local/lib32", +-#endif +- + "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR, ++ ++ // Bind mount the store inside the WebKitGTK sandbox. ++ "--ro-bind", "@storedir@", "@storedir@", + }; + + if (launchOptions.processType == ProcessLauncher::ProcessType::DBusProxy) { diff --git a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch index e7b06cc650..27013180c4 100644 --- a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch +++ b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch @@ -1,26 +1,25 @@ -Add fonts from all XDG_DATA_DIRS, not just XDG_DATA_HOME. +Upstream commit: https://github.com/WebKit/WebKit/commit/31ac354cbeecf866f9a38f7b2f8f59f7975d3f6a -See . -Author: Liliana Marie Prikler -Index: webkitgtk-2.28.2/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -=================================================================== +diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +index ecc804663784..8de174be3c0e 100644 --- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -@@ -387,6 +387,7 @@ static void bindFonts(Vector& args) +@@ -288,6 +288,7 @@ static void bindFonts(Vector& args) const char* homeDir = g_get_home_dir(); const char* dataDir = g_get_user_data_dir(); const char* cacheDir = g_get_user_cache_dir(); + const char* const * dataDirs = g_get_system_data_dirs(); - + // Configs can include custom dirs but then we have to parse them... GUniquePtr fontConfig(g_build_filename(configDir, "fontconfig", nullptr)); -@@ -403,6 +404,10 @@ static void bindFonts(Vector& args) +@@ -304,6 +305,10 @@ static void bindFonts(Vector& args) bindIfExists(args, fontHomeConfigDir.get()); bindIfExists(args, fontData.get()); bindIfExists(args, fontHomeData.get()); -+ for (auto dataDir = dataDirs; dataDir != nullptr && *dataDir != nullptr; dataDir++) { ++ for (auto* dataDir = dataDirs; dataDir && *dataDir; dataDir++) { + GUniquePtr fontDataDir(g_build_filename(*dataDir, "fonts", nullptr)); + bindIfExists(args, fontDataDir.get()); + } bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian. } + diff --git a/gnu/packages/patches/webkitgtk-canonicalize-paths.patch b/gnu/packages/patches/webkitgtk-canonicalize-paths.patch new file mode 100644 index 0000000000..741d534831 --- /dev/null +++ b/gnu/packages/patches/webkitgtk-canonicalize-paths.patch @@ -0,0 +1,66 @@ +Upstream commit: https://github.com/WebKit/WebKit/commit/6a87eb254ef57a986a1a6ce9a3a4b66928afeb65 + +diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +index ecc804663784..a2a1c9d7a4dd 100644 +--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ++++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -165,6 +164,15 @@ enum class BindFlags { + Device, + }; + ++static void bindSymlinksRealPath(Vector& args, const char* path, const char* bindOption = "--ro-bind") ++{ ++ WTF::String realPath = FileSystem::realPath(path); ++ if (path != realPath) { ++ CString rpath = realPath.utf8(); ++ args.appendVector(Vector({ bindOption, rpath.data(), rpath.data() })); ++ } ++} ++ + static void bindIfExists(Vector& args, const char* path, BindFlags bindFlags = BindFlags::ReadOnly) + { + if (!path || path[0] == '\0') +@@ -177,7 +185,16 @@ static void bindIfExists(Vector& args, const char* path, BindFlags bind + bindType = "--ro-bind-try"; + else + bindType = "--bind-try"; +- args.appendVector(Vector({ bindType, path, path })); ++ ++ // Canonicalize the source path, otherwise a symbolic link could ++ // point to a location outside of the namespace. ++ bindSymlinksRealPath(args, path, bindType); ++ ++ // As /etc is exposed wholesale, do not layer extraneous bind ++ // directives on top, which could fail in the presence of symbolic ++ // links. ++ if (!g_str_has_prefix(path, "/etc/")) ++ args.appendVector(Vector({ bindType, path, path })); + } + + static void bindDBusSession(Vector& args, bool allowPortals) +@@ -410,17 +427,6 @@ static void bindV4l(Vector& args) + })); + } + +-static void bindSymlinksRealPath(Vector& args, const char* path) +-{ +- char realPath[PATH_MAX]; +- +- if (realpath(path, realPath) && strcmp(path, realPath)) { +- args.appendVector(Vector({ +- "--ro-bind", realPath, realPath, +- })); +- } +-} +- + // Translate a libseccomp error code into an error message. libseccomp + // mostly returns negative errno values such as -ENOMEM, but some + // standard errno values are used for non-standard purposes where their diff --git a/gnu/packages/patches/webkitgtk-share-store.patch b/gnu/packages/patches/webkitgtk-share-store.patch deleted file mode 100644 index 053d86fcf4..0000000000 --- a/gnu/packages/patches/webkitgtk-share-store.patch +++ /dev/null @@ -1,19 +0,0 @@ -Tell bubblewrap to share the store. Required for programs that use the -sandboxing features such as Epiphany. - -See . -Author: Jack Hill ---- -diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -@@ -737,6 +737,9 @@ GRefPtr bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces - "--ro-bind-try", "/usr/local/share", "/usr/local/share", - "--ro-bind-try", DATADIR, DATADIR, - -+ // Bind mount the store inside the WebKitGTK sandbox. -+ "--ro-bind", "@storedir@", "@storedir@", -+ - // We only grant access to the libdirs webkit is built with and - // guess system libdirs. This will always have some edge cases. - "--ro-bind-try", "/lib", "/lib", diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 40537f5e0a..72f673b0ca 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -247,8 +247,9 @@ (define-public webkitgtk (sha256 (base32 "1xn1hhd0qaxmjf6vy6664i4mmmjsw9zgrr4w8ni3415d981zvj3b")) - (patches (search-patches "webkitgtk-share-store.patch" - "webkitgtk-bind-all-fonts.patch")))) + (patches (search-patches "webkitgtk-bind-all-fonts.patch" + "webkitgtk-adjust-bubblewrap-paths.patch" + "webkitgtk-canonicalize-paths.patch")))) (build-system cmake-build-system) (outputs '("out" "doc" "debug")) (arguments -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 23 21:46:13 2022 Received: (at 54135) by debbugs.gnu.org; 24 Feb 2022 02:46:13 +0000 Received: from localhost ([127.0.0.1]:46966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN48y-0001Kf-PL for submit@debbugs.gnu.org; Wed, 23 Feb 2022 21:46:13 -0500 Received: from minsky.hcoop.net ([104.248.1.95]:44166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN48x-0001Eu-1h for 54135@debbugs.gnu.org; Wed, 23 Feb 2022 21:46:11 -0500 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nN48r-0004I7-FE; Wed, 23 Feb 2022 21:46:05 -0500 Date: Wed, 23 Feb 2022 21:46:05 -0500 (EST) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net To: Maxim Cournoyer Subject: Re: [bug#54135] [PATCH] gnu: webkitgtk: Adjust BubbleWrap wrapper. In-Reply-To: <20220224022911.6574-1-maxim.cournoyer@gmail.com> Message-ID: References: <20220224022911.6574-1-maxim.cournoyer@gmail.com> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54135 Cc: 54135@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Wed, 23 Feb 2022, Maxim Cournoyer wrote: > This revisits with a fix that doesn't > require to have PULSE_CLIENTCONFIG point to an absolute store location, which > will allow us to revert to have PULSE_CLIENTCONFIG point to a fixed location > under /etc. This would alleviate the need to reboot to have changes to the > PulseAudio configuration effected. > > * gnu/packages/patches/webkitgtk-share-store.patch: Delete file. > * gnu/packages/patches/webkitgtk-bubblewrap-paths.patch: Add file. > * gnu/packages/patches/webkitgtk-canonicalize-paths.patch: Likewise. > * gnu/local.mk (dist_patch_DATA): Update patches list. > * gnu/packages/webkit.scm (webkitgtk)[patches]: Adjust accordingly. > --- > gnu/local.mk | 3 +- > .../webkitgtk-adjust-bubblewrap-paths.patch | 38 +++++++++++ > .../patches/webkitgtk-bind-all-fonts.patch | 17 +++-- > .../webkitgtk-canonicalize-paths.patch | 66 +++++++++++++++++++ > .../patches/webkitgtk-share-store.patch | 19 ------ > gnu/packages/webkit.scm | 7 +- > 6 files changed, 118 insertions(+), 32 deletions(-) > create mode 100644 gnu/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch > create mode 100644 gnu/packages/patches/webkitgtk-canonicalize-paths.patch > delete mode 100644 gnu/packages/patches/webkitgtk-share-store.patch LGTM. Thanks for taking up that WebKit issue and getting it fixed upstream! Best, Jack From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 23 22:48:19 2022 Received: (at control) by debbugs.gnu.org; 24 Feb 2022 03:48:19 +0000 Received: from localhost ([127.0.0.1]:47051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN575-0006BN-17 for submit@debbugs.gnu.org; Wed, 23 Feb 2022 22:48:19 -0500 Received: from mail-qk1-f169.google.com ([209.85.222.169]:34739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN573-0006B6-3N for control@debbugs.gnu.org; Wed, 23 Feb 2022 22:48:17 -0500 Received: by mail-qk1-f169.google.com with SMTP id 185so861811qkh.1 for ; Wed, 23 Feb 2022 19:48:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:message-id:to:from:subject; bh=5FfuGj6kUv6kpsAGt4RCvKFOgSJvxA2TlCM+o0f+ZLE=; b=BuzGyIaxqmP+6iwRWKoZ/FewM6erD4DLbOaeobRZ3Qtacsq3DBQCNRXa4zT5FPzDNH EDWL9PonLh8fO5fs0snnicW+bK3egC8qL5MG3uvpMOWqTEMQDhE18ajI/bnITHQXoVHP 3I5dGV8E0K7BuYc5BDP6QG6I08b9KNLmws+qEZ20+zFaEtKcljjb8E0rk7Mz8FScIGxF Fd8TCO0L+xkUhxfjH54qyljf0RV0UcGmFw2PIhF557Zws2KZFP8n0BrpMkd7BFrUEY6+ IKgoJAsTs4YQluBqyIW71RDTwVGa8n1SuAdZKuzjE81mYcfm5HK5n86TclWXHsPRHg/e Xx+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:to:from:subject; bh=5FfuGj6kUv6kpsAGt4RCvKFOgSJvxA2TlCM+o0f+ZLE=; b=2tqFbuZJCUFWXuqF8riu7GzozxdTNoeohrqQ7IP0bnO+64WoMXmrjz78sLrkWwRAk0 nxynYQUqVa2/5dcLudyoSNJaak1GwbuIp+WG810tnGHYGlrclplT1nB/fCodgKPyf1FK WVIeNnBvMyZSVayvPvtXGQV09imB3mtTdwCVDfHjp43z7ziwE7SgNxOFg/1121jEqvb4 xnJiKA3iDXt+hPrgQ8s415ezxPVHd0lDhoDMNeMNRJRAu+smMuyGAfpZ8lmw30Yiwb3T IT6+VKh+3Gmss+Jocf9i5eIpTYiaG1iXobE21xWBegaBrnXCLCuY2jzNTCOZRMbjS953 hv3g== X-Gm-Message-State: AOAM530YAT9yHGRN7abbsNkf24Nk0sRT6awg3CtVDvTFpPwyZwsuLtft kscZK6RMNT+abuz641Bbnh9dCT0wDiU= X-Google-Smtp-Source: ABdhPJyjjItcGX2cgsWTBysncHj/POMHgZuQ7za9z7RlVNhI4HTiYtYjMxiFEzm05YOH2VR2hOxXzQ== X-Received: by 2002:a37:946:0:b0:47d:6768:edcc with SMTP id 67-20020a370946000000b0047d6768edccmr503541qkj.120.1645674491185; Wed, 23 Feb 2022 19:48:11 -0800 (PST) Received: from hurd (dsl-156-1.b2b2c.ca. [66.158.156.1]) by smtp.gmail.com with ESMTPSA id i4sm966469qti.24.2022.02.23.19.48.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 19:48:10 -0800 (PST) Date: Wed, 23 Feb 2022 22:48:09 -0500 Message-Id: <87sfs9kjra.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #53676 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 53676 by 54135 quit From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 24 09:25:57 2022 Received: (at 54135-done) by debbugs.gnu.org; 24 Feb 2022 14:25:57 +0000 Received: from localhost ([127.0.0.1]:47953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNF49-0004w6-Ib for submit@debbugs.gnu.org; Thu, 24 Feb 2022 09:25:57 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:40623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNF47-0004vq-LG for 54135-done@debbugs.gnu.org; Thu, 24 Feb 2022 09:25:56 -0500 Received: by mail-qv1-f47.google.com with SMTP id fc19so3761435qvb.7 for <54135-done@debbugs.gnu.org>; Thu, 24 Feb 2022 06:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=U9uzRQcKzVHnu9Pb6iArISGbImXtIvNoOCXDYpsiY2o=; b=SjBOLumsLMzRrpL/fW5/URHHjrwnlbLsouc7EzPTQpDDSxK0mvLt51lKv9fVMuakY+ R7OAToWEviipZEwsA+Wdbrphq3WwsgkuGvDFnXzKp8FuA8vZAJOWuWpAJlD884+iCiJR GYjt/yAyFT0DTKPuo2LJvW3REnff6Ykc/qi5ic7znSbdBrqscS52+Gowzx6jrisjok8k lTvriSY/RnfzihmiKEEPz3YWeulCrA/KCbeaExfUHe+edBxPV/qKrLvbP9pxLhZro8yq 8nbOk0Ucebm0zbuC1NjehGaq3+gejoc2ln6B1XUjwNbk/cQGZjk1fA7B0SdsFn66BuyI Jp4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=U9uzRQcKzVHnu9Pb6iArISGbImXtIvNoOCXDYpsiY2o=; b=UpFTk/y+Mmhtv1xE/nYf0UgFrulnKHtHfayQ0FDFOKZ7aFOZ0T9vIlQiIEW2FQdqcO tihMFvldsaYin6kQAmFvpiFxgFbwsMVU2bGCHRrGqNhQgHi6g++wcn+K6t1T4UmYZwJl Mo7W6L2ErpLMkkGgTFwGo8YrO61qRz3ep9A1v4rt0z9XTP4wFV0NfdRM4qCDCz50tScX yyOiokWMguoUKx0PtfKyXOq9odgG4K307/gU+tOhz1kuSgYofxyGNd2sO9dEGiZ70nR5 RV6ZSAsNd/3YSgXrgFpqxoNCFAA/GKoDeM/3y+81xp4yEnGk0dmOLl5GnnMEcKuPcTZg 6drQ== X-Gm-Message-State: AOAM532UFfL9HFl5aQCKanLfkSNJK3LcTiE8LpVmSDtaibj1YN1JEECG PWwlccKKsm2JX3wyX+krdkCjv3iHNGMcHg== X-Google-Smtp-Source: ABdhPJzaV0RqI32n7WIanAKtcgmpyGmyXcgqX4q+z+yS+Cnz6b4imkUDg4/zFY0tBO23AsLhrhe2Tg== X-Received: by 2002:ac8:5995:0:b0:2da:5cc0:7653 with SMTP id e21-20020ac85995000000b002da5cc07653mr2561820qte.82.1645712749675; Thu, 24 Feb 2022 06:25:49 -0800 (PST) Received: from hurd (dsl-156-1.b2b2c.ca. [66.158.156.1]) by smtp.gmail.com with ESMTPSA id i21sm1498992qtq.32.2022.02.24.06.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 06:25:49 -0800 (PST) From: Maxim Cournoyer To: Jack Hill Subject: Re: [bug#54135] [PATCH] gnu: webkitgtk: Adjust BubbleWrap wrapper. References: <20220224022911.6574-1-maxim.cournoyer@gmail.com> Date: Thu, 24 Feb 2022 09:25:48 -0500 In-Reply-To: (Jack Hill's message of "Wed, 23 Feb 2022 21:46:05 -0500 (EST)") Message-ID: <87o82wjq8j.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54135-done Cc: 54135-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Jack, Jack Hill writes: > On Wed, 23 Feb 2022, Maxim Cournoyer wrote: > >> This revisits with a fix that doesn't >> require to have PULSE_CLIENTCONFIG point to an absolute store location, which >> will allow us to revert to have PULSE_CLIENTCONFIG point to a fixed location >> under /etc. This would alleviate the need to reboot to have changes to the >> PulseAudio configuration effected. >> >> * gnu/packages/patches/webkitgtk-share-store.patch: Delete file. >> * gnu/packages/patches/webkitgtk-bubblewrap-paths.patch: Add file. >> * gnu/packages/patches/webkitgtk-canonicalize-paths.patch: Likewise. >> * gnu/local.mk (dist_patch_DATA): Update patches list. >> * gnu/packages/webkit.scm (webkitgtk)[patches]: Adjust accordingly. >> --- >> gnu/local.mk | 3 +- >> .../webkitgtk-adjust-bubblewrap-paths.patch | 38 +++++++++++ >> .../patches/webkitgtk-bind-all-fonts.patch | 17 +++-- >> .../webkitgtk-canonicalize-paths.patch | 66 +++++++++++++++++++ >> .../patches/webkitgtk-share-store.patch | 19 ------ >> gnu/packages/webkit.scm | 7 +- >> 6 files changed, 118 insertions(+), 32 deletions(-) >> create mode 100644 gnu/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch >> create mode 100644 gnu/packages/patches/webkitgtk-canonicalize-paths.patch >> delete mode 100644 gnu/packages/patches/webkitgtk-share-store.patch > > LGTM. Thanks for taking up that WebKit issue and getting it fixed > upstream! Thanks for the quick review! Applied as b9a4705f80. Closing. Maxim From unknown Sun Jun 22 11:43:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 25 Mar 2022 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator