From 6f7d4f82416786f7e4667279c40d3c7f9402df75 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Mon, 19 Mar 2012 17:10:28 +0000
Subject: [PATCH] removed this version, as the one in the tree seems to work.

---
 net-im/pymsn-t/Manifest                       |   8 --
 .../files/pymsn-t-0.11.3-delete-reactor.patch |  10 --
 .../files/pymsn-t-0.11.3-hashlib.patch        | 111 ------------------
 net-im/pymsn-t/files/pymsn-t-0.11.3-initd     |  23 ----
 .../pymsn-t-0.11.3-protocol-version.patch     |  12 --
 .../files/pymsn-t-0.11.3-remove-pid.patch     |  41 -------
 .../files/pymsn-t-0.11.3-unexpected-xfr.patch |  44 -------
 net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild       |  73 ------------
 8 files changed, 322 deletions(-)
 delete mode 100644 net-im/pymsn-t/Manifest
 delete mode 100644 net-im/pymsn-t/files/pymsn-t-0.11.3-delete-reactor.patch
 delete mode 100644 net-im/pymsn-t/files/pymsn-t-0.11.3-hashlib.patch
 delete mode 100644 net-im/pymsn-t/files/pymsn-t-0.11.3-initd
 delete mode 100644 net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch
 delete mode 100644 net-im/pymsn-t/files/pymsn-t-0.11.3-remove-pid.patch
 delete mode 100644 net-im/pymsn-t/files/pymsn-t-0.11.3-unexpected-xfr.patch
 delete mode 100644 net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild

diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
deleted file mode 100644
index b187152..0000000
--- a/net-im/pymsn-t/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX pymsn-t-0.11.3-delete-reactor.patch 361 RMD160 ef4d492ea177658d7f7e867ef11bab3dde273164 SHA1 4a01f2fc80c287da13422532b2c75ccafa012ae0 SHA256 d989d06d9e94f1a2786dfa51e1cf715e4dc0db95583b08ce606b555aef017bae
-AUX pymsn-t-0.11.3-hashlib.patch 3904 RMD160 cca534a03990025de5bf6574fad8bf3bd370c7d8 SHA1 8d2ee0012dc45f6e68499fdc70be77ff0009000d SHA256 f82767a942d9b57823883b6920c4b320bc717441bd15e63ec4438bece29de81b
-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
-AUX pymsn-t-0.11.3-unexpected-xfr.patch 1984 RMD160 b4439b435857a4bd4eb0ff4a7b75572ef4413f7b SHA1 abccc3a11a7571e6f17de91c001f8f07e300c20e SHA256 0407e9e69684275b11d404e77e9b70e694e461d4c9891ee3c7d79717999a84e9
-DIST pymsnt-0.11.3.tar.gz 162549 RMD160 59e2af9eee9aa1d5b7a408b05fd520f0355556e1 SHA1 093ce984446f9edeec9d9d35a07a3958f5f656b1 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c
-EBUILD pymsn-t-0.11.3-r4.ebuild 2071 RMD160 3180b606a2e037ff1a01fae8546cf4ddb928b312 SHA1 ecc13da767ee7be4e45639368d9028e872dac134 SHA256 aa7c38c4f9130fd9961ad9f335bbf7e83749214651e25b828a97b3db64d88348
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-delete-reactor.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-delete-reactor.patch
deleted file mode 100644
index 19ad24f..0000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.3-delete-reactor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pymsn-t/src/main.py	2008-09-19 10:53:30.000000000 +0200
-+++ pymsn-t/src/main.py	2008-09-19 10:55:55.000000000 +0200
-@@ -72,7 +72,6 @@
- 
- if config.reactor:
- 	# They picked their own reactor. Lets install it.
--	del sys.modules["twisted.internet.reactor"]
- 	if config.reactor == "epoll":
- 		from twisted.internet import epollreactor
- 		epollreactor.install()
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-hashlib.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-hashlib.patch
deleted file mode 100644
index dfb5ee7..0000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.3-hashlib.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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/msn.py pymsnt-0.11.3/src/legacy/msn/msn.py
---- pymsnt-0.11.3-vanilla/src/legacy/msn/msn.py	2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3/src/legacy/msn/msn.py	2010-08-15 22:22:18.000000000 +0200
-@@ -106,7 +106,8 @@
- 
- 
- # System imports
--import types, operator, os, sys, base64, random, struct, random, sha, base64, StringIO, array, codecs, binascii
-+import types, operator, os, sys, base64, random, struct, random, base64, StringIO, array, codecs, binascii
-+from hashlib import sha1
- from urllib import quote, unquote
- 
- 
-@@ -490,7 +491,7 @@
-         self.type = 3
-         self.location = "TMP" + str(random.randint(1000,9999))
-         self.friendly = "AAA="
--        self.sha1d = b64enc(sha.sha(imageData).digest())
-+        self.sha1d = b64enc(sha1(imageData).digest())
-         self.makeText()
-     
-     def setNull(self):
-@@ -518,7 +519,7 @@
-         h.append(self.friendly)
-         h.append("SHA1D")
-         h.append(self.sha1d)
--        sha1c = b64enc(sha.sha("".join(h)).digest())
-+        sha1c = b64enc(sha1("".join(h)).digest())
-         self.text = '<msnobj Creator="%s" Size="%s" Type="%s" Location="%s" Friendly="%s" SHA1D="%s" SHA1C="%s"/>' % (self.creator, str(self.size), str(self.type), self.location, self.friendly, self.sha1d, sha1c)
-     
-     def parse(self, s):
-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:34:02.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"
-@@ -10,7 +10,7 @@
- 
- 
- def doChallenge(chlData):
--	md5digest = md5.md5(chlData + MSNP11_PRODUCT_KEY).digest()
-+	md5digest = md5(chlData + MSNP11_PRODUCT_KEY).digest()
- 
- 	# Make array of md5 string ints
- 	md5Ints = struct.unpack("<llll", md5digest)
-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
-@@ -7,9 +7,9 @@
- 	return el.getAttribute((u'http://www.w3.org/XML/1998/namespace', u'lang'))
- 
- 
--import sha
-+from hashlib import sha1
- def socks5Hash(sid, initiator, target):
--	return sha.new("%s%s%s" % (sid, initiator, target)).hexdigest()
-+	return sha1.new("%s%s%s" % (sid, initiator, target)).hexdigest()
- 
- 
- import urllib
-diff -ru pymsnt-0.11.3-vanilla/src/xdb.py pymsnt-0.11.3/src/xdb.py
---- pymsnt-0.11.3-vanilla/src/xdb.py	2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3/src/xdb.py	2010-08-15 22:33:14.000000000 +0200
-@@ -6,7 +6,7 @@
- import os
- import os.path
- import shutil
--import md5
-+from hashlib import md5
- import config
- 
- X = os.path.sep
-@@ -23,7 +23,7 @@
- 	return file.replace("@", "%")
- 
- def makeHash(file):
--	return md5.md5(file).hexdigest()[0:3]
-+	return md5(file).hexdigest()[0:3]
- 
- 
- class XDB:
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-initd b/net-im/pymsn-t/files/pymsn-t-0.11.3-initd
deleted file mode 100644
index 1f48109..0000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.3-initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/files/pymsn-t-0.11.2-initd,v 1.2 2007/06/04 20:48:44 griffon26 Exp $
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting MSN Jabber Transport"
-	start-stop-daemon --start --pidfile /var/run/jabber/pymsn-t.pid --chuid jabber:jabber \
-		--exec /usr/bin/python INSPATH/pymsn-t.py -- \
-		-b -c /etc/jabber/pymsn-t.xml -l /var/log/jabber/pymsn-t.log
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping MSN Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid
-	eend $?
-}
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch
deleted file mode 100644
index ffb6ae8..0000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.3-protocol-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -a -u -d -r pymsnt.a/src/legacy/msn/msn.py pymsnt.b/src/legacy/msn/msn.py
---- pymsnt.a/src/legacy/msn/msn.py	2008-02-08 16:55:07.000000000 +0300
-+++ pymsnt.b/src/legacy/msn/msn.py	2008-08-05 20:40:46.000000000 +0400
-@@ -110,7 +110,7 @@
- from urllib import quote, unquote
- 
- 
--MSN_PROTOCOL_VERSION = "MSNP11 CVR0"      # protocol version
-+MSN_PROTOCOL_VERSION = "MSNP11"      # protocol version
- MSN_PORT             = 1863               # default dispatch server port
- MSN_MAX_MESSAGE      = 1664               # max message length
- MSN_CVR_STR          = "0x040c winnt 5.1 i386 MSNMSGR 7.0.0777 msmsgs"
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-remove-pid.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-remove-pid.patch
deleted file mode 100644
index fb85d04..0000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.3-remove-pid.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- pymsn-t/src/main.py	2008-04-04 17:45:43.000000000 +0400
-+++ pymsn-t/src/main.py	2008-08-05 17:44:17.000000000 +0400
-@@ -91,6 +91,7 @@
- from twisted.words.xish.domish import Element
- from twisted.words.protocols.jabber import component
- from twisted.words.protocols.jabber.jid import internJID
-+from twisted.python import log
-
- from debug import LogEvent, INFO, WARN, ERROR
-
-@@ -352,13 +353,29 @@
- 		pf = open(config.pid, "w")
- 		pf.write("%s\n" % pid)
- 		pf.close()
-+
-+	def removePID(self, pidfile):
-+		# Remove a PID file
-+		if not pidfile:
-+			return
-+		try:
-+			os.unlink(pidfile)
-+		except OSError, e:
-+			if e.errno == errno.EACCES or e.errno == errno.EPERM:
-+				log.msg("Warning: No permission to delete pid file")
-+			else:
-+				log.msg("Failed to unlink PID file:")
-+				log.deferr()
-+		except:
-+			log.msg("Failed to unlink PID file:")
-+			log.deferr()
-
- 	def shuttingDown(self):
- 		self.transportSvc.removeMe()
- 		# Keep the transport running for another 3 seconds
- 		def cb(ignored=None):
- 			if config.pid:
--				twistd.removePID(config.pid)
-+				self.removePID(config.pid)
- 		d = Deferred()
- 		d.addCallback(cb)
- 		reactor.callLater(3.0, d.callback, None)
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-unexpected-xfr.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-unexpected-xfr.patch
deleted file mode 100644
index 7d93d97..0000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.3-unexpected-xfr.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- pymsn-t/src/legacy/glue.py	2008-09-19 10:53:30.000000000 +0200
-+++ pymsn-t/src/legacy/glue.py	2008-09-19 10:52:38.000000000 +0200
-@@ -379,7 +379,13 @@
- 		self.session.removeMe()
- 	
- 	def connectionLost(self, reason):
--		LogEvent(INFO, self.jabberID)
-+ 		LogEvent(INFO, self.jabberID)
-+		# If we got a second referral, don't really log out but let the next NS
-+		# try to log us in
-+		if reason.type == error.ConnectionDone and self.gotadditionalXFR != 0:
-+			LogEvent(INFO, self.ident)
-+			self.gotadditionalXFR = 0
-+			return
- 		if reason.type != error.ConnectionDone:
- 			text = lang.get(self.session.lang).msnDisconnected % reason
- 			self.session.sendMessage(to=self.jabberID, fro=config.jid, body=text)
---- pymsn-t/src/legacy/msn/msn.py	2008-09-19 10:53:30.000000000 +0200
-+++ pymsn-t/src/legacy/msn/msn.py	2008-09-19 10:52:38.000000000 +0200
-@@ -1347,7 +1347,9 @@
-             port = MSN_PORT
- 
-         if not self._fireCallback(id, host, int(port), params[4]):
--            raise MSNProtocolError, "Got XFR (referral) that I didn't ask for .. should this happen?" # debug
-+            #raise MSNProtocolError, "Got XFR (referral) that I didn't ask for .. should this happen?" # debug
-+			self.factory.msncon.gotadditionalXFR = 1
-+			self.factory.msncon.connectors.append(reactor.connectTCP(host, int(port), self.factory, bindAddress=(self.factory.msncon.BINDADDRESS, 0)))
- 
-     def handle_RNG(self, params):
-         checkParamLen(len(params), 6, 'RNG')
---- pymsn-t/src/legacy/msn/msnw.py	2008-09-19 10:53:30.000000000 +0200
-+++ pymsn-t/src/legacy/msn/msnw.py	2008-09-19 10:52:38.000000000 +0200
-@@ -67,8 +67,9 @@
- 		LogEvent(INFO, self.ident)
- 	
- 	def _gotNotificationReferral(self, (host, port)):
--		self.timeout.cancel()
--		self.timeout = None
-+		if self.timeout != None:
-+			self.timeout.cancel()
-+			self.timeout = None
- 		# Create the NotificationClient
- 		self.notificationFactory = msn.NotificationFactory()
- 		self.notificationFactory.userHandle = self.username
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild
deleted file mode 100644
index 079e481..0000000
--- a/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.3-r2.ebuild,v 1.3 2009/03/09 14:12:04 armin76 Exp $
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python
-
-MY_PN="pymsnt"
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Python based jabber transport for MSN"
-HOMEPAGE="http://msn-transport.jabberstudio.org/"
-SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-im/jabber-base"
-RDEPEND="${DEPEND}
-	>=dev-python/twisted-9.0.0
-	>=dev-python/twisted-words-9.0.0
-	>=dev-python/twisted-web-9.0.0
-	>=dev-python/imaging-1.1"
-
-src_unpack() {
-	unpack ${A} && cd "${S}" || die "unpack failed"
-	epatch "${FILESDIR}/${P}-protocol-version.patch"
-	epatch "${FILESDIR}/${P}-unexpected-xfr.patch"
-	epatch "${FILESDIR}/${P}-remove-pid.patch"
-	epatch "${FILESDIR}/${P}-delete-reactor.patch"
-	epatch "${FILESDIR}/${P}-hashlib.patch"
-}
-
-src_install() {
-	local inspath
-
-	inspath=$(python_get_sitedir)/${PN}
-	insinto ${inspath}
-	doins -r data src
-	newins PyMSNt.py ${PN}.py
-
-	insinto /etc/jabber
-	newins config-example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	dosed \
-		"s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<host>[^\<]*</host>:<host>example.org</host>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
-		/etc/jabber/${PN}.xml
-
-	newinitd "${FILESDIR}/${P}-initd" ${PN}
-	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
-
-	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
-	elog "Please edit it and the configuration of your Jabber server to match."
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}