[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 4 commits: d/patches: Refresh patches and amend 0017 patch to add more description

[Roger Shimizu]

Roger Shimizu pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher


Commits:
bb60c727 by Roger Shimizu at 2020-04-18T16:47:10+09:00
d/patches: Refresh patches and amend 0017 patch to add more description

Thanks to intrigeri's review and help.

Closes: #913104

- - - - -
d3518348 by Roger Shimizu at 2020-04-18T16:53:22+09:00
d/rules: Minor fix for FTBFS on ubuntu

Closes: #958063

- - - - -
30f4b7ab by Roger Shimizu at 2020-04-18T17:33:13+09:00
d/control: Bump debhelper and policy version

Also remove debian/compat accordingly.

- - - - -
559b13b7 by Roger Shimizu at 2020-04-18T17:38:14+09:00
Prepare to release 0.3.2-9

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/patches/0016-AppArmor-allow-u2f-devices.patch
- debian/patches/0017-Silence-the-deny-apparmor-log-from-lsb_release.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+torbrowser-launcher (0.3.2-9) unstable; urgency=medium
+
+  * debian/patches:
+    - Refresh patches.
+    - Amend 0017 patch to add more description.
+      Thanks to intrigeri's review and help. (Closes: #913104)
+  * debian/rules:
+    - Minor fix for FTBFS on ubuntu. (Closes: #958063)
+  * debian/control:
+    - Bump debhelper version to 12.
+    - Bump policy version to 4.5.0
+  * Remove debian/compat.
+
+ -- Roger Shimizu <rosh at debian.org>  Sat, 18 Apr 2020 17:38:14 +0900
+
 torbrowser-launcher (0.3.2-8) unstable; urgency=medium
 
   * debian/rules:


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Roger Shimizu <rosh at debian.org>
 Section: contrib/web
 Priority: optional
 Build-Depends:
- debhelper (>= 9.20120909~),
+ debhelper-compat (= 12),
  dh-apparmor,
  dh-python,
  help2man,
@@ -14,7 +14,7 @@ Build-Depends:
  python3-gpg,
  python3-pyqt5,
  python3-requests
-Standards-Version: 3.9.8
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://micahflee.com/torbrowser-launcher/
 Vcs-Git: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher.git


=====================================
debian/patches/0016-AppArmor-allow-u2f-devices.patch
=====================================
@@ -8,10 +8,10 @@ Subject: [PATCH] Allow torbrowser to access u2f devices
  1 file changed, 9 insertions(+)
 
 diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 42516b6..c067375 100644
+index 8d96043..1266476 100644
 --- a/apparmor/torbrowser.Browser.firefox
 +++ b/apparmor/torbrowser.Browser.firefox
-@@ -133,5 +133,14 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -134,5 +134,14 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
    /etc/xfce4/defaults.list r,
    /usr/share/xfce4/applications/ r,
  


=====================================
debian/patches/0017-Silence-the-deny-apparmor-log-from-lsb_release.patch
=====================================
@@ -4,15 +4,19 @@ Subject: Silence the deny apparmor log from lsb_release
 
 This resolves debian bug: https://bugs.debian.org/913104
 
-(cherry picked from commit c08280a8bd7cb0bd548a38acd9326e8647d00db8)
+lsb_release is only used by Firefox to add extra information to crash reports,
+and Tor Browser is built with --disable-crashreporter.
+
+Therefore, AppArmor denying execution of lsb_release should be a no-op,
+and we can silence the corresponding log message.
 ---
  apparmor/torbrowser.Browser.firefox | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git apparmor/torbrowser.Browser.firefox apparmor/torbrowser.Browser.firefox
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
 index 1266476..e7ebddc 100644
---- apparmor/torbrowser.Browser.firefox
-+++ apparmor/torbrowser.Browser.firefox
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
 @@ -122,6 +122,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
    deny /sys/devices/system/cpu/cpufreq/policy[0-9]*/cpuinfo_max_freq r,
    deny /sys/devices/system/cpu/*/cache/index[0-9]*/size r,


=====================================
debian/rules
=====================================
@@ -7,7 +7,7 @@ include /usr/share/dpkg/pkg-info.mk
 
 override_dh_auto_install:
 	dh_auto_install
-	rm -r debian/*/etc/apparmor.d/local
+	rm -rf debian/*/etc/apparmor.d/local
 
 override_dh_install:
 	for PROFILE in torbrowser.Tor.tor torbrowser.Browser.firefox ; do \



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/445bb485c6822161121c7e1c7229d8d5ad1ff149...559b13b7972878b7c33e223b1b218035eaa5afd0

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/445bb485c6822161121c7e1c7229d8d5ad1ff149...559b13b7972878b7c33e223b1b218035eaa5afd0
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/20200418/e50f91ad/attachment-0001.html>