diff --git a/files/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch b/files/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch new file mode 100644 --- /dev/null +++ b/files/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch @@ -0,0 +1,21 @@ +From: intrigeri +Date: Mon, 9 Sep 2019 08:32:52 +0000 +Subject: AppArmor: allow new path for the Firefox 68 IPC + +(cherry picked from commit 0b78aea138daee5de1ba5fad126625f245134c6b) +--- + apparmor/torbrowser.Browser.firefox | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox +index f782f35..c6d8a26 100644 +--- a/apparmor/torbrowser.Browser.firefox ++++ b/apparmor/torbrowser.Browser.firefox +@@ -105,6 +105,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} { + + # Required for multiprocess Firefox (aka Electrolysis, i.e. e10s) + owner /{dev,run}/shm/org.chromium.* rw, ++ owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC + + # Deny access to DRM nodes, that's granted by the X abstraction, which is + # sourced by the gnome abstraction, that we include. diff --git a/files/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch b/files/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch new file mode 100644 --- /dev/null +++ b/files/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch @@ -0,0 +1,36 @@ +From: intrigeri +Date: Mon, 9 Sep 2019 09:07:55 +0000 +Subject: AppArmor: Pass the environment to Firefox content processes +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Without this, LD_LIBRARY_PATH is not passed to these processes, and then: + + - Tor Browser cannot load libmozsandbox.so + + - Tor Browser 9.0a6 does not start correctly: + + /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.23' not + found (required by /usr/local/lib/tor-browser/libxul.so) + + … while it should use its own copy of libstdc++.so.6. + +(cherry picked from commit 73fc84bc3cfffef710a5bd96aeff681a7db6c350) +--- + apparmor/torbrowser.Browser.firefox | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox +index c6d8a26..42516b6 100644 +--- a/apparmor/torbrowser.Browser.firefox ++++ b/apparmor/torbrowser.Browser.firefox +@@ -73,7 +73,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} { + owner @{torbrowser_home_dir}/TorBrowser/Tor/*.so.* mr, + + # parent Firefox process when restarting after upgrade, Web Content processes +- owner @{torbrowser_firefox_executable} ixmr -> torbrowser_firefox, ++ owner @{torbrowser_firefox_executable} pxmr -> torbrowser_firefox, + + /etc/mailcap r, + /etc/mime.types r, diff --git a/files/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch b/files/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch new file mode 100644 --- /dev/null +++ b/files/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch @@ -0,0 +1,21 @@ +From: intrigeri +Date: Thu, 7 Nov 2019 07:47:27 +0000 +Subject: AppArmor: allow running the Firefox updater from its new path + +(cherry picked from commit b8a13f96c22d668b5fb07da83e1b5ac399f471cb) +--- + apparmor/torbrowser.Browser.firefox | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox +index 42516b6..8d96043 100644 +--- a/apparmor/torbrowser.Browser.firefox ++++ b/apparmor/torbrowser.Browser.firefox +@@ -63,6 +63,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} { + owner @{torbrowser_home_dir}/firefox rix, + owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/* rw, + owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/{,MozUpdater/bgupdate/}updater ix, ++ owner @{torbrowser_home_dir}/updater ix, + owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/.parentwritetest rw, + owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profiles.ini r, + owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profile.default/{,**} rwk, diff --git a/files/series b/files/series new file mode 100644 --- /dev/null +++ b/files/series @@ -0,0 +1,3 @@ +0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch +0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch +0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : torbrowser-launcher version : 0.3.2 -release : 2 +release : 3 source : - https://github.com/micahflee/torbrowser-launcher/archive/v0.3.2.tar.gz : 25ad4b0c70579628bf18f4cdcd18ac303fe4f7f1c590cc48df2a87651c92991c license : BSD-1-Clause @@ -16,6 +16,8 @@ - python-requests - tor setup : | + %apply_patches + %python3_setup install : | %python3_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ torbrowser-launcher - Abdulkadir Furkan Şanlı - abdulkadirfsanli@protonmail.com + Pierre-Yves + pyu@riseup.net BSD-1-Clause network.web.browser @@ -51,12 +51,12 @@ - - 2019-07-26 + + 2019-12-10 0.3.2 Packaging update - Abdulkadir Furkan Şanlı - abdulkadirfsanli@protonmail.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file