[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 3 commits: d/patches: Prefer upstream patch than local one
Roger Shimizu (@rosh)
rosh at debian.org
Tue May 25 17:35:17 BST 2021
Roger Shimizu pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher
Commits:
c568a302 by Roger Shimizu at 2021-05-26T01:14:18+09:00
d/patches: Prefer upstream patch than local one
Add patch 15 which cherry-picked from upstream for apparmor rule.
- - - - -
9f6250c3 by Roger Shimizu at 2021-05-26T01:17:26+09:00
d/patches: Add patch 16 to update available languages for torbrowser
- - - - -
297a3b8c by Roger Shimizu at 2021-05-26T01:19:31+09:00
Prepare to release 0.3.3-6
- - - - -
7 changed files:
- debian/changelog
- debian/patches/11-Update-apparmor-profile.patch
- debian/patches/13-AppArmor-include-vulkan-abstraction-if-it-s-available.patch
- debian/patches/14-AppArmor-allow-access-needed-for-Firefox-sandboxing-vi.patch
- + debian/patches/15-AppArmor-Allow-reading-sys-fs-cgroup-cpu-cpuacct-cpu.c.patch
- + debian/patches/16-Update-available-languages-for-torbrowser.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+torbrowser-launcher (0.3.3-6) unstable; urgency=medium
+
+ * debian/patches:
+ - Prefer upstream patch than local one, so add patch 15 which
+ cherry-picked from upstream for apparmor rule.
+ - Add patch 16 to update available languages for torbrowser.
+
+ -- Roger Shimizu <rosh at debian.org> Wed, 26 May 2021 01:19:30 +0900
+
torbrowser-launcher (0.3.3-5) unstable; urgency=medium
* debian/patches:
=====================================
debian/patches/11-Update-apparmor-profile.patch
=====================================
@@ -3,12 +3,12 @@ Date: Sun, 25 Apr 2021 22:51:12 +0900
Subject: Update apparmor profile
---
- apparmor/torbrowser.Browser.firefox | 2 ++
+ apparmor/torbrowser.Browser.firefox | 1 +
apparmor/torbrowser.Tor.tor | 1 +
- 2 files changed, 3 insertions(+)
+ 2 files changed, 2 insertions(+)
diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index a95d6e7..38a0df0 100644
+index a95d6e7..df34629 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
@@ -92,6 +92,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
@@ -19,14 +19,6 @@ index a95d6e7..38a0df0 100644
# Distribution homepage
/usr/share/homepage/ r,
-@@ -101,6 +102,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- /sys/devices/system/cpu/present r,
- /sys/devices/system/node/ r,
- /sys/devices/system/node/node[0-9]*/meminfo r,
-+ /sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us r,
- /sys/fs/cgroup/cpu,cpuacct/user.slice/cpu.cfs_quota_us r,
- deny /sys/devices/virtual/block/*/uevent r,
-
diff --git a/apparmor/torbrowser.Tor.tor b/apparmor/torbrowser.Tor.tor
index f5b8177..e455ce9 100644
--- a/apparmor/torbrowser.Tor.tor
=====================================
debian/patches/13-AppArmor-include-vulkan-abstraction-if-it-s-available.patch
=====================================
@@ -14,7 +14,7 @@ closes #554
1 file changed, 1 insertion(+)
diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 38a0df0..96f88e3 100644
+index df34629..98d8672 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
@@ -7,6 +7,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
=====================================
debian/patches/14-AppArmor-allow-access-needed-for-Firefox-sandboxing-vi.patch
=====================================
@@ -14,10 +14,10 @@ Firefox to use it.
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 96f88e3..60e2067 100644
+index 98d8672..d0d59f8 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
-@@ -132,7 +132,6 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -131,7 +131,6 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
deny /sys/devices/system/cpu/*/cache/index[0-9]*/size r,
deny /run/user/[0-9]*/dconf/user rw,
deny /usr/bin/lsb_release x,
@@ -25,7 +25,7 @@ index 96f88e3..60e2067 100644
# Silence denial logs about PulseAudio
deny /etc/pulse/client.conf r,
-@@ -154,5 +153,11 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -153,5 +152,11 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
# Yubikey NEO also needs this:
/sys/devices/**/hidraw/hidraw*/uevent r,
=====================================
debian/patches/15-AppArmor-Allow-reading-sys-fs-cgroup-cpu-cpuacct-cpu.c.patch
=====================================
@@ -0,0 +1,25 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Sat, 22 May 2021 19:21:52 +0000
+Subject: AppArmor: Allow reading /sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us
+
+Roger Shimizu told us it's needed on Debian Buster.
+I suppose the "user.slice" path component is not used there.
+
+(cherry picked from commit 811494c6cf0cc0a7a96e647ba0f022f4d03713be)
+---
+ 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 d0d59f8..e682d07 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -103,7 +103,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+ /sys/devices/system/cpu/present r,
+ /sys/devices/system/node/ r,
+ /sys/devices/system/node/node[0-9]*/meminfo r,
+- /sys/fs/cgroup/cpu,cpuacct/user.slice/cpu.cfs_quota_us r,
++ /sys/fs/cgroup/cpu,cpuacct/{,user.slice/}cpu.cfs_quota_us r,
+ deny /sys/devices/virtual/block/*/uevent r,
+
+ # Should use abstractions/gstreamer instead once merged upstream
=====================================
debian/patches/16-Update-available-languages-for-torbrowser.patch
=====================================
@@ -0,0 +1,51 @@
+From: Leonidas P <29687487+JpegXguy at users.noreply.github.com>
+Date: Wed, 31 Mar 2021 16:24:29 +0300
+Subject: Update available languages for torbrowser
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/555
+
+(cherry picked from commit b8a519eb71c2cc27b36e37f4084afa856b29ed27)
+---
+ torbrowser_launcher/common.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
+index fb8ad50..ce27fee 100644
+--- a/torbrowser_launcher/common.py
++++ b/torbrowser_launcher/common.py
+@@ -78,25 +78,36 @@ class Common(object):
+ available_languages = [
+ "ar",
+ "ca",
++ "cs",
+ "da",
+ "de",
++ "el",
+ "en-US",
++ "es-AR",
+ "es-ES",
+ "fa",
+ "fr",
+ "ga-IE",
+ "he",
++ "hu",
+ "id",
+ "is",
+ "it",
+ "ja",
++ "ka",
+ "ko",
++ "lt",
++ "mk",
++ "ms",
++ "my",
+ "nb-NO",
+ "nl",
+ "pl",
+ "pt-BR",
++ "ro",
+ "ru",
+ "sv-SE",
++ "th",
+ "tr",
+ "vi",
+ "zh-CN",
=====================================
debian/patches/series
=====================================
@@ -24,3 +24,5 @@ po/12-Add-Czech-translation-to-desktop-files.patch
12-Fix-small-typo-in-desktop-file.patch
13-AppArmor-include-vulkan-abstraction-if-it-s-available.patch
14-AppArmor-allow-access-needed-for-Firefox-sandboxing-vi.patch
+15-AppArmor-Allow-reading-sys-fs-cgroup-cpu-cpuacct-cpu.c.patch
+16-Update-available-languages-for-torbrowser.patch
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/7285dddb49140099fcad68678573c8763f7ae37a...297a3b8cb8be2cb343111b77f4936e6b78f06045
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/7285dddb49140099fcad68678573c8763f7ae37a...297a3b8cb8be2cb343111b77f4936e6b78f06045
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20210525/24286d3d/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list