Update to 0.3.10 and while doing that remove patch-ab because there

are problems with some network configuration. phone agreed to reomve it.
Add 24 to PYTHON_VERSIONS_ACCEPTED, because it works since version 0.3.9
with Python 2.4.
Approved by wiz.

Release notes:
- 0.3.9
Ever since the Python people released a new revision of their rather
intriguing programming language, I've had people bugging me to put out a
new version (especially since there were issues with running the 0.3.8
codebase under it).
I'd been waiting for a version of wxPython for Windows that would work
with the new Python to be released as well, and now that it has, well,
here you go!
This version also fixes a few other bugs; the number of upload slots is
now proper, and firewalled peers that lose all their connections will find
themselves reconnecting more quickly, and a few other problems were fixed.
I did hold back a number of fixes and improvements pending work on 0.4.0.
Otherwise I'd wind up having to update two separate branches of code,
something I'd really rather not do. (Forking your own code can suck
badly.) So the window-width problem still isn't fixed. Oh well.

- 0.3.9a
The T-0.3.9a release contains a bugfix for the tracker, and the modified
installer includes a DLL which is missing on some people's systems. If
you're already successfully running T-0.3.9 on your system, there's no
need to upgrade.

- 0.3.9b
This contains another fix to the tracker codebase. No change was made to
client functionality.

- 0.3.10
The latest update should fix the problem with the client getting stuck in
the task manager under Windows. The pause system has been rewritten, and
no longer halts the engine; it should work properly without freezing up
now on machines w/ limits on the maximum number of connections that can
be kept open. A few other bugs have been fixed, though the GUI width
problem hasn't (and may not until the GUI is rewritten). Another stupid
bug, where the download time estimate isn't blanked when the client is
paused, will be fixed in the next version.

4 files changed, 16 insertions, 55 deletions

diff --git a/net/bittornado/Makefile.common b/net/bittornado/Makefile.common
index e850ee10616..7f84c324578 100644
--- a/net/bittornado/Makefile.common
+++ b/net/bittornado/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2005/01/23 20:41:48 recht Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/01/28 16:19:17 veego Exp $
 #
 
-DISTNAME=		BitTornado-0.3.8
-PKGREVISION=		1
+DISTNAME=		BitTornado-0.3.10
 CATEGORIES=		net
 MASTER_SITES=		http://www.bittornado.com/download/
 
@@ -17,4 +16,4 @@ PATCHDIR=		${.CURDIR}/../../net/bittornado/patches
 WRKSRC=			${WRKDIR}/BitTornado-CVS
 USE_BUILDLINK3=		yes
 
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/net/bittornado/PLIST b/net/bittornado/PLIST
index 0a4e035754b..b8b478d7273 100644
--- a/net/bittornado/PLIST
+++ b/net/bittornado/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/30 12:31:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/01/28 16:19:17 veego Exp $
 bin/bt-t-make.py
 bin/btcompletedir.py
 bin/btcopyannounce.py
@@ -30,6 +30,9 @@ ${PYSITELIB}/BitTornado/BT1/Encrypter.pyo
 ${PYSITELIB}/BitTornado/BT1/FileSelector.py
 ${PYSITELIB}/BitTornado/BT1/FileSelector.pyc
 ${PYSITELIB}/BitTornado/BT1/FileSelector.pyo
+${PYSITELIB}/BitTornado/BT1/Filter.py
+${PYSITELIB}/BitTornado/BT1/Filter.pyc
+${PYSITELIB}/BitTornado/BT1/Filter.pyo
 ${PYSITELIB}/BitTornado/BT1/HTTPDownloader.py
 ${PYSITELIB}/BitTornado/BT1/HTTPDownloader.pyc
 ${PYSITELIB}/BitTornado/BT1/HTTPDownloader.pyo
@@ -129,6 +132,9 @@ ${PYSITELIB}/BitTornado/download_bt1.pyo
 ${PYSITELIB}/BitTornado/inifile.py
 ${PYSITELIB}/BitTornado/inifile.pyc
 ${PYSITELIB}/BitTornado/inifile.pyo
+${PYSITELIB}/BitTornado/iprangeparse.py
+${PYSITELIB}/BitTornado/iprangeparse.pyc
+${PYSITELIB}/BitTornado/iprangeparse.pyo
 ${PYSITELIB}/BitTornado/launchmanycore.py
 ${PYSITELIB}/BitTornado/launchmanycore.pyc
 ${PYSITELIB}/BitTornado/launchmanycore.pyo
@@ -150,6 +156,9 @@ ${PYSITELIB}/BitTornado/selectpoll.pyo
 ${PYSITELIB}/BitTornado/subnetparse.py
 ${PYSITELIB}/BitTornado/subnetparse.pyc
 ${PYSITELIB}/BitTornado/subnetparse.pyo
+${PYSITELIB}/BitTornado/torrentlistparse.py
+${PYSITELIB}/BitTornado/torrentlistparse.pyc
+${PYSITELIB}/BitTornado/torrentlistparse.pyo
 ${PYSITELIB}/BitTornado/zurllib.py
 ${PYSITELIB}/BitTornado/zurllib.pyc
 ${PYSITELIB}/BitTornado/zurllib.pyo
diff --git a/net/bittornado/distinfo b/net/bittornado/distinfo
index ed2d5c74c83..421b555d6f8 100644
--- a/net/bittornado/distinfo
+++ b/net/bittornado/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/12/07 04:23:59 mrg Exp $
+$NetBSD: distinfo,v 1.4 2005/01/28 16:19:17 veego Exp $
 
-SHA1 (BitTornado-0.3.8.tar.gz) = efb5d51b391e8758bdebf959a485e186ad5579f8
-Size (BitTornado-0.3.8.tar.gz) = 220481 bytes
+SHA1 (BitTornado-0.3.10.tar.gz) = 9b39bdf17fa4af82972b79e0d16e0a01adc5d1e9
+Size (BitTornado-0.3.10.tar.gz) = 188565 bytes
 SHA1 (patch-aa) = a88096122a34776b72dfc18f1d95a1736c71b54b
-SHA1 (patch-ab) = 0dd8a5b442047fa0c4040b808b494301dbbc942b
diff --git a/net/bittornado/patches/patch-ab b/net/bittornado/patches/patch-ab
deleted file mode 100644
index 75d1231da9b..00000000000
--- a/net/bittornado/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/12/07 04:23:59 mrg Exp $
-
---- BitTornado/SocketHandler.py.orig	2004-07-11 05:28:58.000000000 +1000
-+++ BitTornado/SocketHandler.py	2004-12-06 14:22:13.000000000 +1100
-@@ -142,7 +142,7 @@
-             if k.socket is not None:
-                 self._close_socket(k)
- 
--    def bind(self, port, bind = '', reuse = False, ipv6_socket_style = 1, upnp = 0):
-+    def bind(self, port, bind = '', reuse = True, ipv6_socket_style = 1, upnp = 0):
-         port = int(port)
-         addrinfos = []
-         self.servers = {}
-@@ -173,6 +173,10 @@
-                 if reuse:
-                     server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-                 server.setblocking(0)
-+		try:
-+		    server.setsockopt(socket.IPPROTO_IP, socket.IP_TOS, 8)
-+		except:
-+		    pass
-                 server.bind(addrinfo[4])
-                 self.servers[server.fileno()] = server
-                 if bind:
-@@ -203,7 +207,7 @@
-             self.port_forwarded = port
-         self.port = port
- 
--    def find_and_bind(self, minport, maxport, bind = '', reuse = False,
-+    def find_and_bind(self, minport, maxport, bind = '', reuse = True,
-                       ipv6_socket_style = 1, upnp = 0, randomizer = False):
-         e = 'maxport less than minport - no ports to check'
-         if maxport-minport < 50 or not randomizer:
-@@ -236,6 +240,12 @@
-             handler = self.handler
-         sock = socket.socket(socktype, socket.SOCK_STREAM)
-         sock.setblocking(0)
-+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-+	try:
-+	    server.setsockopt(socket.IPPROTO_IP, socket.IP_TOS, 8)
-+	except:
-+	    pass
-+        sock.bind(('', self.port))
-         try:
-             sock.connect_ex(dns)
-         except socket.error: