[Pkg-anonymity-tools] [torbrowser-launcher] 01/04: add 3d9f4ed and 5f833d7
Holger Levsen
holger at moszumanska.debian.org
Sat May 30 14:02:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to annotated tag debian/0.1.9-1+deb8u1
in repository torbrowser-launcher.
commit 73131ef1a40ad02f6f7c73ed86f66fa1bf9a450a
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat May 30 15:26:22 2015 +0200
add 3d9f4ed and 5f833d7
---
...tion-of-start-tor-browser-for-TBB-4.5-and.patch | 93 ++++++++++++++++++++++
...tart-tor-browser.desktop-instead-of-.-Bro.patch | 41 ++++++++++
debian/patches/series | 3 +
3 files changed, 137 insertions(+)
diff --git a/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch b/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch
new file mode 100644
index 0000000..2d4ae85
--- /dev/null
+++ b/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch
@@ -0,0 +1,93 @@
+From 3d9f4edc206ade74ff1b4194297e20025e51b793 Mon Sep 17 00:00:00 2001
+From: Micah Lee <micah at micahflee.com>
+Date: Mon, 11 May 2015 14:04:01 -0700
+Subject: [PATCH] Update location of start-tor-browser for TBB 4.5, and remove
+ accept_links feature #176
+
+---
+ torbrowser_launcher/common.py | 5 ++---
+ torbrowser_launcher/launcher.py | 6 +-----
+ torbrowser_launcher/settings.py | 12 ------------
+ 3 files changed, 3 insertions(+), 20 deletions(-)
+
+diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
+index 505a4b3..9495fe6 100644
+--- a/torbrowser_launcher/common.py
++++ b/torbrowser_launcher/common.py
+@@ -145,7 +145,7 @@ class Common:
+ 'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
+ 'tbb': {
+ 'dir': tbb_local+'/tbb/'+self.architecture,
+- 'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser',
++ 'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/start-tor-browser',
+ 'versions': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/sources/versions',
+ },
+ }
+@@ -198,8 +198,7 @@ class Common:
+ 'check_for_updates': False,
+ 'modem_sound': False,
+ 'last_update_check_timestamp': 0,
+- 'mirror': self.default_mirror,
+- 'accept_links': False
++ 'mirror': self.default_mirror
+ }
+
+ if os.path.isfile(self.paths['settings_file']):
+diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
+index 00bc5a4..e9397e0 100644
+--- a/torbrowser_launcher/launcher.py
++++ b/torbrowser_launcher/launcher.py
+@@ -634,10 +634,7 @@ class Launcher:
+ gtk.main_iteration_do(True)
+
+ # run Tor Browser
+- if self.common.settings['accept_links']:
+- subprocess.call([self.common.paths['tbb']['start'], '-allow-remote'] + self.url_list)
+- else:
+- subprocess.call([self.common.paths['tbb']['start']])
++ subprocess.call([self.common.paths['tbb']['start'], '--detach'])
+
+ if run_next_task:
+ self.run_task()
+@@ -674,4 +671,3 @@ class Launcher:
+ delattr(self, 'current_download_url')
+ if reactor.running:
+ reactor.stop()
+-
+diff --git a/torbrowser_launcher/settings.py b/torbrowser_launcher/settings.py
+index a29c41a..00e521d 100644
+--- a/torbrowser_launcher/settings.py
++++ b/torbrowser_launcher/settings.py
+@@ -95,15 +95,6 @@ class Settings:
+ self.update_checkbox.set_active(False)
+ self.update_checkbox.show()
+
+- # accept links
+- self.accept_links = gtk.CheckButton(_("Allow opening links with Tor Browser\n(this doesn't work if you use Firefox)"))
+- self.settings_box.pack_start(self.accept_links, True, True, 0)
+- if self.common.settings['accept_links']:
+- self.accept_links.set_active(True)
+- else:
+- self.accept_links.set_active(False)
+- self.accept_links.show()
+-
+ # modem sound
+ self.modem_checkbox = gtk.CheckButton(_("Play modem sound, because Tor is slow :]"))
+ self.settings_box.pack_start(self.modem_checkbox, True, True, 0)
+@@ -222,7 +213,6 @@ class Settings:
+ # checkbox options
+ self.common.settings['update_over_tor'] = self.tor_update_checkbox.get_active()
+ self.common.settings['check_for_updates'] = self.update_checkbox.get_active()
+- self.common.settings['accept_links'] = self.accept_links.get_active()
+ self.common.settings['modem_sound'] = self.modem_checkbox.get_active()
+
+ # figure out the selected mirror
+@@ -237,5 +227,3 @@ class Settings:
+
+ def destroy(self, widget, data=None):
+ gtk.main_quit()
+-
+-
+--
+1.9.1
+
diff --git a/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch b/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
new file mode 100644
index 0000000..af3f86a
--- /dev/null
+++ b/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
@@ -0,0 +1,41 @@
+From 5f833d73290bd3623bf22caffaed599381d454d9 Mon Sep 17 00:00:00 2001
+From: Micah Lee <micah at micahflee.com>
+Date: Mon, 11 May 2015 19:20:30 -0400
+Subject: [PATCH] execute ./start-tor-browser.desktop instead of
+ ./Browser/start-tor-browser (#176)
+
+---
+ torbrowser_launcher/common.py | 3 ++-
+ torbrowser_launcher/launcher.py | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
+index 93ed067..e5844b9 100644
+--- a/torbrowser_launcher/common.py
++++ b/torbrowser_launcher/common.py
+@@ -144,7 +144,8 @@ class Common:
+ 'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
+ 'tbb': {
+ 'dir': tbb_local+'/tbb/'+self.architecture,
+- 'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/start-tor-browser',
++ 'dir_tbb': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language,
++ 'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser.desktop',
+ 'versions': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/sources/versions',
+ },
+ }
+diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
+index d4211df..698949d 100644
+--- a/torbrowser_launcher/launcher.py
++++ b/torbrowser_launcher/launcher.py
+@@ -631,7 +631,7 @@ class Launcher:
+ gtk.main_iteration_do(True)
+
+ # run Tor Browser
+- subprocess.call([self.common.paths['tbb']['start'], '--detach'])
++ subprocess.call([self.common.paths['tbb']['start']], cwd=self.common.paths['tbb']['dir_tbb'])
+
+ if run_next_task:
+ self.run_task()
+--
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..567e8b5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch
+0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
+series
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git
More information about the Pkg-anonymity-tools
mailing list