summaryrefslogtreecommitdiff
path: root/net/bittorrent/patches
diff options
context:
space:
mode:
Diffstat (limited to 'net/bittorrent/patches')
-rw-r--r--net/bittorrent/patches/patch-aa27
-rw-r--r--net/bittorrent/patches/patch-ab13
-rw-r--r--net/bittorrent/patches/patch-ac32
-rw-r--r--net/bittorrent/patches/patch-ad302
-rw-r--r--net/bittorrent/patches/patch-ae20
-rw-r--r--net/bittorrent/patches/patch-af13
6 files changed, 13 insertions, 394 deletions
diff --git a/net/bittorrent/patches/patch-aa b/net/bittorrent/patches/patch-aa
index 6ab73c369f5..95e508dd446 100644
--- a/net/bittorrent/patches/patch-aa
+++ b/net/bittorrent/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.5 2005/02/13 13:53:34 recht Exp $
+$NetBSD: patch-aa,v 1.6 2005/03/28 14:43:10 recht Exp $
---- setup.py.orig Mon Mar 17 20:34:41 2003
-+++ setup.py
-@@ -18,9 +18,9 @@ setup(
-
- packages = ["BitTorrent"],
+--- setup.py.orig Mon Mar 28 16:23:38 2005
++++ setup.py Mon Mar 28 16:26:30 2005
+@@ -19,8 +19,8 @@
+
+ import glob
+
+-scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py",
+- "btmaketorrentgui.py", "btmaketorrent.py",
++scripts = ["btdownloadcurses.py", "btdownloadheadless.py",
++ "btmaketorrent.py",
+ "btlaunchmany.py", "btlaunchmanycurses.py",
+ "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py"]
-- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py",
-+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.py",
- "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
-- "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py",
-+ "btdownloadcurses.py", "btlaunchmanycurses.py",
- "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
- "bttest.py"]
- )
diff --git a/net/bittorrent/patches/patch-ab b/net/bittorrent/patches/patch-ab
deleted file mode 100644
index 781f509d4dd..00000000000
--- a/net/bittorrent/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/02/13 13:53:34 recht Exp $
-
---- btreannounce.py.orig Mon Mar 17 20:26:40 2003
-+++ btreannounce.py
-@@ -3,7 +3,7 @@
- # Written by Henry 'Pi' James and Bram Cohen
- # see LICENSE.txt for license information
-
--from sys import argv
-+from sys import argv, exit
- from BitTorrent.bencode import bencode, bdecode
-
- if len(argv) < 3:
diff --git a/net/bittorrent/patches/patch-ac b/net/bittorrent/patches/patch-ac
deleted file mode 100644
index a4a6c8596af..00000000000
--- a/net/bittorrent/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/02/13 13:53:34 recht Exp $
-
---- BitTorrent/Rerequester.py.orig Sat Apr 3 06:10:45 2004
-+++ BitTorrent/Rerequester.py
-@@ -5,7 +5,7 @@ from zurllib import urlopen, quote
- from btformats import check_peers
- from bencode import bdecode
- from threading import Thread, Lock
--from socket import error
-+from socket import error, gethostbyname
- from time import time
- from random import randrange
- from binascii import b2a_hex
-@@ -18,8 +18,7 @@ class Rerequester:
- self.url = ('%s?info_hash=%s&peer_id=%s&port=%s&key=%s' %
- (url, quote(infohash), quote(myid), str(port),
- b2a_hex(''.join([chr(randrange(256)) for i in xrange(4)]))))
-- if ip != '':
-- self.url += '&ip=' + quote(ip)
-+ self.ip = ip
- self.interval = interval
- self.last = None
- self.trackerid = None
-@@ -81,6 +80,8 @@ class Rerequester:
-
- def rerequest(self, url, set):
- try:
-+ if self.ip:
-+ url += '&ip=' + gethostbyname(self.ip)
- h = urlopen(url)
- r = h.read()
- h.close()
diff --git a/net/bittorrent/patches/patch-ad b/net/bittorrent/patches/patch-ad
deleted file mode 100644
index f3e83986263..00000000000
--- a/net/bittorrent/patches/patch-ad
+++ /dev/null
@@ -1,302 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/02/13 13:53:34 recht Exp $
-
---- BitTorrent/track.py.orig Sun Mar 21 20:33:17 2004
-+++ BitTorrent/track.py
-@@ -37,12 +37,15 @@ defaults = [
- 'minimum time it must have been since the last flush to do another one'),
- ('allowed_dir', '', 'only allow downloads for .torrents in this dir'),
- ('parse_allowed_interval', 15, 'minutes between reloading of allowed_dir'),
-+ ('show_infopage', 1, "whether to display an info page when the tracker's root dir is loaded"),
-+ ('infopage_redirect', '', 'a URL to redirect the info page to'),
- ('show_names', 1, 'whether to display names from allowed dir'),
- ('favicon', '', 'file containing x-icon data to return when browser requests favicon.ico'),
- ('only_local_override_ip', 1, "ignore the ip GET parameter from machines which aren't on local network IPs"),
- ('logfile', '', 'file to write the tracker logs, use - for stdout (default)'),
- ('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'),
- ('keep_dead', 0, 'keep dead torrents after they expire (so they still show up on your /scrape and web page)'),
-+ ('scrape_allowed', 'full', 'scrape access allowed (can be none, specific or full)'),
- ('max_give', 200, 'maximum number of peers to give with any one request'),
- ]
-
-@@ -124,11 +127,11 @@ class Tracker:
- favicon = config['favicon']
- self.favicon = None
- if favicon:
-- if isfile(favicon):
-+ try:
- h = open(favicon, 'rb')
- self.favicon = h.read()
- h.close()
-- else:
-+ except:
- print "**warning** specified favicon file -- %s -- does not exist." % favicon
- self.rawserver = rawserver
- self.becache1 = {}
-@@ -190,6 +193,130 @@ class Tracker:
- self.uq_broken = 0
- self.keep_dead = config['keep_dead']
-
-+ def get_infopage(self):
-+ if not self.config['show_infopage']:
-+ return (404, 'Not Found', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, alas)
-+ red = self.config['infopage_redirect']
-+ if red != '':
-+ return (302, 'Found', {'Content-Type': 'text/html', 'Location': red},
-+ '<A HREF="'+red+'">Click Here</A>')
-+
-+ s = StringIO()
-+ s.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n' \
-+ '<html><head><title>BitTorrent download info</title>\n')
-+ if self.favicon != None:
-+ s.write('<link rel="shortcut icon" href="/favicon.ico" />\n')
-+ s.write('</head>\n<body>\n' \
-+ '<h3>BitTorrent download info</h3>\n'\
-+ '<ul>\n'
-+ '<li><strong>tracker version:</strong> %s</li>\n' \
-+ '<li><strong>server time:</strong> %s</li>\n' \
-+ '</ul>\n' % (version, isotime()))
-+ names = self.downloads.keys()
-+ if not names:
-+ s.write('<p>not tracking any files yet...</p>\n')
-+ else:
-+ names.sort()
-+ tn = 0
-+ tc = 0
-+ td = 0
-+ tt = 0 # Total transferred
-+ ts = 0 # Total size
-+ nf = 0 # Number of files displayed
-+ uc = {}
-+ ud = {}
-+ if self.allowed != None and self.show_names:
-+ s.write('<table summary="files" border="1">\n' \
-+ '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n')
-+ else:
-+ s.write('<table summary="files">\n' \
-+ '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n')
-+ for name in names:
-+ l = self.downloads[name]
-+ n = self.completed.get(name, 0)
-+ tn = tn + n
-+ lc = []
-+ for i in l.values():
-+ if type(i) == DictType:
-+ if i['left'] == 0:
-+ lc.append(1)
-+ uc[i['ip']] = 1
-+ else:
-+ ud[i['ip']] = 1
-+ c = len(lc)
-+ tc = tc + c
-+ d = len(l) - c
-+ td = td + d
-+ if self.allowed != None and self.show_names:
-+ if self.allowed.has_key(name):
-+ nf = nf + 1
-+ sz = self.allowed[name]['length'] # size
-+ ts = ts + sz
-+ szt = sz * n # Transferred for this torrent
-+ tt = tt + szt
-+ if self.allow_get == 1:
-+ linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>'
-+ else:
-+ linkname = self.allowed[name]['name']
-+ s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \
-+ % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt)))
-+ else:
-+ s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \
-+ % (b2a_hex(name), c, d, n))
-+ ttn = 0
-+ for i in self.completed.values():
-+ ttn = ttn + i
-+ if self.allowed != None and self.show_names:
-+ s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n'
-+ % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt)))
-+ else:
-+ s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n'
-+ % (nf, len(uc), tc, len(ud), td, tn, ttn))
-+ s.write('</table>\n' \
-+ '<ul>\n' \
-+ '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \
-+ '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \
-+ '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \
-+ '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \
-+ '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \
-+ '</ul>\n')
-+ s.write('</body>\n' \
-+ '</html>\n')
-+ return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue())
-+
-+ def scrapedata(self, name, return_name = True):
-+ l = self.downloads[name]
-+ n = self.completed.get(name, 0)
-+ c = len([1 for i in l.values() if i['left'] == 0])
-+ d = len(l) - c
-+ f = {'complete': c, 'incomplete': d, 'downloaded': n}
-+ if ( return_name and self.show_names
-+ and self.allowed is not None and self.allowed.has_key(name) ):
-+ f['name'] = self.allowed[name]['name']
-+ return (f)
-+
-+ def get_scrape(self, paramslist):
-+ fs = {}
-+ if paramslist.has_key('info_hash'):
-+ if self.config['scrape_allowed'] not in ['specific', 'full']:
-+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'},
-+ bencode({'failure reason':
-+ 'specific scrape function is not available with this tracker.'}))
-+ for infohash in paramslist['info_hash']:
-+ if infohash in self.downloads.keys():
-+ fs[infohash] = self.scrapedata(infohash)
-+ else:
-+ if self.config['scrape_allowed'] != 'full':
-+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'},
-+ bencode({'failure reason':
-+ 'full scrape function is not available with this tracker.'}))
-+ names = self.downloads.keys()
-+ names.sort()
-+ for name in names:
-+ fs[name] = self.scrapedata(name)
-+
-+ return (200, 'OK', {'Content-Type': 'text/plain'}, bencode({'files': fs}))
-+
- def get(self, connection, path, headers):
- try:
- (scheme, netloc, path, pars, query, fragment) = urlparse(path)
-@@ -197,117 +324,22 @@ class Tracker:
- path = path.replace('+',' ')
- query = query.replace('+',' ')
- path = unquote(path)[1:]
-+ paramslist = {}
- params = {}
- for s in query.split('&'):
- if s != '':
- i = s.index('=')
-- params[unquote(s[:i])] = unquote(s[i+1:])
-+ kw = unquote(s[:i])
-+ key, value = unquote(s[:i]), unquote(s[i+1:])
-+ paramslist.setdefault(key, []).append(value)
-+ params[key] = value
- except ValueError, e:
- return (400, 'Bad Request', {'Content-Type': 'text/plain'},
- 'you sent me garbage - ' + str(e))
- if path == '' or path == 'index.html':
-- s = StringIO()
-- s.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n' \
-- '<html><head><title>BitTorrent download info</title>\n')
-- if self.favicon != None:
-- s.write('<link rel="shortcut icon" href="/favicon.ico" />\n')
-- s.write('</head>\n<body>\n' \
-- '<h3>BitTorrent download info</h3>\n'\
-- '<ul>\n'
-- '<li><strong>tracker version:</strong> %s</li>\n' \
-- '<li><strong>server time:</strong> %s</li>\n' \
-- '</ul>\n' % (version, isotime()))
-- names = self.downloads.keys()
-- if names:
-- names.sort()
-- tn = 0
-- tc = 0
-- td = 0
-- tt = 0 # Total transferred
-- ts = 0 # Total size
-- nf = 0 # Number of files displayed
-- uc = {}
-- ud = {}
-- if self.allowed != None and self.show_names:
-- s.write('<table summary="files" border="1">\n' \
-- '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n')
-- else:
-- s.write('<table summary="files">\n' \
-- '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n')
-- for name in names:
-- l = self.downloads[name]
-- n = self.completed.get(name, 0)
-- tn = tn + n
-- lc = []
-- for i in l.values():
-- if type(i) == DictType:
-- if i['left'] == 0:
-- lc.append(1)
-- uc[i['ip']] = 1
-- else:
-- ud[i['ip']] = 1
-- c = len(lc)
-- tc = tc + c
-- d = len(l) - c
-- td = td + d
-- if self.allowed != None and self.show_names:
-- if self.allowed.has_key(name):
-- nf = nf + 1
-- sz = self.allowed[name]['length'] # size
-- ts = ts + sz
-- szt = sz * n # Transferred for this torrent
-- tt = tt + szt
-- if self.allow_get == 1:
-- linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>'
-- else:
-- linkname = self.allowed[name]['name']
-- s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \
-- % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt)))
-- else:
-- s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \
-- % (b2a_hex(name), c, d, n))
-- ttn = 0
-- for i in self.completed.values():
-- ttn = ttn + i
-- if self.allowed != None and self.show_names:
-- s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n'
-- % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt)))
-- else:
-- s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n'
-- % (nf, len(uc), tc, len(ud), td, tn, ttn))
-- s.write('</table>\n' \
-- '<ul>\n' \
-- '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \
-- '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \
-- '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \
-- '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \
-- '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \
-- '</ul>\n')
-- else:
-- s.write('<p>not tracking any files yet...</p>\n')
-- s.write('</body>\n' \
-- '</html>\n')
-- return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue())
-+ return self.get_infopage()
- elif path == 'scrape':
-- fs = {}
-- names = []
-- if params.has_key('info_hash'):
-- if self.downloads.has_key(params['info_hash']):
-- names = [ params['info_hash'] ]
-- # else return nothing
-- else:
-- names = self.downloads.keys()
-- names.sort()
-- for name in names:
-- l = self.downloads[name]
-- n = self.completed.get(name, 0)
-- c = len([1 for i in l.values() if type(i) == DictType and i['left'] == 0])
-- d = len(l) - c
-- fs[name] = {'complete': c, 'incomplete': d, 'downloaded': n}
-- if (self.allowed is not None) and self.allowed.has_key(name) and self.show_names:
-- fs[name]['name'] = self.allowed[name]['name']
-- r = {'files': fs}
-- return (200, 'OK', {'Content-Type': 'text/plain'}, bencode(r))
-+ return self.get_scrape(paramslist)
- elif (path == 'file') and (self.allow_get == 1) and params.has_key('info_hash') and self.allowed.has_key(params['info_hash']):
- hash = params['info_hash']
- fname = self.allowed[hash]['file']
-@@ -506,9 +538,9 @@ def size_format(s):
- r = str(s) + 'B'
- elif (s < 1048576):
- r = str(int(s/1024)) + 'KiB'
-- elif (s < 1073741824l):
-+ elif (s < 1073741824L):
- r = str(int(s/1048576)) + 'MiB'
-- elif (s < 1099511627776l):
-+ elif (s < 1099511627776L):
- r = str(int((s/1073741824.0)*100.0)/100.0) + 'GiB'
- else:
- r = str(int((s/1099511627776.0)*100.0)/100.0) + 'TiB'
diff --git a/net/bittorrent/patches/patch-ae b/net/bittorrent/patches/patch-ae
deleted file mode 100644
index a26c9342a8c..00000000000
--- a/net/bittorrent/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/02/13 13:53:34 recht Exp $
-
---- BitTorrent/zurllib.py.orig Fri Jun 27 02:40:21 2003
-+++ BitTorrent/zurllib.py
-@@ -35,7 +35,14 @@ class HTTPContentEncodingHandler(HTTPHan
- if DEBUG:
- pprint.pprint(headers.dict)
- url = fp.url
-- return addinfourldecompress(fp, headers, url)
-+ resp = addinfourldecompress(fp, headers, url)
-+ # As of Python 2.4 http_open response also has 'code' and 'msg'
-+ # members, and HTTPErrorProcessor breaks if they don't exist.
-+ if 'code' in dir(fp):
-+ resp.code = fp.code
-+ if 'msg' in dir(fp):
-+ resp.msg = fp.msg
-+ return resp
-
-
- class addinfourldecompress(addinfourl):
diff --git a/net/bittorrent/patches/patch-af b/net/bittorrent/patches/patch-af
deleted file mode 100644
index 4d18bef8558..00000000000
--- a/net/bittorrent/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/02/13 13:53:34 recht Exp $
-
---- btcompletedir.py.orig Wed Mar 3 18:44:28 2004
-+++ btcompletedir.py
-@@ -30,6 +30,8 @@ def completedir(files, url, flag = Event
- subtotal[0] += x
- vc(float(subtotal[0]) / total)
- for i in togen:
-+ if flag.isSet():
-+ break
- t = split(i)
- if t[1] == '':
- i = t[0]
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 06:13:43 +0000