[Pkg-privacy-commits] [torbrowser-launcher] 01/01: Unfuzzy patches.

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch debian/jessie-proposed
in repository torbrowser-launcher.

commit 7cd8788543f2d0487f890e72f692b73ad1551abe
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Mar 27 11:38:06 2016 +0000

    Unfuzzy patches.
---
 ...ail-to-launch-Tor-Browser-if-its-version-is-earlier.patch | 12 ++++++------
 ...revent-attempts-at-directory-traversal-attacks-even.patch | 11 +++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0012-Fail-to-launch-Tor-Browser-if-its-version-is-earlier.patch b/debian/patches/0012-Fail-to-launch-Tor-Browser-if-its-version-is-earlier.patch
index 944e9fd..97c84bf 100644
--- a/debian/patches/0012-Fail-to-launch-Tor-Browser-if-its-version-is-earlier.patch
+++ b/debian/patches/0012-Fail-to-launch-Tor-Browser-if-its-version-is-earlier.patch
@@ -12,7 +12,7 @@ diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
 index 37047a1..9815e84 100644
 --- a/torbrowser_launcher/launcher.py
 +++ b/torbrowser_launcher/launcher.py
-@@ -56,6 +56,9 @@ class Launcher:
+@@ -70,6 +70,9 @@
          self.common = common
          self.url_list = url_list
  
@@ -22,8 +22,8 @@ index 37047a1..9815e84 100644
          # init launcher
          self.set_gui(None, '', [])
          self.launch_gui = True
-@@ -92,7 +95,11 @@ class Launcher:
-             self.launch_gui = False
+@@ -120,7 +123,11 @@
+             self.start_launcher()
  
          if self.launch_gui:
 -            # set up the window
@@ -35,7 +35,7 @@ index 37047a1..9815e84 100644
              self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
              self.window.set_title(_("Tor Browser"))
              self.window.set_icon_from_file(self.common.paths['icon_file'])
-@@ -101,9 +108,6 @@ class Launcher:
+@@ -129,9 +136,6 @@
              self.window.connect("delete_event", self.delete_event)
              self.window.connect("destroy", self.destroy)
  
@@ -45,7 +45,7 @@ index 37047a1..9815e84 100644
      # download or run TBB
      def start_launcher(self):
          # is TBB already installed?
-@@ -129,6 +133,7 @@ class Launcher:
+@@ -201,6 +205,7 @@
          self.clear_ui()
  
          self.box = gtk.VBox(False, 20)
@@ -53,7 +53,7 @@ index 37047a1..9815e84 100644
          self.window.add(self.box)
  
          if 'error' in self.gui:
-@@ -483,7 +488,31 @@ class Launcher:
+@@ -587,7 +592,31 @@
  
          self.run_task()
  
diff --git a/debian/patches/0014-Prevent-attempts-at-directory-traversal-attacks-even.patch b/debian/patches/0014-Prevent-attempts-at-directory-traversal-attacks-even.patch
index 6b6372e..71f1f52 100644
--- a/debian/patches/0014-Prevent-attempts-at-directory-traversal-attacks-even.patch
+++ b/debian/patches/0014-Prevent-attempts-at-directory-traversal-attacks-even.patch
@@ -8,12 +8,10 @@ Subject: [PATCH] Prevent attempts at directory traversal attacks, even though
  torbrowser_launcher/launcher.py | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
-index 442c6f4..a05c4a1 100644
 --- a/torbrowser_launcher/launcher.py
 +++ b/torbrowser_launcher/launcher.py
-@@ -435,7 +435,14 @@ class Launcher:
-         tree = ET.parse(self.common.paths['version_check_file'])
+@@ -502,7 +502,14 @@
+         tree = ET.parse(self.common.paths['update_check_file'])
          for up in tree.getroot():
              if up.tag == 'update' and up.attrib['appVersion']:
 -                return up.attrib['appVersion']
@@ -27,7 +25,4 @@ index 442c6f4..a05c4a1 100644
 +                return version
          return None
  
-     def verify(self):
--- 
-2.1.4
-
+     def attempt_update(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git