[Pkg-privacy-commits] [torbrowser-launcher] 02/03: d/patches: Add patch of apparmor config

[Roger Shimizu]

This is an automated email from the git hooks/post-receive script.

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit fa0e9949d6fa407e957b843d0cf4c353b098358a
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Fri Sep 29 23:03:35 2017 +0900

    d/patches: Add patch of apparmor config
    
    patch to allow the tor process to modify its data directory.
    
    Originally reported by Chris Lamb #876484.
    Kudos to intrigeri for the patch.
---
 debian/changelog                                   |  3 +++
 ...low-the-tor-process-to-modify-its-data-di.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3a31ea8..4c44b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ torbrowser-launcher (0.2.8-3) UNRELEASED; urgency=medium
   * Team upload.
   * debian/patches:
     - Add patch to update mirror list.
+    - Add patch of apparmor config to allow the tor process to modify
+      its data directory. Originally reported by Chris Lamb #876484.
+      Kudos to intrigeri for the patch.
 
  -- Roger Shimizu <rogershimizu at gmail.com>  Sun, 24 Sep 2017 11:57:53 +0900
 
diff --git a/debian/patches/0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch b/debian/patches/0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch
new file mode 100644
index 0000000..9f63230
--- /dev/null
+++ b/debian/patches/0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch
@@ -0,0 +1,28 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Sun, 24 Sep 2017 05:33:35 +0000
+Subject: AppArmor: allow the tor process to modify its data directory.
+Forwarded: https://github.com/micahflee/torbrowser-launcher/pull/290
+
+It's unclear to me why this is not needed _all the time_, but it does make sense
+that at least in some circumstances, it needs to do that, e.g. to create
+that directory.
+
+Originally reported by Chris Lamb <lamby at debian.org> on
+https://bugs.debian.org/876484.
+---
+ apparmor/torbrowser.Tor.tor | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apparmor/torbrowser.Tor.tor b/apparmor/torbrowser.Tor.tor
+index 013f458..2410637 100644
+--- a/apparmor/torbrowser.Tor.tor
++++ b/apparmor/torbrowser.Tor.tor
+@@ -11,7 +11,7 @@
+   /etc/passwd r,
+   /etc/resolv.conf r,
+   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Tor/tor mr,
+-  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/ r,
++  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/ rw,
+   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/* rw,
+   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/lock rwk,
+   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/Tor,Lib}/*.so mr,
diff --git a/debian/patches/series b/debian/patches/series
index 76c7027..ba90726 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-AppArmor-support-sysvinit-systems.patch
 0002-Update-mirror-list.patch
+0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git