Update to 0.5.8.3.

Security:	Fix remote exploit which could crash Deluge.

6 files changed, 28 insertions, 20 deletions

diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 77e3d0860b91..124db4e51303 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.8.2
+PORTVERSION=	0.5.8.3
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/tarball/${PORTVERSION}/
 
diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo
index 22d05397c719..a4b905837709 100644
--- a/net-p2p/deluge/distinfo
+++ b/net-p2p/deluge/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.8.2.tar.gz) = 09139988766f2aaade3b3148b02df8ce
-SHA256 (deluge-0.5.8.2.tar.gz) = 54892408d52633f33350756f7716a5bddebe2847bb96af65fc32db12732286ab
-SIZE (deluge-0.5.8.2.tar.gz) = 2120394
+MD5 (deluge-0.5.8.3.tar.gz) = ba4ecd51b4bd52e0946cfeff07d7df80
+SHA256 (deluge-0.5.8.3.tar.gz) = 0bc7bfaa83561b8e413c86a6d4fa7fbf78aef38f2e047c93ece4e4314663ff93
+SIZE (deluge-0.5.8.3.tar.gz) = 2117837
diff --git a/net-p2p/deluge/files/patch-disable_check_update b/net-p2p/deluge/files/patch-disable_check_update
index c1179463063f..90a7d315e5d1 100644
--- a/net-p2p/deluge/files/patch-disable_check_update
+++ b/net-p2p/deluge/files/patch-disable_check_update
@@ -1,5 +1,5 @@
---- glade/preferences_dialog.glade.orig	2008-01-19 12:40:55.000000000 -0600
-+++ glade/preferences_dialog.glade	2008-01-19 12:41:35.000000000 -0600
+--- glade/preferences_dialog.glade.orig	2008-01-30 13:03:26.000000000 -0600
++++ glade/preferences_dialog.glade	2008-01-30 13:04:06.000000000 -0600
 @@ -2673,7 +2673,7 @@
                  </child>
                  <child>
@@ -9,8 +9,8 @@
                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                      <property name="label_xalign">0</property>
                      <property name="shadow_type">GTK_SHADOW_NONE</property>
---- src/interface.py.orig	2008-01-19 12:41:04.000000000 -0600
-+++ src/interface.py	2008-01-19 12:42:26.000000000 -0600
+--- src/interface.py.orig	2008-01-30 13:03:33.000000000 -0600
++++ src/interface.py	2008-01-30 13:04:38.000000000 -0600
 @@ -1037,8 +1037,6 @@
          # Load plugins after we showed main window (if not started in tray)
          self.load_plugins()
@@ -20,7 +20,7 @@
  
          try:
              gobject.threads_init()
-@@ -1048,34 +1046,6 @@
+@@ -1048,38 +1046,6 @@
          except KeyboardInterrupt:
              self.manager.quit()
  
@@ -38,7 +38,11 @@
 -        except IOError:
 -            print "Network error while trying to check for a newer version of \
 -Deluge"
--            new_release = ""
+-            try:
+-                gtk.gdk.threads_leave()
+-            except:
+-                pass
+-            return
 -
 -        if new_release > common.PROGRAM_VERSION:
 -            result = dialogs.show_popup_question(None, _("There is a newer version \
diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile
index 77e3d0860b91..124db4e51303 100644
--- a/net-p2p/deluge05/Makefile
+++ b/net-p2p/deluge05/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.8.2
+PORTVERSION=	0.5.8.3
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/tarball/${PORTVERSION}/
 
diff --git a/net-p2p/deluge05/distinfo b/net-p2p/deluge05/distinfo
index 22d05397c719..a4b905837709 100644
--- a/net-p2p/deluge05/distinfo
+++ b/net-p2p/deluge05/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.8.2.tar.gz) = 09139988766f2aaade3b3148b02df8ce
-SHA256 (deluge-0.5.8.2.tar.gz) = 54892408d52633f33350756f7716a5bddebe2847bb96af65fc32db12732286ab
-SIZE (deluge-0.5.8.2.tar.gz) = 2120394
+MD5 (deluge-0.5.8.3.tar.gz) = ba4ecd51b4bd52e0946cfeff07d7df80
+SHA256 (deluge-0.5.8.3.tar.gz) = 0bc7bfaa83561b8e413c86a6d4fa7fbf78aef38f2e047c93ece4e4314663ff93
+SIZE (deluge-0.5.8.3.tar.gz) = 2117837
diff --git a/net-p2p/deluge05/files/patch-disable_check_update b/net-p2p/deluge05/files/patch-disable_check_update
index c1179463063f..90a7d315e5d1 100644
--- a/net-p2p/deluge05/files/patch-disable_check_update
+++ b/net-p2p/deluge05/files/patch-disable_check_update
@@ -1,5 +1,5 @@
---- glade/preferences_dialog.glade.orig	2008-01-19 12:40:55.000000000 -0600
-+++ glade/preferences_dialog.glade	2008-01-19 12:41:35.000000000 -0600
+--- glade/preferences_dialog.glade.orig	2008-01-30 13:03:26.000000000 -0600
++++ glade/preferences_dialog.glade	2008-01-30 13:04:06.000000000 -0600
 @@ -2673,7 +2673,7 @@
                  </child>
                  <child>
@@ -9,8 +9,8 @@
                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                      <property name="label_xalign">0</property>
                      <property name="shadow_type">GTK_SHADOW_NONE</property>
---- src/interface.py.orig	2008-01-19 12:41:04.000000000 -0600
-+++ src/interface.py	2008-01-19 12:42:26.000000000 -0600
+--- src/interface.py.orig	2008-01-30 13:03:33.000000000 -0600
++++ src/interface.py	2008-01-30 13:04:38.000000000 -0600
 @@ -1037,8 +1037,6 @@
          # Load plugins after we showed main window (if not started in tray)
          self.load_plugins()
@@ -20,7 +20,7 @@
  
          try:
              gobject.threads_init()
-@@ -1048,34 +1046,6 @@
+@@ -1048,38 +1046,6 @@
          except KeyboardInterrupt:
              self.manager.quit()
  
@@ -38,7 +38,11 @@
 -        except IOError:
 -            print "Network error while trying to check for a newer version of \
 -Deluge"
--            new_release = ""
+-            try:
+-                gtk.gdk.threads_leave()
+-            except:
+-                pass
+-            return
 -
 -        if new_release > common.PROGRAM_VERSION:
 -            result = dialogs.show_popup_question(None, _("There is a newer version \