[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 30 commits: AppArmor: support Wayland display protocol
Roger Shimizu (@rosh)
rosh at debian.org
Sun Jan 15 22:41:11 GMT 2023
Roger Shimizu pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher
Commits:
a4bc9789 by travankor at 2021-07-09T21:03:34-07:00
AppArmor: support Wayland display protocol
When the environment variable MOZ_ENABLE_WAYLAND is set,
Firefox will try to use Wayland IPC sockets.
Closes #591
- - - - -
508640ff by Jerome Charaoui at 2021-08-09T13:54:25-04:00
Fix U2F for Yubikey 5 tokens
- - - - -
b3f021ce by intrigeri at 2021-08-10T17:13:28+00:00
Merge pull request #594 from jcharaoui/develop
Fix U2F for Yubikey 5 tokens
- - - - -
d44475f0 by intrigeri at 2021-08-10T17:15:47+00:00
Merge pull request #593 from travankor/wayland
AppArmor: support Wayland display protocol
- - - - -
adb51f69 by a1346054 at 2021-09-13T16:58:02+00:00
Fix shellcheck warnings
- - - - -
c0f8f82a by a1346054 at 2021-09-13T16:58:02+00:00
Fix spelling
- - - - -
7af35f44 by intrigeri at 2021-10-26T09:03:57+00:00
AppArmor: allow Firefox to enumerate GPUs and use graphics acceleration
Modern web browsers and contents need graphics acceleration more and more..
GNU/Linux systems are moving to Wayland, where one cannot rely on X.Org driver
acceleration anymore, and everything instead happens in the kernel, libdrm,
and Mesa.
- - - - -
4b9d49c1 by intrigeri at 2021-10-26T09:04:09+00:00
AppArmor: silence a denial for access we don't need
Firefox 91 only uses /etc/os-release to tweak the system's fonts list
depending on the distribution. Tor Browser does not use the system's font,
so that's not relevant.
- - - - -
059bba8f by O7zSO31IVg at 2022-03-11T10:56:55+07:00
Update LICENSE
- - - - -
2cb933ba by Oğuz Ersen at 2022-03-27T18:58:59+03:00
Add Turkish translation
- - - - -
89dcde65 by MrRawes at 2022-05-12T17:57:20+01:00
Allow github to recognize the License
SPDX-License-Identifier: MIT
https://choosealicense.com/licenses/mit/
- - - - -
f49d36a4 by intrigeri at 2022-10-28T06:11:22+00:00
AppArmor: allow reading /proc/PID/{statm,smaps}
This is now needed at least for Firefox' memory reporter:
https://bugzilla.mozilla.org/show_bug.cgi?id=1647957
- - - - -
006f498b by Sergey Popov at 2022-12-08T12:39:41+02:00
Make code language-agnostic
since TBB provides now a single multi-lingual distribution
- - - - -
8c69da13 by Micah Lee at 2022-12-12T18:11:45-08:00
Pass integers into gui.move()
- - - - -
c8c39cea by Micah Lee at 2022-12-12T18:12:49-08:00
Update min_version to 12.0, because this is the current version of Tor Browser
- - - - -
398badbc by Micah Lee at 2022-12-12T18:14:27-08:00
Format with black
- - - - -
7cbc6c9d by Micah Lee at 2022-12-12T18:25:16-08:00
Rename old tor-browser folder with a locale, if it exists
- - - - -
d288c576 by Micah Lee at 2022-12-12T18:30:03-08:00
Merge pull request #638 from MrRawes/patch-1
Allow github to recognize the License
- - - - -
acd8246d by Micah Lee at 2022-12-12T18:30:48-08:00
Merge branch 'develop' into develop
- - - - -
9157f909 by Micah Lee at 2022-12-12T18:31:59-08:00
Merge pull request #630 from arfshl/develop
Update Copyright to 2022
- - - - -
41a5d75a by Micah Lee at 2022-12-12T18:32:40-08:00
Merge pull request #612 from ersen0/po-tr
Add Turkish translation
- - - - -
79c19e60 by Micah Lee at 2022-12-12T18:34:00-08:00
Merge pull request #598 from a1346054/develop
Minor cleanup
- - - - -
501d0d8c by Micah Lee at 2022-12-12T18:38:07-08:00
Version bump to 0.3.6 and update changelog
- - - - -
c315e3c4 by Micah Lee at 2022-12-12T18:38:28-08:00
Merge branch 'develop' of github.com:micahflee/torbrowser-launcher into develop
- - - - -
52f7be32 by Micah Lee at 2022-12-13T18:14:33-08:00
Version bump in AppStream metadata
- - - - -
7472ff6b by Micah Lee at 2022-12-13T18:19:17-08:00
Return early in torbrowser_12_rename_old_tbb() if the TBB path does not exist yet
- - - - -
857e6481 by Roger Shimizu at 2023-01-14T22:45:42-08:00
Update upstream source from tag 'v0.3.6'
Update to upstream version '0.3.6'
with Debian dir 37dd2dc44b55b87729a46a5e3c5471cef5d9b71c
- - - - -
c5b7f210 by Roger Shimizu at 2023-01-14T22:45:55-08:00
d/patches: Remove upstreamed patches and refresh patches
- - - - -
280d5122 by Roger Shimizu at 2023-01-14T23:33:18-08:00
Prepare to release 0.3.6-1~exp1 to experimental
- - - - -
50f3410c by Roger Shimizu at 2023-01-15T14:39:03-08:00
Merge remote-tracking branch 'origin/debian/sid' into debian/sid
- - - - -
29 changed files:
- CHANGELOG.md
- LICENSE
- apparmor/torbrowser.Browser.firefox
- build_deb.sh
- build_rpm.sh
- debian/changelog
- debian/patches/01-show-gui-only-if-tbb-not-installed.patch
- − debian/patches/02-remove-double-common-assignment.patch
- − debian/patches/04-Fix-use-case-that-enforce-install-of-EN-version-on-n.patch
- debian/patches/05-fix-failure-in-detect-installed-torbrowser.patch
- − debian/patches/07-Fix-U2F-for-Yubikey-5-tokens.patch
- − debian/patches/08-AppArmor-support-Wayland-display-protocol.patch
- debian/patches/09-Remove-extra-override-for-X11-sockets.patch
- − debian/patches/10-AppArmor-allow-Firefox-to-enumerate-GPUs-and-use-graph.patch
- − debian/patches/11-AppArmor-silence-a-denial-for-access-we-don-t-need.patch
- debian/patches/12-Fix-strict-parameters-for-gui.move.patch
- debian/patches/series
- + po/tr.po
- ppa_release.sh
- security_design.md
- setup.py
- share/applications/torbrowser-settings.desktop
- share/applications/torbrowser.desktop
- share/metainfo/torbrowser.appdata.xml
- share/torbrowser-launcher/version
- torbrowser_launcher/__init__.py
- torbrowser_launcher/common.py
- torbrowser_launcher/launcher.py
- torbrowser_launcher/settings.py
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,9 @@
# Tor Browser Launcher Changelog
+## 0.3.6
+
+* Tor Browser 12.0 no longer uses locales, so the download URL and local path have changed
+
## 0.3.5
* Fix refreshing Tor Browser signing key in Flatpak package
=====================================
LICENSE
=====================================
@@ -1,7 +1,4 @@
-Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
-
-Copyright (c) 2013-2021 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2022 Micah Lee <micah at micahflee.com>
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
=====================================
apparmor/torbrowser.Browser.firefox
=====================================
@@ -5,8 +5,11 @@
profile torbrowser_firefox @{torbrowser_firefox_executable} {
#include <abstractions/audio>
+ #include <abstractions/dri-enumerate>
#include <abstractions/gnome>
#include <abstractions/ibus>
+ #include <abstractions/mesa>
+ #include <abstractions/opencl>
#include if exists <abstractions/vulkan>
# Uncomment the following lines if you want to give the Tor Browser read-write
@@ -27,6 +30,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
deny /etc/host.conf r,
deny /etc/hosts r,
deny /etc/nsswitch.conf r,
+ deny /etc/os-release r,
deny /etc/resolv.conf r,
deny /etc/passwd r,
deny /etc/group r,
@@ -42,7 +46,9 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
owner @{PROC}/@{pid}/environ r,
owner @{PROC}/@{pid}/fd/ r,
owner @{PROC}/@{pid}/mountinfo r,
+ owner @{PROC}/@{pid}/smaps r,
owner @{PROC}/@{pid}/stat r,
+ owner @{PROC}/@{pid}/statm r,
owner @{PROC}/@{pid}/status r,
owner @{PROC}/@{pid}/task/*/stat r,
@{PROC}/sys/kernel/random/uuid r,
@@ -98,6 +104,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
/usr/share/homepage/ r,
/usr/share/homepage/** r,
+ /sys/bus/pci/devices/ r,
+ @{sys}/devices/pci[0-9]*/**/irq r,
/sys/devices/system/cpu/ r,
/sys/devices/system/cpu/present r,
/sys/devices/system/node/ r,
@@ -115,12 +123,10 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
owner /{dev,run}/shm/org.chromium.* rw,
owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC
- # Deny access to DRM nodes, that's granted by the X abstraction, which is
- # sourced by the gnome abstraction, that we include.
- deny /dev/dri/** rwklx,
+ # Required for Wayland display protocol support
+ owner /dev/shm/wayland.mozilla.ipc.[0-9]* rw,
# Silence denial logs about permissions we don't need
- deny /dev/dri/ rwklx,
deny @{HOME}/.cache/fontconfig/ rw,
deny @{HOME}/.cache/fontconfig/** rw,
deny @{HOME}/.config/gtk-2.0/ rw,
@@ -146,7 +152,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
/sys/class/ r,
/sys/bus/ r,
/sys/class/hidraw/ r,
- /run/udev/data/c24{7,9}:* r,
+ /run/udev/data/c24{5,7,9}:* r,
/dev/hidraw* rw,
# Yubikey NEO also needs this:
/sys/devices/**/hidraw/hidraw*/uevent r,
@@ -157,5 +163,10 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
owner @{PROC}/@{pid}/{gid,uid}_map w,
owner @{PROC}/@{pid}/setgroups w,
+ # Remove these rules once we can assume abstractions/vulkan is recent enough
+ # to include them
+ /etc/glvnd/egl_vendor.d/{*,.json} r,
+ /usr/share/glvnd/egl_vendor.d/{,*.json} r,
+
#include <local/torbrowser.Browser.firefox>
}
=====================================
build_deb.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/sh
-VERSION=`cat share/torbrowser-launcher/version`
+VERSION=$(cat share/torbrowser-launcher/version)
# clean up from last build
rm -r build deb_dist
=====================================
build_rpm.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/sh
-VERSION=`cat share/torbrowser-launcher/version`
+VERSION=$(cat share/torbrowser-launcher/version)
# clean up from last build
rm -r build dist
=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-torbrowser-launcher (0.3.5-4) UNRELEASED; urgency=medium
+torbrowser-launcher (0.3.6-1) UNRELEASED; urgency=medium
+ * Upload to unstable.
* Remove 2 obsolete maintscript entries in 1 files.
* Bump debhelper from old 12 to 13.
* Update renamed lintian tag names in lintian overrides.
@@ -7,6 +8,15 @@ torbrowser-launcher (0.3.5-4) UNRELEASED; urgency=medium
-- Debian Janitor <janitor at jelmer.uk> Fri, 18 Nov 2022 19:30:08 -0000
+torbrowser-launcher (0.3.6-1~exp1) experimental; urgency=medium
+
+ * New upstream release v0.3.6 (Closes: #1025765).
+ * debian/patches:
+ - Remove upstreamed patches.
+ - Refresh patches.
+
+ -- Roger Shimizu <rosh at debian.org> Sat, 14 Jan 2023 23:33:18 -0800
+
torbrowser-launcher (0.3.5-3) unstable; urgency=medium
* debian/patches:
=====================================
debian/patches/01-show-gui-only-if-tbb-not-installed.patch
=====================================
@@ -5,11 +5,11 @@ Origin: https://github.com/troubadoour/torbrowser-launcher/commit/1402015487db55
Added since [419e5f7] to fix the extra dialog issue
---
- torbrowser_launcher/__init__.py | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
+ torbrowser_launcher/__init__.py | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
-index bff3e8e..6cf50e8 100644
+index 115fd4f..5d56e48 100644
--- a/torbrowser_launcher/__init__.py
+++ b/torbrowser_launcher/__init__.py
@@ -37,6 +37,8 @@ from .common import Common, SHARE
@@ -21,7 +21,7 @@ index bff3e8e..6cf50e8 100644
class Application(QtWidgets.QApplication):
"""
-@@ -82,23 +84,24 @@ def main():
+@@ -82,6 +84,9 @@ def main():
if settings:
# Settings mode
gui = Settings(common, app)
@@ -31,31 +31,3 @@ index bff3e8e..6cf50e8 100644
else:
# Launcher mode
gui = Launcher(common, app, url_list)
-
-- # Center the window
-- desktop = app.desktop()
-- window_size = gui.size()
-- gui.move(
-- (desktop.width() - window_size.width()) / 2,
-- (desktop.height() - window_size.height()) / 2,
-- )
-- gui.show()
--
-- # Allow ctrl-c to work
-- signal.signal(signal.SIGINT, signal.SIG_DFL)
--
-- sys.exit(app.exec_())
-+ # Show gui only if not installed
-+ common = common
-+ if not common.settings['installed']:
-+ desktop = app.desktop()
-+ window_size = gui.size()
-+ gui.move(
-+ (desktop.width() - window_size.width()) / 2,
-+ (desktop.height() - window_size.height()) / 2
-+ )
-+ gui.show()
-+ sys.exit(app.exec_())
-
-
- if __name__ == "__main__":
=====================================
debian/patches/02-remove-double-common-assignment.patch deleted
=====================================
@@ -1,24 +0,0 @@
-From: troubadoour <trobador at riseup.net>
-Date: Wed, 28 Mar 2018 03:52:42 -0400
-Subject: remove double 'common' assignment
-Origin: https://github.com/troubadoour/torbrowser-launcher/commit/63646cb69521d40bf25484831d58bcf691f71cca
-
-Added since [419e5f7] to fix the extra dialog issue
----
- torbrowser_launcher/__init__.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
-index 6cf50e8..2e3743f 100644
---- a/torbrowser_launcher/__init__.py
-+++ b/torbrowser_launcher/__init__.py
-@@ -91,8 +91,7 @@ def main():
- # Launcher mode
- gui = Launcher(common, app, url_list)
-
-- # Show gui only if not installed
-- common = common
-+ # Show gui only if tbb not installed
- if not common.settings['installed']:
- desktop = app.desktop()
- window_size = gui.size()
=====================================
debian/patches/04-Fix-use-case-that-enforce-install-of-EN-version-on-n.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From: Roger Shimizu <rosh at debian.org>
-Date: Sun, 26 Apr 2020 18:25:52 +0900
-Subject: Fix use case that enforce install of EN version on non-EN user
- session
-
-build_paths() is called before load_settings(), so it won't recognize
-"force_en-US" setting.
-
-Here we add build_paths() again after load_settings() to do the trick.
-
-Closes: #842021
----
- torbrowser_launcher/common.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
-index cae725e..a479d2b 100644
---- a/torbrowser_launcher/common.py
-+++ b/torbrowser_launcher/common.py
-@@ -175,6 +175,10 @@ class Common(object):
- else:
- language = self.language
-
-+ if hasattr(self, 'settings') and self.settings['force_en-US']:
-+ language = 'en-US'
-+ else:
-+ language = self.language
- if tbb_version:
- # tarball filename
- if self.architecture == "x86_64":
=====================================
debian/patches/05-fix-failure-in-detect-installed-torbrowser.patch
=====================================
@@ -22,18 +22,18 @@ Closes: #983198
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
-index a479d2b..1be706e 100644
+index 6623c0c..fe4607c 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
-@@ -66,6 +66,7 @@ class Common(object):
+@@ -65,6 +65,7 @@ class Common(object):
+ self.load_mirrors()
self.load_settings()
- # some settings require a path rebuild, like force_en-US
self.build_paths()
+ self.load_settings()
self.mkdir(self.paths["download_dir"])
self.mkdir(self.paths["tbb"]["dir"])
self.init_gnupg()
-@@ -409,7 +410,10 @@ class Common(object):
+@@ -335,7 +336,10 @@ class Common(object):
resave = False
# detect installed
=====================================
debian/patches/07-Fix-U2F-for-Yubikey-5-tokens.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From: Jerome Charaoui <jerome at riseup.net>
-Date: Mon, 9 Aug 2021 13:54:25 -0400
-Subject: Fix U2F for Yubikey 5 tokens
-
-(cherry picked from commit 508640ff05a7caf027b77fc3f260ade4a2b98d82)
----
- 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 e682d07..0434c2b 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -147,7 +147,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- /sys/class/ r,
- /sys/bus/ r,
- /sys/class/hidraw/ r,
-- /run/udev/data/c24{7,9}:* r,
-+ /run/udev/data/c24{5,7,9}:* r,
- /dev/hidraw* rw,
- # Yubikey NEO also needs this:
- /sys/devices/**/hidraw/hidraw*/uevent r,
=====================================
debian/patches/08-AppArmor-support-Wayland-display-protocol.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From: travankor <travankor at tuta.io>
-Date: Fri, 9 Jul 2021 21:02:55 -0700
-Subject: AppArmor: support Wayland display protocol
-
-When the environment variable MOZ_ENABLE_WAYLAND is set,
-Firefox will try to use Wayland IPC sockets.
-
-Closes #591
-
-(cherry picked from commit a4bc9789b0d25c5d604e310f313d85ee15871a65)
----
- apparmor/torbrowser.Browser.firefox | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 0434c2b..57f6981 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -116,6 +116,9 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- owner /{dev,run}/shm/org.chromium.* rw,
- owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC
-
-+ # Required for Wayland display protocol support
-+ owner /dev/shm/wayland.mozilla.ipc.[0-9]* rw,
-+
- # Deny access to DRM nodes, that's granted by the X abstraction, which is
- # sourced by the gnome abstraction, that we include.
- deny /dev/dri/** rwklx,
=====================================
debian/patches/09-Remove-extra-override-for-X11-sockets.patch
=====================================
@@ -11,12 +11,12 @@ The regression in X11 abstractions has been fixed in upstream apparmor, and is b
1 file changed, 2 insertions(+)
diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 57f6981..7ceaa13 100644
+index fa754b0..0048dbe 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
-@@ -8,6 +8,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- #include <abstractions/gnome>
- #include <abstractions/ibus>
+@@ -11,6 +11,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+ #include <abstractions/mesa>
+ #include <abstractions/opencl>
#include if exists <abstractions/vulkan>
+ #include if exists <abstractions/dbus-session>
+ #include if exists <abstractions/X>
=====================================
debian/patches/10-AppArmor-allow-Firefox-to-enumerate-GPUs-and-use-graph.patch deleted
=====================================
@@ -1,65 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Tue, 26 Oct 2021 08:56:23 +0000
-Subject: AppArmor: allow Firefox to enumerate GPUs and use graphics
- acceleration
-
-Modern web browsers and contents need graphics acceleration more and more.
-
-GNU/Linux systems are moving to Wayland, where one cannot rely on X.Org driver
-acceleration anymore, and everything instead happens in the kernel, libdrm,
-and Mesa.
-
-(cherry picked from commit 7af35f4475d1dab28f84f76146a5f743b60402ac)
----
- apparmor/torbrowser.Browser.firefox | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 7ceaa13..0513832 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -5,8 +5,11 @@
-
- profile torbrowser_firefox @{torbrowser_firefox_executable} {
- #include <abstractions/audio>
-+ #include <abstractions/dri-enumerate>
- #include <abstractions/gnome>
- #include <abstractions/ibus>
-+ #include <abstractions/mesa>
-+ #include <abstractions/opencl>
- #include if exists <abstractions/vulkan>
- #include if exists <abstractions/dbus-session>
- #include if exists <abstractions/X>
-@@ -101,6 +104,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- /usr/share/homepage/ r,
- /usr/share/homepage/** r,
-
-+ /sys/bus/pci/devices/ r,
-+ @{sys}/devices/pci[0-9]*/**/irq r,
- /sys/devices/system/cpu/ r,
- /sys/devices/system/cpu/present r,
- /sys/devices/system/node/ r,
-@@ -121,12 +126,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- # Required for Wayland display protocol support
- owner /dev/shm/wayland.mozilla.ipc.[0-9]* rw,
-
-- # Deny access to DRM nodes, that's granted by the X abstraction, which is
-- # sourced by the gnome abstraction, that we include.
-- deny /dev/dri/** rwklx,
--
- # Silence denial logs about permissions we don't need
-- deny /dev/dri/ rwklx,
- deny @{HOME}/.cache/fontconfig/ rw,
- deny @{HOME}/.cache/fontconfig/** rw,
- deny @{HOME}/.config/gtk-2.0/ rw,
-@@ -163,5 +163,10 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- owner @{PROC}/@{pid}/{gid,uid}_map w,
- owner @{PROC}/@{pid}/setgroups w,
-
-+ # Remove these rules once we can assume abstractions/vulkan is recent enough
-+ # to include them
-+ /etc/glvnd/egl_vendor.d/{*,.json} r,
-+ /usr/share/glvnd/egl_vendor.d/{,*.json} r,
-+
- #include <local/torbrowser.Browser.firefox>
- }
=====================================
debian/patches/11-AppArmor-silence-a-denial-for-access-we-don-t-need.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Tue, 26 Oct 2021 09:00:31 +0000
-Subject: AppArmor: silence a denial for access we don't need
-
-Firefox 91 only uses /etc/os-release to tweak the system's fonts list
-depending on the distribution. Tor Browser does not use the system's font,
-so that's not relevant.
-
-(cherry picked from commit 4b9d49c18315476b1a95878c2d84e8e8299db6c9)
----
- apparmor/torbrowser.Browser.firefox | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 0513832..6fd13c9 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -32,6 +32,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
- deny /etc/host.conf r,
- deny /etc/hosts r,
- deny /etc/nsswitch.conf r,
-+ deny /etc/os-release r,
- deny /etc/resolv.conf r,
- deny /etc/passwd r,
- deny /etc/group r,
=====================================
debian/patches/12-Fix-strict-parameters-for-gui.move.patch
=====================================
@@ -8,17 +8,17 @@ Subject: Fix strict parameters for gui.move
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
-index 2e3743f..355743b 100644
+index 5d56e48..88448e0 100644
--- a/torbrowser_launcher/__init__.py
+++ b/torbrowser_launcher/__init__.py
-@@ -96,8 +96,8 @@ def main():
- desktop = app.desktop()
- window_size = gui.size()
- gui.move(
-- (desktop.width() - window_size.width()) / 2,
-- (desktop.height() - window_size.height()) / 2
-+ int((desktop.width() - window_size.width()) / 2),
-+ int((desktop.height() - window_size.height()) / 2)
- )
- gui.show()
- sys.exit(app.exec_())
+@@ -95,8 +95,8 @@ def main():
+ desktop = app.desktop()
+ window_size = gui.size()
+ gui.move(
+- (desktop.width() - window_size.width()) // 2,
+- (desktop.height() - window_size.height()) // 2,
++ int((desktop.width() - window_size.width()) // 2),
++ int((desktop.height() - window_size.height()) // 2),
+ )
+ gui.show()
+
=====================================
debian/patches/series
=====================================
@@ -2,14 +2,8 @@ po/01-Update-Hungarian-translation.patch
po/02-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
po/03-Add-Chinese-Traditional-translation.patch
01-show-gui-only-if-tbb-not-installed.patch
-02-remove-double-common-assignment.patch
03-Remove-use-of-deprecated-platform.dist-fixes-446.patch
-04-Fix-use-case-that-enforce-install-of-EN-version-on-n.patch
05-fix-failure-in-detect-installed-torbrowser.patch
06-Update-apparmor-profile.patch
-07-Fix-U2F-for-Yubikey-5-tokens.patch
-08-AppArmor-support-Wayland-display-protocol.patch
09-Remove-extra-override-for-X11-sockets.patch
-10-AppArmor-allow-Firefox-to-enumerate-GPUs-and-use-graph.patch
-11-AppArmor-silence-a-denial-for-access-we-don-t-need.patch
12-Fix-strict-parameters-for-gui.move.patch
=====================================
po/tr.po
=====================================
@@ -0,0 +1,255 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package..
+# Oğuz Ersen <oguz at ersen.moe>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-27 08:41+0300\n"
+"PO-Revision-Date: 2022-03-06 09:00+0300\n"
+"Last-Translator: Oğuz Ersen <oguz at ersen.moe>\n"
+"Language-Team: Turkish <tr>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: common.py:159
+#, python-brace-format
+msgid "Error creating {0}"
+msgstr "{0} oluşturulurken hata"
+
+#: common.py:270
+#, python-brace-format
+msgid "Cannot create directory {0}"
+msgstr "{0} dizini oluşturulamıyor"
+
+#: common.py:273
+#, python-brace-format
+msgid "{0} is not writable"
+msgstr "{0} yazılabilir değil"
+
+#: common.py:280
+msgid "Creating GnuPG homedir"
+msgstr "GnuPG ana dizini oluşturuluyor"
+
+#: common.py:371
+#, python-format
+msgid "Could not import key with fingerprint: %s."
+msgstr "%s parmak izine sahip anahtar içe aktarılamadı."
+
+#: common.py:378
+msgid "Not all keys were imported successfully!"
+msgstr "Tüm anahtarlar başarıyla içe aktarılmadı!"
+
+#: __init__.py:71 launcher.py:528
+msgid "Tor Browser Launcher"
+msgstr "Tor Browser Başlatıcı"
+
+#: __init__.py:72
+msgid "By Micah Lee, licensed under MIT"
+msgstr "Micah Lee tarafından, MIT lisansı altında lisanslandı"
+
+#: __init__.py:73
+#, python-brace-format
+msgid "version {0}"
+msgstr "sürüm {0}"
+
+#: launcher.py:86
+msgid "Downloading Tor Browser for the first time."
+msgstr "Tor Browser ilk kez indiriliyor."
+
+#: launcher.py:89
+msgid ""
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
+msgstr "Tor Browser sürümünüz güncel değil. En yeni sürüm indiriliyor."
+
+#: launcher.py:110
+msgid "Downloading over Tor"
+msgstr "Tor üzerinden indiriliyor"
+
+#: launcher.py:121
+msgid "Tor Browser"
+msgstr "Tor Browser"
+
+#: launcher.py:140
+msgid "Start"
+msgstr "Başlat"
+
+#: launcher.py:190
+msgid "Yes"
+msgstr "Evet"
+
+#: launcher.py:194
+msgid "Exit"
+msgstr "Çıkış"
+
+#: launcher.py:208 settings.py:147
+msgid "Cancel"
+msgstr "İptal"
+
+#: launcher.py:247 launcher.py:268 launcher.py:277 launcher.py:316
+#: launcher.py:319
+msgid "Downloading"
+msgstr "İndiriliyor"
+
+#: launcher.py:258
+msgid "Latest version: {}"
+msgstr "En son sürüm: {}"
+
+#: launcher.py:262
+msgid "Error detecting Tor Browser version."
+msgstr "Tor Browser sürümü algılanırken hata oluştu."
+
+#: launcher.py:292 launcher.py:397
+msgid "Verifying Signature"
+msgstr "İmza Doğrulanıyor"
+
+#: launcher.py:296
+msgid "Extracting"
+msgstr "Çıkartılıyor"
+
+#: launcher.py:300
+msgid "Running"
+msgstr "Çalıştırılıyor"
+
+#: launcher.py:304
+msgid "Starting download over again"
+msgstr "İndirme yeniden başlatılıyor"
+
+#: launcher.py:316 launcher.py:335
+msgid "(over Tor)"
+msgstr "(Tor üzerinden)"
+
+#: launcher.py:331
+msgid "Downloaded"
+msgstr "İndirildi"
+
+#: launcher.py:439
+msgid "Installing"
+msgstr "Kuruluyor"
+
+#: launcher.py:448
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr "Tor Browser Başlatıcı, {0} dosya biçimini anlamıyor"
+
+#: launcher.py:479
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+"Kurduğunuz Tor Browser sürümü olması gerekenden daha eski ve bu bir saldırı "
+"işareti olabilir!"
+
+#: launcher.py:496
+msgid "Downloading Tor Browser over again."
+msgstr "Tor Browser tekrar indiriliyor."
+
+#: launcher.py:568 launcher.py:582 launcher.py:591
+msgid "Download Error:"
+msgstr "İndirme Hatası:"
+
+#: launcher.py:570
+msgid "You are currently using a non-default mirror"
+msgstr "Şu anda öntanımlı olmayan bir yansı kullanıyorsunuz"
+
+#: launcher.py:572
+msgid "Would you like to switch back to the default?"
+msgstr "Öntanımlı olana geri dönmek ister misiniz?"
+
+#: launcher.py:585
+msgid "Would you like to try the English version of Tor Browser instead?"
+msgstr "Bunun yerine Tor Browser'ın İngilizce sürümünü denemek ister misiniz?"
+
+#: launcher.py:607
+#, python-brace-format
+msgid ""
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
+msgstr ""
+"Şunun için geçersiz SSL sertifikası:\n"
+"{0}\n"
+"\n"
+"Saldırı altında olabilirsiniz."
+
+#: launcher.py:610
+msgid "Try the download again using Tor?"
+msgstr "Tor kullanarak indirme tekrar denensin mi?"
+
+#: launcher.py:620
+#, python-brace-format
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
+msgstr ""
+"İndirme başlatılırken hata oluştu:\n"
+"\n"
+"{0}\n"
+"\n"
+"Tor üzerinden indirmeye çalışılıyor. Tor'un doğru yapılandırıldığından ve "
+"çalıştığından emin misiniz?"
+
+#: launcher.py:626
+#, python-brace-format
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Are you connected to the internet?"
+msgstr ""
+"İndirme başlatılırken hata oluştu:\n"
+"\n"
+"{0}\n"
+"\n"
+"İnternete bağlı mısınız?"
+
+#: settings.py:47
+msgid "Tor Browser Launcher Settings"
+msgstr "Tor Browser Başlatıcı Ayarları"
+
+#: settings.py:51
+msgid "Download over system Tor"
+msgstr "Sistem Tor'u üzerinden indir"
+
+#: settings.py:59
+msgid "Force downloading English version of Tor Browser"
+msgstr "Tor Browser'ın İngilizce sürümünü indirmeye zorla"
+
+#: settings.py:69
+msgid "Tor server"
+msgstr "Tor sunucusu"
+
+#: settings.py:85
+msgid "Status: Installed"
+msgstr "Durum: Kurulu"
+
+#: settings.py:87
+msgid "Status: Not Installed"
+msgstr "Durum: Kurulu Değil"
+
+#: settings.py:90
+msgid "Install Tor Browser"
+msgstr "Tor Browser'ı Kur"
+
+#: settings.py:97
+msgid "Reinstall Tor Browser"
+msgstr "Tor Browser'ı Yeniden Kur"
+
+#: settings.py:122
+msgid "Mirror"
+msgstr "Yansı"
+
+#: settings.py:140
+msgid "Save && Exit"
+msgstr "Kaydet && Çık"
=====================================
ppa_release.sh
=====================================
@@ -12,18 +12,18 @@
# login = anonymous
# allow_unsigned_uploads = 0
-VERSION=`cat share/torbrowser-launcher/version`
+VERSION=$(cat share/torbrowser-launcher/version)
-# Make a source pacakge
+# Make a source package
rm -rf deb_dist
python3 setup.py --command-packages=stdeb.command sdist_dsc
# Sign it
-cd deb_dist/torbrowser-launcher-$VERSION
+cd "deb_dist/torbrowser-launcher-$VERSION"
dpkg-buildpackage -S
#dpkg-buildpackage -S -pqubes-gpg-client-wrapper -k927F419D7EC82C2F149C1BD1403C2657CD994F73
cd ..
# Push it to the ppa
-dput ppa torbrowser-launcher_$VERSION-1_source.changes
+dput ppa "torbrowser-launcher_$VERSION-1_source.changes"
cd ..
=====================================
security_design.md
=====================================
@@ -1,6 +1,6 @@
# Tor Browser Launcher Security Design
-This document could be improved. At the moment it's copy/pasted verbatum from a post to the [debian bug tracker](http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752275).
+This document could be improved. At the moment it's copy/pasted verbatim from a post to the [debian bug tracker](http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752275).
## TLS/x.509 security
@@ -12,7 +12,7 @@ torbrowser-launcher doesn't rely on the CA infrastructure. The only TLS it does
Downgrade attacks shouldn't be possible, unless they're committed by Tor devs themselves. If an attacker captures a valid old request to https://check.torproject.org/RecommendedTBBVersions that claims that the current version is an older version than what's currently installed, torbrowser-launcher prevents it from installing. (And by "installing" I mean extracting to the user's home dir.)
-However, there is the scenereo where the user has set a third-party mirror to download from instead of the default. The third-party mirror could serve a tarball and sig that have filenames of the latest version, but are actually an older version. This attack is mitigated by the fact that all mirror options use HTTPS -- though none of the mirror certs are pinned, so in this case it would rely on CA infrastructure. This is an edge case, and would only work against users who are using a non-default mirror, and who also have access to a trusted CA signing key.
+However, there is the scenario where the user has set a third-party mirror to download from instead of the default. The third-party mirror could serve a tarball and sig that have filenames of the latest version, but are actually an older version. This attack is mitigated by the fact that all mirror options use HTTPS -- though none of the mirror certs are pinned, so in this case it would rely on CA infrastructure. This is an edge case, and would only work against users who are using a non-default mirror, and who also have access to a trusted CA signing key.
## Installing Tor Browser system-wide
@@ -20,6 +20,6 @@ You cannot install Tor Browser system-wide. It's released by the Tor Project as
## What secret keys/access attackers need to succeed
-Yes, attackers that 1) have access to the trusted keys included with torbrowser-launcher and 2) have access to modify files on https://www.torproject.org/ or have access to its TLS key are able to get arbitrary code exec as the current user when they open Tor Browser. This may or may not include any of the Tor devs whose keys are included.
+Yes, attackers that 1) have access to the trusted keys included with torbrowser-launcher and 2) have access to modify files on https://www.torproject.org/ or have access to its TLS key are able to get arbitrary code exec as the current user when they open Tor Browser. This may or may not include any of the Tor devs whose keys are included.
But like Holger said above, this is a feature, not a bug. This is the whole purpose of torbrowser-launcher, so users can automatically install TBB updates that are signed by Tor devs.
=====================================
setup.py
=====================================
@@ -119,10 +119,10 @@ Browser.
scripts=["torbrowser-launcher"],
data_files=datafiles,
install_requires=[
- 'gpg',
- 'packaging',
- 'PyQt5',
- 'requests',
- 'PySocks',
+ "gpg",
+ "packaging",
+ "PyQt5",
+ "requests",
+ "PySocks",
],
)
=====================================
share/applications/torbrowser-settings.desktop
=====================================
@@ -10,11 +10,13 @@ Name[pt_BR]=Navegador Tor (Configurações do Lançador)
Name[ru]=Tor Browser (настройки запуска)
Name[sv]=Inställningar för Tor Browser Launcher
Name[be]=Налады запускальніка Tor Browser
+Name[tr]=Tor Browser Başlatıcı Ayarları
GenericName=Tor Browser Launcher Settings
GenericName[da]=Indstillinger for Tor Browser-opstarter
GenericName[hr]=Tor preglednik – postavke pokretanja
GenericName[hu]=Tor-böngésző indító beállításai
GenericName[be]=Налады запускальніка Tor Browser
+GenericName[tr]=Tor Browser Başlatıcı Ayarları
Comment=Tor Browser Launcher Settings
Comment[cs]=Tor Browser Launcher nastavení
Comment[da]=Indstillinger for Tor Browser-opstarter
@@ -26,6 +28,7 @@ Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
Comment[ru]=Tor Browser (настройки запуска)
Comment[sv]=Inställningar för Tor Browser Launcher
Comment[be]=Налады запускальніка Tor Browser
+Comment[tr]=Tor Browser Başlatıcı Ayarları
Exec=torbrowser-launcher --settings
Terminal=false
Type=Application
=====================================
share/applications/torbrowser.desktop
=====================================
@@ -7,11 +7,13 @@ Name[hr]=Tor preglednik
Name[hu]=Tor-böngésző
Name[pt_BR]=Navegador Tor
Name[sv]=Tor Browser
+Name[tr]=Tor Browser
GenericName=Tor Browser
GenericName[be]=Tor Browser
GenericName[da]=Tor Browser
GenericName[hr]=Tor preglednik
GenericName[hu]=Tor böngésző indító
+GenericName[tr]=Tor Browser
Comment=Launch Tor Browser
Comment[be]=Запуск Tor Browser
Comment[cs]=Spustit Tor Browser
@@ -20,6 +22,7 @@ Comment[da]=Start Tor Browser
Comment[hu]=Tor böngésző indító
Comment[pt_BR]=Navegador Tor
Comment[sv]=Starta Tor Browser
+Comment[tr]=Tor Browser Başlat
Exec=torbrowser-launcher %u
Terminal=false
Type=Application
=====================================
share/metainfo/torbrowser.appdata.xml
=====================================
@@ -29,6 +29,6 @@
<update_contact>micah at micahflee.com</update_contact>
<content_rating type="oars-1.1"/>
<releases>
- <release version="0.3.5" date="2021-06-21"/>
+ <release version="0.3.6" date="2022-12-13"/>
</releases>
</component>
=====================================
share/torbrowser-launcher/version
=====================================
@@ -1 +1 @@
-0.3.5
+0.3.6
=====================================
torbrowser_launcher/__init__.py
=====================================
@@ -90,8 +90,8 @@ def main():
desktop = app.desktop()
window_size = gui.size()
gui.move(
- (desktop.width() - window_size.width()) / 2,
- (desktop.height() - window_size.height()) / 2,
+ (desktop.width() - window_size.width()) // 2,
+ (desktop.height() - window_size.height()) // 2,
)
gui.show()
=====================================
torbrowser_launcher/common.py
=====================================
@@ -30,7 +30,6 @@ import os
import sys
import platform
import subprocess
-import locale
import pickle
import json
import re
@@ -57,87 +56,19 @@ class Common(object):
self.tbl_version = tbl_version
# initialize the app
+ self.architecture = "x86_64" if "64" in platform.architecture()[0] else "i686"
self.default_mirror = "https://dist.torproject.org/"
- self.discover_arch_lang()
self.build_paths()
+ self.torbrowser12_rename_old_tbb()
for d in self.paths["dirs"]:
self.mkdir(self.paths["dirs"][d])
self.load_mirrors()
self.load_settings()
- # some settings require a path rebuild, like force_en-US
self.build_paths()
self.mkdir(self.paths["download_dir"])
self.mkdir(self.paths["tbb"]["dir"])
self.init_gnupg()
- # discover the architecture and language
- def discover_arch_lang(self):
- # figure out the architecture
- self.architecture = "x86_64" if "64" in platform.architecture()[0] else "i686"
-
- # figure out the language
- 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",
- "zh-TW",
- ]
-
- # a list of manually configured language fallback overriding
- language_overrides = {
- "zh-HK": "zh-TW",
- }
-
- locale.setlocale(locale.LC_MESSAGES, "")
- default_locale = locale.getlocale(locale.LC_MESSAGES)[0]
- if default_locale is None:
- self.language = "en-US"
- else:
- self.language = default_locale.replace("_", "-")
- if self.language in language_overrides:
- self.language = language_overrides[self.language]
- if self.language not in available_languages:
- self.language = self.language.split("-")[0]
- if self.language not in available_languages:
- for l in available_languages:
- if l[0:2] == self.language:
- self.language = l
- # if language isn't available, default to english
- if self.language not in available_languages:
- self.language = "en-US"
-
# get value of environment variable, if it is not set return the default value
@staticmethod
def get_env(var_name, default_value):
@@ -170,11 +101,6 @@ class Common(object):
)
old_tbb_data = "{0}/.torbrowser".format(homedir)
- if hasattr(self, "settings") and self.settings["force_en-US"]:
- language = "en-US"
- else:
- language = self.language
-
if tbb_version:
# tarball filename
if self.architecture == "x86_64":
@@ -182,9 +108,7 @@ class Common(object):
else:
arch = "linux32"
- tarball_filename = (
- "tor-browser-" + arch + "-" + tbb_version + "_" + language + ".tar.xz"
- )
+ tarball_filename = "tor-browser-" + arch + "-" + tbb_version + "_ALL.tar.xz"
# tarball
self.paths["tarball_url"] = (
@@ -218,7 +142,7 @@ class Common(object):
"tor_browser_developers": os.path.join(
SHARE, "tor-browser-developers.asc"
),
- "wkd_tmp": os.path.join(tbb_cache, "torbrowser.gpg")
+ "wkd_tmp": os.path.join(tbb_cache, "torbrowser.gpg"),
},
"mirrors_txt": [
os.path.join(SHARE, "mirrors.txt"),
@@ -228,27 +152,19 @@ class Common(object):
"gnupg_homedir": tbb_local + "/gnupg_homedir",
"settings_file": tbb_config + "/settings.json",
"settings_file_pickle": tbb_config + "/settings",
- "version_check_url": "https://aus1.torproject.org/torbrowser/update_3/release/Linux_x86_64-gcc3/x/en-US",
+ "version_check_url": "https://aus1.torproject.org/torbrowser/update_3/release/Linux_x86_64-gcc3/x/ALL",
"version_check_file": tbb_cache + "/download/release.xml",
"tbb": {
"changelog": tbb_local
+ "/tbb/"
+ self.architecture
- + "/tor-browser_"
- + language
- + "/Browser/TorBrowser/Docs/ChangeLog.txt",
+ + "/tor-browser/Browser/TorBrowser/Docs/ChangeLog.txt",
"dir": tbb_local + "/tbb/" + self.architecture,
- "dir_tbb": tbb_local
- + "/tbb/"
- + self.architecture
- + "/tor-browser_"
- + language,
+ "dir_tbb": tbb_local + "/tbb/" + self.architecture + "/tor-browser",
"start": tbb_local
+ "/tbb/"
+ self.architecture
- + "/tor-browser_"
- + language
- + "/start-tor-browser.desktop",
+ + "/tor-browser/start-tor-browser.desktop",
},
}
@@ -259,6 +175,21 @@ class Common(object):
"wkd_tmp": tor_browser_developers_fingerprint,
}
+ # Tor Browser 12.0 no longer has locales. If an old TBB folder exists with locals, rename it to just tor_browser
+ def torbrowser12_rename_old_tbb(self):
+ if not os.path.exists(self.paths["tbb"]["dir"]):
+ return
+ for filename in os.listdir(self.paths["tbb"]["dir"]):
+ abs_filename = os.path.join(self.paths["tbb"]["dir"], filename)
+ if filename.startswith("tor-browser_") and os.path.isdir(abs_filename):
+ os.rename(abs_filename, self.paths["tbb"]["dir_tbb"])
+ print(
+ _("Renamed {0} to {1}").format(
+ abs_filename, self.paths["tbb"]["dir_tbb"]
+ )
+ )
+ break
+
# create a directory
@staticmethod
def mkdir(path):
@@ -397,7 +328,6 @@ class Common(object):
"download_over_tor": False,
"tor_socks_address": "127.0.0.1:9050",
"mirror": self.default_mirror,
- "force_en-US": False,
}
if os.path.isfile(self.paths["settings_file"]):
=====================================
torbrowser_launcher/launcher.py
=====================================
@@ -72,7 +72,7 @@ class Launcher(QtWidgets.QMainWindow):
self.force_redownload = False
# This is the current version of Tor Browser, which should get updated with every release
- self.min_version = "7.5.2"
+ self.min_version = "12.0"
# Init launcher
self.set_state(None, "", [])
@@ -219,8 +219,6 @@ class Launcher(QtWidgets.QMainWindow):
self.try_stable()
elif self.gui == "error_try_default_mirror":
self.try_default_mirror()
- elif self.gui == "error_try_forcing_english":
- self.try_forcing_english()
elif self.gui == "error_try_tor":
self.try_tor()
@@ -361,13 +359,6 @@ class Launcher(QtWidgets.QMainWindow):
subprocess.Popen([self.common.paths["tbl_bin"]])
self.close()
- def try_forcing_english(self):
- # change force english to true and relaunch TBL
- self.common.settings["force_en-US"] = True
- self.common.save_settings()
- subprocess.Popen([self.common.paths["tbl_bin"]])
- self.close()
-
def try_tor(self):
# set download_over_tor to true and relaunch TBL
self.common.settings["download_over_tor"] = True
@@ -549,6 +540,7 @@ class DownloadThread(QtCore.QThread):
self.common = common
self.url = url
self.path = path
+
def run(self):
with open(self.path, "wb") as f:
try:
@@ -572,21 +564,6 @@ class DownloadThread(QtCore.QThread):
+ _("Would you like to switch back to the default?")
).format(r.status_code, self.common.settings["mirror"])
self.download_error.emit("error_try_default_mirror", message)
-
- # Should we switch to English?
- elif (
- self.common.language != "en-US"
- and not self.common.settings["force_en-US"]
- ):
- message = (
- _("Download Error:")
- + " {0}\n\n"
- + _(
- "Would you like to try the English version of Tor Browser instead?"
- )
- ).format(r.status_code)
- self.download_error.emit("error_try_forcing_english", message)
-
else:
message = (_("Download Error:") + " {0}").format(r.status_code)
self.download_error.emit("error", message)
=====================================
torbrowser_launcher/settings.py
=====================================
@@ -54,17 +54,6 @@ class Settings(QtWidgets.QMainWindow):
else:
self.tor_download_checkbox.setCheckState(QtCore.Qt.Unchecked)
- # Force en-US, only display if language isn't already en-US
- self.force_en_checkbox = QtWidgets.QCheckBox(
- _("Force downloading English version of Tor Browser")
- )
- if self.common.settings["force_en-US"]:
- self.force_en_checkbox.setCheckState(QtCore.Qt.Checked)
- else:
- self.force_en_checkbox.setCheckState(QtCore.Qt.Unchecked)
- if self.common.language == "en-US":
- self.force_en_checkbox.hide()
-
# Tor SOCKS address
tor_addr_label = QtWidgets.QLabel(_("Tor server"))
self.tor_addr = QtWidgets.QLineEdit()
@@ -76,7 +65,6 @@ class Settings(QtWidgets.QMainWindow):
# Settings layout
settings_layout = QtWidgets.QVBoxLayout()
settings_layout.addWidget(self.tor_download_checkbox)
- settings_layout.addWidget(self.force_en_checkbox)
settings_layout.addLayout(tor_addr_layout)
# Status
@@ -189,7 +177,6 @@ class Settings(QtWidgets.QMainWindow):
self.common.settings[
"download_over_tor"
] = self.tor_download_checkbox.isChecked()
- self.common.settings["force_en-US"] = self.force_en_checkbox.isChecked()
self.common.settings["tor_socks_address"] = self.tor_addr.text()
# Figure out the selected mirror
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/973f227b995916e172a4df069769a64848b43ef6...50f3410cc63c050cc9505f1d9a9255db1ba4371d
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/973f227b995916e172a4df069769a64848b43ef6...50f3410cc63c050cc9505f1d9a9255db1ba4371d
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/20230115/a1918f1b/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list