[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/buster-backports] 8 commits: Rebuild as 0.3.2-12~bpo9+1 for stretch-backports-sloppy

Thu Sep 24 16:05:56 BST 2020


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


Commits:
872a3541 by Roger Shimizu at 2020-09-08T02:09:53+09:00
Rebuild as 0.3.2-12~bpo9+1 for stretch-backports-sloppy

- - - - -
baa521a8 by Roger Shimizu at 2020-09-11T00:26:39+09:00
Merge branch 'debian/buster-backports' into debian/stretch-backports-sloppy

- - - - -
bc136fcb by Roger Shimizu at 2020-09-11T00:27:14+09:00
Rebuild as 0.3.2-13~bpo9+1 for stretch-backports-sloppy

- - - - -
fa3115fb by Roger Shimizu at 2020-09-24T00:11:26+09:00
d/patches: Add patch 0031 to improve version string comparison

Closes: #970768

- - - - -
8d3547ec by Roger Shimizu at 2020-09-24T00:28:42+09:00
Prepare to release 0.3.2-14~exp1 to experimental

- - - - -
87859bce by Roger Shimizu at 2020-09-24T23:30:16+09:00
Prepare to release 0.3.2-14 to unstable

* debian/patches:
  - Cherry-pick patch 0032 to fix apparmor on libstdc++.
    Thanks to Robert Sacks for the report and patch.

Closes: #970799

- - - - -
61171098 by Roger Shimizu at 2020-09-24T23:47:47+09:00
Merge tag 'debian/0.3.2-14' into debian/buster-backports

- - - - -
685478a6 by Roger Shimizu at 2020-09-24T23:48:23+09:00
Rebuild as 0.3.2-14~bpo10+1 for buster-backports

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0031-Use-better-version-string-comparison.patch
- + debian/patches/0032-apparmor-allow-Browser-to-memory-map-libstdc.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,32 @@
+torbrowser-launcher (0.3.2-14~bpo10+1) buster-backports; urgency=medium
+
+  * Rebuild for buster-backports.
+
+ -- Roger Shimizu <rosh at debian.org>  Thu, 24 Sep 2020 23:48:23 +0900
+
+torbrowser-launcher (0.3.2-14) unstable; urgency=high
+
+  * Upload to unstable.
+  * debian/patches:
+    - Cherry-pick patch 0032 to fix apparmor on libstdc++.
+      Thanks to Robert Sacks for the report and patch (Closes: #970799).
+
+ -- Roger Shimizu <rosh at debian.org>  Thu, 24 Sep 2020 23:28:33 +0900
+
+torbrowser-launcher (0.3.2-14~exp1) experimental; urgency=high
+
+  * debian/patches:
+    - Add patch 0031 to improve version string comparison.
+      (Closes: #970768)
+
+ -- Roger Shimizu <rosh at debian.org>  Thu, 24 Sep 2020 00:28:42 +0900
+
+torbrowser-launcher (0.3.2-13~bpo9+1) stretch-backports-sloppy; urgency=medium
+
+  * Rebuild for stretch-backports-sloppy.
+
+ -- Roger Shimizu <rosh at debian.org>  Fri, 11 Sep 2020 00:27:13 +0900
+
 torbrowser-launcher (0.3.2-13~bpo10+1) buster-backports; urgency=medium
 
   * Rebuild for buster-backports.
@@ -15,6 +44,12 @@ torbrowser-launcher (0.3.2-13) unstable; urgency=medium
 
  -- Roger Shimizu <rosh at debian.org>  Wed, 09 Sep 2020 02:04:53 +0900
 
+torbrowser-launcher (0.3.2-12~bpo9+1) stretch-backports-sloppy; urgency=medium
+
+  * Rebuild for stretch-backports-sloppy.
+
+ -- Roger Shimizu <rosh at debian.org>  Tue, 08 Sep 2020 02:09:53 +0900
+
 torbrowser-launcher (0.3.2-12~bpo10+1) buster-backports; urgency=medium
 
   * Rebuild for buster-backports.


=====================================
debian/patches/0031-Use-better-version-string-comparison.patch
=====================================
@@ -0,0 +1,35 @@
+From: Robert Sacks <robert at rmsacks.com>
+Date: Wed, 23 Sep 2020 00:42:50 -0400
+Subject: Use better version string comparison
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/499
+
+Currently, this function compares raw version strings such as "7.5.2"
+and "9.6" to find the newer version. This worked fine until Tor Browser
+version 10 was released and "10.0" is no longer considered larger than
+"7.5.2" by this function. This commit changes the function to split the
+raw strings on periods and compares the corresponding tuples, such as
+(7, 5, 2) and (10, 0). While this does not cover all edge cases, it
+should work better for these purposes. It is also simple and avoids
+adding an extra dependency compared to other options.
+
+Closes: #970768
+---
+ torbrowser_launcher/launcher.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
+index efcd1c8..715ef20 100644
+--- a/torbrowser_launcher/launcher.py
++++ b/torbrowser_launcher/launcher.py
+@@ -417,7 +417,10 @@ class Launcher(QtWidgets.QMainWindow):
+                 installed_version = line.split()[2].decode()
+                 break
+ 
+-        if self.min_version <= installed_version:
++        def version_tuple(v):
++            return tuple(map(int, v.split(".")))
++
++        if version_tuple(self.min_version) <= version_tuple(installed_version):
+             return True
+ 
+         return False


=====================================
debian/patches/0032-apparmor-allow-Browser-to-memory-map-libstdc.patch
=====================================
@@ -0,0 +1,25 @@
+From: Robert Sacks <robert at rmsacks.com>
+Date: Wed, 23 Sep 2020 13:10:35 -0400
+Subject: apparmor: allow Browser to memory map libstdc++
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/503
+
+Fixes #502
+
+(cherry picked from commit e9816035a8d3d55be012c34d70bd84e1ad42fc62)
+---
+ apparmor/torbrowser.Browser.firefox | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index 4363cdf..57c0359 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -73,6 +73,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+   owner @{torbrowser_home_dir}/TorBrowser/Tor/ r,
+   owner @{torbrowser_home_dir}/TorBrowser/Tor/*.so mr,
+   owner @{torbrowser_home_dir}/TorBrowser/Tor/*.so.* mr,
++  owner @{torbrowser_home_dir}/TorBrowser/Tor/libstdc++/*.so mr,
++  owner @{torbrowser_home_dir}/TorBrowser/Tor/libstdc++/*.so.* mr,
+ 
+   # parent Firefox process when restarting after upgrade, Web Content processes
+   owner @{torbrowser_firefox_executable} pxmr -> torbrowser_firefox,


=====================================
debian/patches/series
=====================================
@@ -28,3 +28,5 @@
 0028-Update-Tor-Browser-Developers-public-key-481.patch
 0029-AppArmor-silence-sys_admin-capability.patch
 0030-Use-gpg-instead-of-gpg2.patch
+0031-Use-better-version-string-comparison.patch
+0032-apparmor-allow-Browser-to-memory-map-libstdc.patch



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/7ed9fca06bf8ee50b2713d5c99c1590ce26a4b73...685478a6231b40a449f8485f56bb968bcaee565c

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/7ed9fca06bf8ee50b2713d5c99c1590ce26a4b73...685478a6231b40a449f8485f56bb968bcaee565c
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/20200924/5d94756d/attachment-0001.html>
