--- a/ChangeLog	Wed Mar 26 05:26:36 2008 +0000
+++ b/ChangeLog	Wed Mar 26 06:22:29 2008 +0000
@@ -1,3 +1,9 @@
+2008-03-26  Albert Lee  <[email protected]>
+
+	* SFEdeluge.spec: Bump to 0.5.8.6, bump patch1, add patch4
+	* patches/deluge-01-sunpro.diff: Bump for 0.5.8.6
+	* patches/deluge-04-sockaddr.diff: Don't use sa_len on non-4.4BSD
+
 2008-03-26  Albert Lee <[email protected]>
 
 	* SFEnicdrv.spec: Fix compilation on amd64

--- a/SFEdeluge.spec	Wed Mar 26 05:26:36 2008 +0000
+++ b/SFEdeluge.spec	Wed Mar 26 06:22:29 2008 +0000
@@ -7,11 +7,12 @@
 
 Name:                SFEdeluge
 Summary:             Deluge - BitTorrent client
-Version:             0.5.8.4
-Source:              http://download.deluge-torrent.org/tarball/%{version}/deluge-%{version}.tar.gz
+Version:             0.5.8.6
+Source:              http://download.deluge-torrent.org/source/%{version}/deluge-%{version}.tar.gz
 Patch1:              deluge-01-sunpro.diff
 #Patch2:              deluge-02-path.diff
 #Patch3:              deluge-03-sparsefile.diff
+Patch4:              deluge-04-sockaddr.diff
 URL:                 http://deluge-torrent.org/
 
 SUNW_BaseDir:        %{_basedir}
@@ -45,6 +46,7 @@
 %patch1 -p1
 #%patch2 -p1
 #%patch3 -p1
+%patch4 -p1
 rm "plugins/WebUi/lib/webpy022/Dependency-not-really part of webui.txt"
 # patch prefix before building
 ed -s src/common.py <<'/EOF/' >/dev/null
@@ -119,6 +121,7 @@
 %{_datadir}/applications/deluge.desktop
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
+%dir %attr (0755, root, other) %{_datadir}/icons
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/128x128
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/128x128/apps
@@ -165,6 +168,8 @@
 %endif
 
 %changelog
+* Wed Mar 26 2008 - [email protected]
+- Bump to 0.5.8.6, bump patch1, add patch4
 * Tue Feb 26 2008 - [email protected]
 - Bump to 0.5.8.4.
 * Mon Dec 31 2007 - [email protected]

--- a/patches/deluge-01-sunpro.diff	Wed Mar 26 05:26:36 2008 +0000
+++ b/patches/deluge-01-sunpro.diff	Wed Mar 26 06:22:29 2008 +0000
@@ -1,5 +1,5 @@
---- deluge-torrent-0.5.8.4-orig/setup.py	2008-02-14 04:08:27.000000000 +0000
-+++ deluge-torrent-0.5.8.4/setup.py	2008-02-26 00:15:48.615422011 +0000
+--- deluge-torrent-0.5.8.5.orig/setup.py	2008-02-28 01:54:06.000000000 -0500
++++ deluge-torrent-0.5.8.5/setup.py	2008-03-02 22:44:23.914991996 -0500
 @@ -98,12 +98,12 @@
  #    it has been removed to prevent confusion.
  
@@ -15,16 +15,20 @@
      if ARCH == "x64":
          EXTRA_COMPILE_ARGS.append("-DAMD64")
  
-@@ -150,7 +150,7 @@
+@@ -150,10 +150,10 @@
      librariestype = [boost_filesystem, boost_date_time,
-             boost_thread, 'z', 'pthread', 'ssl', 'rt', 'crypto']
+             boost_thread, 'z', 'pthread', 'ssl', 'crypto']
+ 
+-    if os == "linux":
++    if OS == "nix" or OS == "linux":
+         librariestype += ['rt']
      
 -    removals = ['-g', '-Wstrict-prototypes']
 +    removals = ['-g', '-Wstrict-prototypes', '-OPT:Olimit=0']
  
      if python_version == '2.5':
          cv_opt = sysconfig.get_config_vars()["CFLAGS"]
-@@ -162,6 +162,10 @@
+@@ -165,6 +165,10 @@
          for removal in removals:
              cv_opt = cv_opt.replace(removal, " ")
          sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
@@ -35,7 +39,7 @@
  else:
      EXTRA_COMPILE_ARGS = [  '-O2', '-DBOOST_WINDOWS',
                              '-fno-strict-aliasing',
-@@ -212,7 +216,8 @@
+@@ -215,7 +219,8 @@
                      libraries = librariestype,
                      extra_compile_args = EXTRA_COMPILE_ARGS,
                      extra_link_args = EXTRA_LINK_ARGS,
@@ -665,16 +669,16 @@
  			if (cl > m_settings.tracker_maximum_response_length)
  			{
  				fail(-1, "content-length is greater than maximum response length");
---- deluge-torrent-0.5.8.4-orig/libtorrent/src/enum_net.cpp	2008-02-13 08:50:18.000000000 +0000
-+++ deluge-torrent-0.5.8.4/libtorrent/src/enum_net.cpp	2008-02-26 00:15:48.632041229 +0000
-@@ -43,6 +43,7 @@
- #endif
+--- deluge-torrent-0.5.8.5.orig/libtorrent/src/enum_net.cpp	2008-02-28 01:39:28.000000000 -0500
++++ deluge-torrent-0.5.8.5/libtorrent/src/enum_net.cpp	2008-03-02 22:25:30.035627513 -0500
+@@ -31,6 +31,7 @@
+ */
  
- #include "libtorrent/enum_net.hpp"
+ #include "libtorrent/config.hpp"
 +#include "asio/ip/host_name.hpp"
  
- namespace libtorrent
- {
+ #if defined TORRENT_BSD || defined TORRENT_LINUX
+ #include <sys/ioctl.h>
 --- deluge-torrent-0.5.8.4-orig/libtorrent/src/identify_client.cpp	2008-02-13 05:40:57.000000000 +0000
 +++ deluge-torrent-0.5.8.4/libtorrent/src/identify_client.cpp	2008-02-26 02:18:18.696540565 +0000
 @@ -34,6 +34,7 @@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/deluge-04-sockaddr.diff	Wed Mar 26 06:22:29 2008 +0000
@@ -0,0 +1,22 @@
+--- deluge-torrent-0.5.8.5.orig/libtorrent/src/enum_net.cpp	Wed Mar 26 01:29:40 2008
++++ deluge-torrent-0.5.8.5/libtorrent/src/enum_net.cpp	Wed Mar 26 01:50:02 2008
+@@ -37,6 +37,7 @@
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
++#include <string.h>
+ #elif defined TORRENT_WINDOWS
+ #ifndef WIN32_LEAN_AND_MEAN
+ #define WIN32_LEAN_AND_MEAN
+@@ -155,9 +156,9 @@
+ 				ret.push_back(iface);
+ 			}
+ 
+-#if defined TORRENT_BSD
++#if defined TORRENT_BSD && defined BSD4_4
+ 			int current_size = item.ifr_addr.sa_len + IFNAMSIZ;
+-#elif defined TORRENT_LINUX
++#elif defined TORRENT_LINUX || defined TORRENT_BSD
+ 			int current_size = sizeof(ifreq);
+ #endif
+ 			ifr += current_size;