ports/161963: [MAINTAINER] net-p2p/py26-BitTornado: [SUMMARIZE CHANGES]
Janos Mohacsi
janos.mohacsi at bsd.hu
Mon Oct 24 13:00:03 UTC 2011
>Number: 161963
>Category: ports
>Synopsis: [MAINTAINER] net-p2p/py26-BitTornado: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 24 13:00:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 7.4-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD csoki.ki.iif.hu 7.4-STABLE FreeBSD 7.4-STABLE #2: Mon May 30 17:17:44 CEST 2011
>Description:
[DESCRIBE CHANGES]
make compatible with modern python. "sha
deprecated; use hashlib"
Added file(s):
- files/patch-BitTornado_BT1_StorageWrapper.py
- files/patch-BitTornado_BT1_makemetafile.py
- files/patch-BitTornado_BT1_track.py
- files/patch-BitTornado_BTcrypto.py
- files/patch-BitTornado_____init____.py
- files/patch-BitTornado_download__bt1.py
- files/patch-BitTornado_parsedir.py
- files/patch-btdownloadcurses.py
- files/patch-btdownloadgui.py
- files/patch-btdownloadheadless.py
- files/patch-btrename.py
- files/patch-btshowmetainfo.py
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- py26-BitTornado-0.3.18_6,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/Makefile /usr/ports/net-p2p/py-bittornado/Makefile
--- /usr/ports/net-p2p/py-bittornado.orig/Makefile 2010-04-02 13:02:14.000000000 +0200
+++ /usr/ports/net-p2p/py-bittornado/Makefile 2011-10-24 14:52:17.000000000 +0200
@@ -53,7 +53,7 @@
# required for GUI
.ifndef(WITHOUT_GUI)
USE_WX= 2.4
-WX_COMPS= python
+WX_COMPS= ${PYTHON_CMD}
PLIST_SUB+= GUI=''
EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py
.else
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/extra-patch-BitTornado_BT1_Rerequester.py /usr/ports/net-p2p/py-bittornado/files/extra-patch-BitTornado_BT1_Rerequester.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/extra-patch-BitTornado_BT1_Rerequester.py 2004-10-13 10:34:07.000000000 +0200
+++ /usr/ports/net-p2p/py-bittornado/files/extra-patch-BitTornado_BT1_Rerequester.py 2011-10-24 14:43:10.000000000 +0200
@@ -1,9 +1,18 @@
-$FreeBSD: ports/net-p2p/py-bittornado/files/extra-patch-BitTornado_BT1_Rerequester.py,v 1.1 2004/10/13 08:34:07 edwin Exp $
+$FreeBSD$
---- BitTornado/BT1/Rerequester.py.orig Tue Sep 14 19:32:11 2004
-+++ BitTornado/BT1/Rerequester.py Tue Sep 14 19:33:00 2004
-@@ -115,7 +115,7 @@
+--- BitTornado/BT1/Rerequester.py.orig
++++ BitTornado/BT1/Rerequester.py
+@@ -12,7 +12,7 @@
+ from traceback import print_exc
+ from socket import error, gethostbyname
+ from random import shuffle
+-from sha import sha
++from hashlib import sha1 as sha
+ from time import time
+ try:
+ from os import getpid
+@@ -167,7 +167,7 @@
if self.howmany() >= self.maxpeers:
s += '&numwant=0'
else:
@@ -12,7 +21,7 @@
self.last_failed = True # force true, so will display an error
self.special = specialurl
self.rerequest(s, callback)
-@@ -132,7 +132,7 @@
+@@ -184,7 +184,7 @@
if self.howmany() >= self.maxpeers:
s += '&numwant=0'
else:
@@ -20,11 +29,4 @@
+ s += '&no_peer_id=1'
if event != 3:
s += '&event=' + ['started', 'completed', 'stopped'][event]
-
-@@ -384,4 +384,4 @@
- self.lock.acquire()
- x = self.finished
- self.lock.release()
-- return x
-\ No newline at end of file
-+ return x
+ if event == 2:
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BT1_StorageWrapper.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BT1_StorageWrapper.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BT1_StorageWrapper.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BT1_StorageWrapper.py 2011-10-24 14:45:13.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/BT1/StorageWrapper.py.orig
++++ BitTornado/BT1/StorageWrapper.py
+@@ -2,7 +2,7 @@
+ # see LICENSE.txt for license information
+
+ from BitTornado.bitfield import Bitfield
+-from sha import sha
++from hashlib import sha1 as sha
+ from BitTornado.clock import clock
+ from traceback import print_exc
+ from random import randrange
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BT1_makemetafile.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BT1_makemetafile.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BT1_makemetafile.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BT1_makemetafile.py 2011-10-24 14:44:05.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/BT1/makemetafile.py.orig
++++ BitTornado/BT1/makemetafile.py
+@@ -4,7 +4,7 @@
+
+ from os.path import getsize, split, join, abspath, isdir
+ from os import listdir
+-from sha import sha
++from hashlib import sha1 as sha
+ from copy import copy
+ from string import strip
+ from BitTornado.bencode import bencode
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BT1_track.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BT1_track.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BT1_track.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BT1_track.py 2011-10-24 14:45:50.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/BT1/track.py.orig
++++ BitTornado/BT1/track.py
+@@ -23,7 +23,7 @@
+ from time import time, gmtime, strftime, localtime
+ from BitTornado.clock import clock
+ from random import shuffle, seed, randrange
+-from sha import sha
++from hashlib import sha1 as sha
+ from types import StringType, IntType, LongType, ListType, DictType
+ from binascii import b2a_hex, a2b_hex, a2b_base64
+ from string import lower
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BTcrypto.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BTcrypto.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_BTcrypto.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_BTcrypto.py 2011-10-24 14:39:08.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/BTcrypto.py.orig
++++ BitTornado/BTcrypto.py
+@@ -9,7 +9,7 @@
+ except:
+ seed()
+ urandom = lambda x: ''.join([chr(randint(0,255)) for i in xrange(x)])
+-from sha import sha
++from hashlib import sha1 as sha
+
+ try:
+ True
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_____init____.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_____init____.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_____init____.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_____init____.py 2011-10-24 14:37:39.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/__init__.py.orig
++++ BitTornado/__init__.py
+@@ -5,7 +5,7 @@
+ report_email = version_short+'@degreez.net'
+
+ from types import StringType
+-from sha import sha
++from hashlib import sha1 as sha
+ from time import time, clock
+ try:
+ from os import getpid
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_download__bt1.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_download__bt1.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_download__bt1.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_download__bt1.py 2011-10-24 14:36:10.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/download_bt1.py.orig
++++ BitTornado/download_bt1.py
+@@ -24,7 +24,7 @@
+ from ConfigDir import ConfigDir
+ from bencode import bencode, bdecode
+ from natpunch import UPnP_test
+-from sha import sha
++from hashlib import sha1 as sha
+ from os import path, makedirs, listdir
+ from parseargs import parseargs, formatDefinitions, defaultargs
+ from socket import error as socketerror
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_parsedir.py /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_parsedir.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-BitTornado_parsedir.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-BitTornado_parsedir.py 2011-10-24 14:40:13.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/parsedir.py.orig
++++ BitTornado/parsedir.py
+@@ -3,7 +3,7 @@
+ from bencode import bencode, bdecode
+ from BT1.btformats import check_info
+ from os.path import exists, isfile
+-from sha import sha
++from hashlib import sha1 as sha
+ import sys, os
+
+ try:
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-btdownloadcurses.py /usr/ports/net-p2p/py-bittornado/files/patch-btdownloadcurses.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-btdownloadcurses.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-btdownloadcurses.py 2011-10-24 14:35:11.000000000 +0200
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- btdownloadcurses.py.orig
++++ btdownloadcurses.py
+@@ -23,7 +23,7 @@
+ from threading import Event
+ from os.path import abspath
+ from signal import signal, SIGWINCH
+-from sha import sha
++from hashlib import sha1 as sha
+ from sys import argv, exit
+ import sys
+ from time import time, strftime
+@@ -404,4 +404,4 @@
+ if errlist:
+ print "These errors occurred during execution:"
+ for error in errlist:
+- print error
+\ No newline at end of file
++ print error
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-btdownloadgui.py /usr/ports/net-p2p/py-bittornado/files/patch-btdownloadgui.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-btdownloadgui.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-btdownloadgui.py 2011-10-24 14:33:55.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- btdownloadgui.py.orig
++++ btdownloadgui.py
+@@ -37,7 +37,7 @@
+ from webbrowser import open_new
+ from traceback import print_exc
+ from StringIO import StringIO
+-from sha import sha
++from hashlib import sha1 as sha
+ import re
+ import sys, os
+ from BitTornado import version, createPeerID, report_email
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-btdownloadheadless.py /usr/ports/net-p2p/py-bittornado/files/patch-btdownloadheadless.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-btdownloadheadless.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-btdownloadheadless.py 2011-10-24 14:31:57.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- btdownloadheadless.py.orig
++++ btdownloadheadless.py
+@@ -22,7 +22,7 @@
+ from os.path import abspath
+ from sys import argv, stdout
+ import sys
+-from sha import sha
++from hashlib import sha1 as sha
+ from time import strftime
+ from BitTornado.clock import clock
+ from BitTornado import createPeerID, version
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-btrename.py /usr/ports/net-p2p/py-bittornado/files/patch-btrename.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-btrename.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-btrename.py 2011-10-24 14:48:19.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- btrename.py.orig
++++ btrename.py
+@@ -5,7 +5,7 @@
+
+ from sys import *
+ from os.path import *
+-from sha import *
++from hashlib import sha1 as sha
+ from BitTornado.bencode import *
+
+ NAME, EXT = splitext(basename(argv[0]))
diff -ruN --exclude=CVS /usr/ports/net-p2p/py-bittornado.orig/files/patch-btshowmetainfo.py /usr/ports/net-p2p/py-bittornado/files/patch-btshowmetainfo.py
--- /usr/ports/net-p2p/py-bittornado.orig/files/patch-btshowmetainfo.py 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/py-bittornado/files/patch-btshowmetainfo.py 2011-10-24 14:49:14.000000000 +0200
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- btshowmetainfo.py.orig
++++ btshowmetainfo.py
+@@ -6,7 +6,7 @@
+
+ from sys import *
+ from os.path import *
+-from sha import *
++from hashlib import sha1 as sha
+ from BitTornado.bencode import *
+
+ NAME, EXT = splitext(basename(argv[0]))
--- py26-BitTornado-0.3.18_6,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list