diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2010-11-06 08:13:18 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2010-11-06 08:13:18 +0000 |
| commit | 3b48f626c031c95b8c11480f54c76ae925d6363f (patch) | |
| tree | 5d5fec7b8291b6c0b8420786509c618d89b9ccbc /net-im | |
| parent | Update to 2.0.5 (diff) | |
Fix for deprecation warning when used with python 2.6
Notes
Notes:
svn path=/head/; revision=264145
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/pebrot/Makefile | 1 | ||||
| -rw-r--r-- | net-im/pebrot/files/patch-MSN.py | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/net-im/pebrot/Makefile b/net-im/pebrot/Makefile index 73d5b804ec6f..4823c08999ad 100644 --- a/net-im/pebrot/Makefile +++ b/net-im/pebrot/Makefile @@ -6,6 +6,7 @@ PORTNAME= pebrot PORTVERSION= 0.8.9 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= SF diff --git a/net-im/pebrot/files/patch-MSN.py b/net-im/pebrot/files/patch-MSN.py new file mode 100644 index 000000000000..ec47fa6c005c --- /dev/null +++ b/net-im/pebrot/files/patch-MSN.py @@ -0,0 +1,29 @@ +--- pypebrot/MSN.py.orig 2009-01-28 05:21:19.000000000 +0800 ++++ pypebrot/MSN.py 2010-11-06 16:09:40.000000000 +0800 +@@ -4,7 +4,7 @@ + import os + import re + import socket +-import md5 ++import hashlib + import urllib + import select + import errno +@@ -729,7 +729,7 @@ + self.send( 'CHG', '%s\r\n' % state ) + + def challenge( self, msg ): +- chunk= md5.new( msg.fields['hash']+ 'Q1P7W2E4J9R8U3S5' ).hexdigest() ++ chunk= hashlib.md5( msg.fields['hash']+ 'Q1P7W2E4J9R8U3S5' ).hexdigest() + self.send( 'QRY', 'msmsgs@msnmsgr.com 32\r\n%s' % chunk ) + + def ping( self ): +@@ -1107,7 +1107,7 @@ + elif ( msg.type == 'USR' ): + if msg.fields['type'] == 'MD5': + hash= msg.fields['arg2'] +- chunk= md5.new( hash + self.passwd ).hexdigest() ++ chunk= hashlib.md5( hash + self.passwd ).hexdigest() + self.send( 'USR', 'MD5 S %s\r\n' % chunk ) + elif msg.fields['type'] == 'TWN': + text= split(msg.st)[4] |