Hello community,
here is the log from the commit of package torbrowser-launcher for
openSUSE:Factory checked in at 2020-09-25 16:34:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/torbrowser-launcher (Old)
and /work/SRC/openSUSE:Factory/.torbrowser-launcher.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "torbrowser-launcher"
Fri Sep 25 16:34:32 2020 rev:15 rq:836465 version:0.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/torbrowser-launcher/torbrowser-launcher.changes
2020-03-12 23:11:48.707312212 +0100
+++
/work/SRC/openSUSE:Factory/.torbrowser-launcher.new.4249/torbrowser-launcher.changes
2020-09-25 16:35:43.832113836 +0200
@@ -1,0 +2,13 @@
+Wed Sep 23 19:59:57 UTC 2020 - Atri Bhattacharya <[email protected]>
+
+- Add new key from upstream tor-browser as source and overwrite
+ bundled key in tarball with this
+ (gh#micahflee/torbrowser-launcher#481).
+- Add torbrowser-launcher-version-check-fix.patch: Fix version
+ checking with torbrowser 10.0+; patch taken from upstream PR
+ (not yet merged) [gh#micahflee/torbrowser-launcher#499].
+- Add further fixes to torbrowser-launcher-apparmor-fixes.patch
+ to enable bundled libstdc++ to be mapped; fixes taken from
+ pending upstream PR (gh#micahflee/torbrowser-launcher#503).
+
+-------------------------------------------------------------------
New:
----
tor-browser-developers.asc
torbrowser-launcher-version-check-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ torbrowser-launcher.spec ++++++
--- /var/tmp/diff_new_pack.HxGl6w/_old 2020-09-25 16:35:44.828114720 +0200
+++ /var/tmp/diff_new_pack.HxGl6w/_new 2020-09-25 16:35:44.832114724 +0200
@@ -23,11 +23,15 @@
License: MIT
Group: Productivity/Networking/Web/Utilities
URL: https://github.com/micahflee/torbrowser-launcher
-Source: https://github.com/micahflee/%{name}/archive/v%{version}.tar.gz
+Source0: https://github.com/micahflee/%{name}/archive/v%{version}.tar.gz
+# From gh#micahflee/torbrowser_launcher#482 (SHA512:
aea340451291ce5b0fd87fb2f399a57d1407c5f81ee2e01d389e5586eb9b83cf77e48bbdfe8a71043d834b2475a67f43fd0f398d788f3a41a7a007d77d29dcab)
+Source1: tor-browser-developers.asc
# PATCH-FEATURE-OPENSUSE pythontorbrowser-launcher-fix-distro-name.patch
[email protected] -- Use the correct distribution name (the setup.py code
gives "SuSE" instead of "openSUSE")
Patch0: torbrowser-launcher-fix-distro-name.patch
# PATCH-FIX-UPSTREAM torbrowser-launcher-apparmor-fixes.patch
gh#micahflee/torbrowser-launcher#443 boo#1162284 [email protected] -- Fix
apparmor file so that it doesn't hinder actually running the browser, patch
taken from upstream commits
Patch1: torbrowser-launcher-apparmor-fixes.patch
+# PATCH-FIX-UPSTREAM torbrowser-launcher-version-check-fix.patch
gh#micahflee/torbrowser-launcher#499 [email protected] -- Fix version
checking with torbrowser 10.0+; patch taken from upstream PR (not yet merged)
+Patch2: torbrowser-launcher-version-check-fix.patch
BuildRequires: apparmor-abstractions
BuildRequires: gpg2
BuildRequires: python3-PySocks
@@ -78,14 +82,17 @@
%lang_package
%prep
%autosetup -p1
+cp %{SOURCE1} share/torbrowser-launcher/
%build
python3 setup.py build
%install
python3 setup.py install --skip-build --root %{buildroot}
+
%suse_update_desktop_file
%{buildroot}%{_datadir}/applications/torbrowser.desktop
%suse_update_desktop_file
%{buildroot}%{_datadir}/applications/torbrowser-settings.desktop
+
%find_lang %{name} %{?no_lang_C}
# REMOVE USELESS TOPLEVEL .mo FILE
++++++ torbrowser-launcher-apparmor-fixes.patch ++++++
--- /var/tmp/diff_new_pack.HxGl6w/_old 2020-09-25 16:35:44.864114752 +0200
+++ /var/tmp/diff_new_pack.HxGl6w/_new 2020-09-25 16:35:44.864114752 +0200
@@ -1,8 +1,8 @@
-diff --git a/apparmor/torbrowser.Browser.firefox
b/apparmor/torbrowser.Browser.firefox
-index f782f35..1266476 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -63,6 +63,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+Index: torbrowser-launcher-0.3.2/apparmor/torbrowser.Browser.firefox
+===================================================================
+--- torbrowser-launcher-0.3.2.orig/apparmor/torbrowser.Browser.firefox
++++ torbrowser-launcher-0.3.2/apparmor/torbrowser.Browser.firefox
+@@ -63,6 +63,7 @@ profile torbrowser_firefox @{torbrowser_
owner @{torbrowser_home_dir}/firefox rix,
owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/* rw,
owner
@{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/{,MozUpdater/bgupdate/}updater
ix,
@@ -10,8 +10,12 @@
owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/.parentwritetest rw,
owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profiles.ini r,
owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profile.default/{,**}
rwk,
-@@ -73,7 +74,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -71,9 +72,11 @@ profile torbrowser_firefox @{torbrowser_
+ 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} ixmr -> torbrowser_firefox,
@@ -19,7 +23,7 @@
/etc/mailcap r,
/etc/mime.types r,
-@@ -105,6 +106,7 @@ profile torbrowser_firefox
@{torbrowser_firefox_executable} {
+@@ -105,6 +108,7 @@ profile torbrowser_firefox @{torbrowser_
# Required for multiprocess Firefox (aka Electrolysis, i.e. e10s)
owner /{dev,run}/shm/org.chromium.* rw,
@@ -27,4 +31,3 @@
# Deny access to DRM nodes, that's granted by the X abstraction, which is
# sourced by the gnome abstraction, that we include.
-
++++++ torbrowser-launcher-version-check-fix.patch ++++++
>From 070a5f40af7c93d39bddfc5aa382469ce97dfd5b Mon Sep 17 00:00:00 2001
From: Robert Sacks <[email protected]>
Date: Wed, 23 Sep 2020 00:42:50 -0400
Subject: [PATCH] Use better version string comparison
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.
Fixes #498
---
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 @@ def check_min_version(self):
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
