rpms/deluge/devel deluge-fix-get_tracker_host-if-no-tracker.patch, NONE, 1.1 deluge.spec, 1.77, 1.78

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3585

Modified Files:
	deluge.spec 
Added Files:
	deluge-fix-get_tracker_host-if-no-tracker.patch 
Log Message:
Add upstreamed patch to fix RHBZ# 479097 (upstream ticket #704)

deluge-fix-get_tracker_host-if-no-tracker.patch:

--- NEW FILE deluge-fix-get_tracker_host-if-no-tracker.patch ---
If the torrent has no tracker, the call to inet_aton will fail because the
hostname is empty. This causes torrents to not be shown, or to be shown with
an error status.  Replacing this parameter with host ensures that this is no
longer the case. (From upstream changeset 4492.)

Index: /branches/1.1.0_RC/deluge/core/torrent.py
===================================================================
--- /branches/1.1.0_RC/deluge/core/torrent.py (revision 4488)
+++ /branches/1.1.0_RC/deluge/core/torrent.py (revision 4492)
@@ -523,5 +523,5 @@
                 import socket
                 try:
-                    socket.inet_aton(url.hostname)
+                    socket.inet_aton(host)
                 except socket.error:
                     pass
Index: /branches/1.1.0_RC/ChangeLog
===================================================================
--- /branches/1.1.0_RC/ChangeLog (revision 4488)
+++ /branches/1.1.0_RC/ChangeLog (revision 4492)
@@ -1,2 +1,6 @@
+Deluge 1.1.0_RC4 (In Development)
+ Core:
+  * Fix issue in get_tracker_host when the torrent has no tracker
+
 Deluge 1.1.0_RC3 (05 January 2009)
  Core:


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- deluge.spec	6 Jan 2009 21:07:16 -0000	1.77
+++ deluge.spec	7 Jan 2009 23:01:35 -0000	1.78
@@ -7,7 +7,7 @@
 
 Name:		deluge
 Version:	1.1.0
-Release:	0.2.rc3%{?dist}
+Release:	0.3.rc3%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
@@ -15,6 +15,12 @@
 
 Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-1.1.0_RC3.tar.bz2
 
+## Fix issue in get_tracker_host when the torrent has no tracker; from
+## upstream SVN (changeset 4492 - will be in 1.1.0 RC4).
+## Fedora bug:   https://bugzilla.redhat.com/show_bug.cgi?id=479097
+## Upstream bug: http://dev.deluge-torrent.org/ticket/704
+Patch0: 	%{name}-fix-get_tracker_host-if-no-tracker.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -50,6 +56,7 @@
 
 %prep
 %setup -qn "%{name}-1.1.0_RC3"
+%patch0 -p3 -b .fix-get_tracker-host-if-no-tracker
 
 
 %build
@@ -133,7 +140,15 @@
 
 
 %changelog
-* Thu Jan 06 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.2.rc3
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.3.rc3
+- Add patch from upstream SVN to fix an error where torrents are not shown (or
+  possibly shown in "Error" states) due to a bad inet_aton call:
+  + fix-get_tracker-host-if-no-tracker.patch
+- Resolves: #479097 (No torrent shown in menu); thanks to Mamoru Tasaka for
+  the bug report.
+- Fix day of previous %%changelog entry.
+
+* Tue Jan 06 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.2.rc3
 - Update to new upstream release candidate (1.1.0 RC3)
 - Build against the system rb_libtorrent instead of using the in-tarball copy
   (requires rb_libtorrent 0.14+), and adjust dependencies accordingly. Drop