diff -Nru torbrowser-launcher-0.3.2/debian/changelog torbrowser-launcher-0.3.2/debian/changelog --- torbrowser-launcher-0.3.2/debian/changelog 2020-09-08 17:04:53.000000000 +0000 +++ torbrowser-launcher-0.3.2/debian/changelog 2020-09-24 14:28:33.000000000 +0000 @@ -1,3 +1,20 @@ +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 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 Thu, 24 Sep 2020 00:28:42 +0900 + torbrowser-launcher (0.3.2-13) unstable; urgency=medium * debian/patches: diff -Nru torbrowser-launcher-0.3.2/debian/patches/0031-Use-better-version-string-comparison.patch torbrowser-launcher-0.3.2/debian/patches/0031-Use-better-version-string-comparison.patch --- torbrowser-launcher-0.3.2/debian/patches/0031-Use-better-version-string-comparison.patch 1970-01-01 00:00:00.000000000 +0000 +++ torbrowser-launcher-0.3.2/debian/patches/0031-Use-better-version-string-comparison.patch 2020-09-24 14:28:33.000000000 +0000 @@ -0,0 +1,35 @@ +From: Robert Sacks +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 diff -Nru torbrowser-launcher-0.3.2/debian/patches/0032-apparmor-allow-Browser-to-memory-map-libstdc.patch torbrowser-launcher-0.3.2/debian/patches/0032-apparmor-allow-Browser-to-memory-map-libstdc.patch --- torbrowser-launcher-0.3.2/debian/patches/0032-apparmor-allow-Browser-to-memory-map-libstdc.patch 1970-01-01 00:00:00.000000000 +0000 +++ torbrowser-launcher-0.3.2/debian/patches/0032-apparmor-allow-Browser-to-memory-map-libstdc.patch 2020-09-24 14:28:33.000000000 +0000 @@ -0,0 +1,25 @@ +From: Robert Sacks +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, diff -Nru torbrowser-launcher-0.3.2/debian/patches/series torbrowser-launcher-0.3.2/debian/patches/series --- torbrowser-launcher-0.3.2/debian/patches/series 2020-09-08 17:04:53.000000000 +0000 +++ torbrowser-launcher-0.3.2/debian/patches/series 2020-09-24 14:28:33.000000000 +0000 @@ -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