updated patch

This commit is contained in:
Manuel Friedli 2010-08-15 20:18:49 +00:00
parent aba957cf98
commit f59af3bf88
2 changed files with 36 additions and 1 deletions

View File

@ -1,5 +1,5 @@
AUX pymsn-t-0.11.3-delete-reactor.patch 361 RMD160 ef4d492ea177658d7f7e867ef11bab3dde273164 SHA1 4a01f2fc80c287da13422532b2c75ccafa012ae0 SHA256 d989d06d9e94f1a2786dfa51e1cf715e4dc0db95583b08ce606b555aef017bae
AUX pymsn-t-0.11.3-hashlib.patch 875 RMD160 34f46eb4b62945f96abe5ccdad76f23934ed9690 SHA1 54002add8f571e16612a1d1176c4ed88d9692cc1 SHA256 390076d5a1d6509008f517d3a25bfa74ba6078a22b849245409e263c3af89fea
AUX pymsn-t-0.11.3-hashlib.patch 2146 RMD160 66cfcdc69d88932d11589d416e401d000f2b7147 SHA1 7efcae9e66813cb4b63eb4e3bc65180ca5063cdc SHA256 be1da8ff445706a5d1789a636f29906e1bab75c5283944cec4994d2574ff38f7
AUX pymsn-t-0.11.3-initd 683 RMD160 7dfd35f2d31800e04ffd764efc1b65845311d32f SHA1 878d12e1d722d97eca2a9ba001e2dcc8797b4ceb SHA256 df24c7a7f4e8eb394daea3a5b79b0a861f72a2b56ec5c52871fb514d731231b2
AUX pymsn-t-0.11.3-protocol-version.patch 609 RMD160 f7cc7e2f6829861f11016db35a98396d5a0cd7c8 SHA1 7144ebaac17a61767aee92ef1b4e972c86eb5325 SHA256 008aedc95f1c2020a156d941c74784ca1385f12426342885fa7ff8474365b5a3
AUX pymsn-t-0.11.3-remove-pid.patch 1173 RMD160 53c9e2cfc63cd86fd5680059e47caa268802cfc0 SHA1 a6dac3945731183f4821e7f09852f17de3aa850a SHA256 b4a09f2af01f752a2703d14204cb954a0641afedb1be391f1b9f6f980b234845

View File

@ -1,3 +1,38 @@
diff -ru pymsnt-0.11.3-vanilla/src/avatar.py pymsnt-0.11.3/src/avatar.py
--- pymsnt-0.11.3-vanilla/src/avatar.py 2008-02-08 14:55:07.000000000 +0100
+++ pymsnt-0.11.3/src/avatar.py 2010-08-15 22:17:32.000000000 +0200
@@ -5,8 +5,8 @@
from twisted.internet import reactor
from twisted.words.xish.domish import Element
-
-import sha, base64, os, os.path
+from hashlib import sha1
+import base64, os, os.path
import utils
import config
@@ -34,7 +34,7 @@
class Avatar:
""" Represents an Avatar. Does not store the image in memory. """
def __init__(self, imageData, avatarCache):
- self.__imageHash = sha.sha(imageData).hexdigest()
+ self.__imageHash = sha1(imageData).hexdigest()
self.__avatarCache = avatarCache
def getImageHash(self):
diff -ru pymsnt-0.11.3-vanilla/src/legacy/msn/msnp11chl.py pymsnt-0.11.3/src/legacy/msn/msnp11chl.py
--- pymsnt-0.11.3-vanilla/src/legacy/msn/msnp11chl.py 2008-02-08 14:55:07.000000000 +0100
+++ pymsnt-0.11.3/src/legacy/msn/msnp11chl.py 2010-08-15 22:17:56.000000000 +0200
@@ -1,7 +1,7 @@
# Copyright 2005 James Bunton <james@delx.cjb.net>
# Licensed for distribution under the GPL version 2, check COPYING for details
-import md5
+from hashlib import md5
import struct
MSNP11_PRODUCT_ID = "PROD0090YUAUV{2B"
diff -ru pymsnt-0.11.3-vanilla/src/utils.py pymsnt-0.11.3/src/utils.py
--- pymsnt-0.11.3-vanilla/src/utils.py 2008-02-08 14:55:07.000000000 +0100
+++ pymsnt-0.11.3/src/utils.py 2010-08-15 22:12:36.000000000 +0200