+++ /dev/null
-# ChangeLog for net-im/pymsn-t
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.31 2015/04/08 18:03:12 mgorny Exp $
-
- 08 Apr 2015; Michał Górny <mgorny@gentoo.org> pymsn-t-0.11.3-r4.ebuild:
- Drop old Python implementations
-
- 25 Dec 2014; Mike Gilbert <floppym@gentoo.org> -pymsn-t-0.11.3-r3.ebuild:
- Drop stable ebuild per bug 471546.
-
- 05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> pymsn-t-0.11.3-r3.ebuild,
- pymsn-t-0.11.3-r4.ebuild:
- Remove trailing '.' from DESCRIPTION.
-
-*pymsn-t-0.11.3-r4 (14 Sep 2013)
-
- 14 Sep 2013; <hanno@gentoo.org> +pymsn-t-0.11.3-r4.ebuild,
- +files/pymsn-t-0.11.3-imaging-pillow.patch,
- +files/pymsn-t-0.11.3-twisted13.patch, +files/pymsn-t-initd-r1:
- Cleanup, new URL, port to new python eclass, fix for twisted 13.x, fix
- deprecated PIL imports.
-
- 03 Aug 2013; Michał Górny <mgorny@gentoo.org> pymsn-t-0.11.3-r3.ebuild:
- Move dev-python/twisted to dev-python/twisted-core.
-
- 28 May 2013; Mike Gilbert <floppym@gentoo.org> pymsn-t-0.11.3-r3.ebuild:
- Set active python version to 2.
-
- 28 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
- -files/pymsn-t-0.11.2-initd, -pymsn-t-0.11.3.ebuild,
- -pymsn-t-0.11.3-r1.ebuild, -pymsn-t-0.11.3-r2.ebuild:
- old
-
- 09 Oct 2011; Markos Chandras <hwoarang@gentoo.org> pymsn-t-0.11.3-r3.ebuild:
- Stable on amd64 wrt bug #385947
-
- 08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- pymsn-t-0.11.3-r3.ebuild:
- x86 stable wrt bug #385947
-
- 04 Sep 2011; Hanno Boeck <hanno@gentoo.org>
- files/pymsn-t-0.11.3-use-non-deprecated-hashlib.patch:
- Re-diff patch to avoid problems with some versions of patch.
-
-*pymsn-t-0.11.3-r3 (04 Sep 2011)
-
- 04 Sep 2011; Hanno Boeck <hanno@gentoo.org> +pymsn-t-0.11.3-r3.ebuild,
- +files/pymsn-t-0.11.3-use-non-deprecated-hashlib.patch, +files/pymsn-t-initd:
- Add patch for python 2.6/2.7 warnings, remove deprecated chuid from init
- script, port to EAPI 3.
-
- 06 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- pymsn-t-0.11.3.ebuild, pymsn-t-0.11.3-r1.ebuild, pymsn-t-0.11.3-r2.ebuild:
- Use PYTHON_DEPEND instead of NEED_PYTHON.
-
- 08 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- pymsn-t-0.11.3.ebuild, pymsn-t-0.11.3-r1.ebuild, pymsn-t-0.11.3-r2.ebuild:
- Delete calls to deprecated python_version().
-
- 09 Mar 2009; Raúl Porcel <armin76@gentoo.org> pymsn-t-0.11.3-r2.ebuild:
- x86 stable wrt #259887
-
- 07 Mar 2009; Jeremy Olexa <darkside@gentoo.org> pymsn-t-0.11.3-r2.ebuild:
- amd64 stable, bug 259887
-
-*pymsn-t-0.11.3-r2 (23 Sep 2008)
-
- 23 Sep 2008; Maurice van der Pot <griffon26@gentoo.org>
- +files/pymsn-t-0.11.3-delete-reactor.patch,
- +files/pymsn-t-0.11.3-remove-pid.patch,
- +files/pymsn-t-0.11.3-unexpected-xfr.patch, +pymsn-t-0.11.3-r2.ebuild:
- Added some patches provided by Dennis Schridde <lindevel@gmx.net> that a.o.
- fix an error when connecting (see bug #238085).
-
- 17 Sep 2008; Markus Meier <maekke@gentoo.org> pymsn-t-0.11.3-r1.ebuild:
- amd64/x86 stable, bug #237886
-
- 11 Aug 2008; Maurice van der Pot <griffon26@gentoo.org>
- -files/pymsn-t-0.11.2-twisted-2.5.patch, -files/pymsn-t.initd,
- -pymsn-t-0.11.2.ebuild, -pymsn-t-0.11a-r4.ebuild:
- Removed old ebuilds, one of which had a dep on twisted-xish (bug #231675).
-
-*pymsn-t-0.11.3-r1 (07 Aug 2008)
-
- 07 Aug 2008; Maurice van der Pot <griffon26@gentoo.org>
- +files/pymsn-t-0.11.3-protocol-version.patch, +pymsn-t-0.11.3-r1.ebuild:
- Added patch to fix connection issues with current MSN servers as reported by
- Goudal Francois <goudalf@free.fr> in bug #234049.
-
- 29 May 2008; Ali Polatel <hawking@gentoo.org> pymsn-t-0.11.2.ebuild,
- pymsn-t-0.11.3.ebuild, pymsn-t-0.11a-r4.ebuild:
- python_mod_{cleanup,optimize} are ROOT aware.
-
-*pymsn-t-0.11.3 (10 Mar 2008)
-
- 10 Mar 2008; Maurice van der Pot <griffon26@gentoo.org>
- +pymsn-t-0.11.3.ebuild:
- Version bump to 0.11.3.
-
- 04 Jun 2007; Maurice van der Pot <griffon26@gentoo.org>
- files/pymsn-t-0.11.2-initd:
- Fixed init script to not have a hard-coded path.
-
-*pymsn-t-0.11.2 (28 Apr 2007)
-
- 28 Apr 2007; Maurice van der Pot <griffon26@gentoo.org>
- +files/pymsn-t-0.11.2-initd, +files/pymsn-t-0.11.2-twisted-2.5.patch,
- metadata.xml, +pymsn-t-0.11.2.ebuild:
- Version bump to 0.11.2 closing bug #140194.
-
- 28 Apr 2007; Sven Wegener <swegener@gentoo.org> pymsn-t-0.11a-r4.ebuild:
- Fix *initd, *confd and *envd calls (#173884, #174266)
-
- 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
- Transition to Manifest2.
-
- 09 Mar 2006; Danny van Dyk <kugelfang@gentoo.org> pymsn-t-0.11a-r4.ebuild:
- Marked ~amd64.
-
-*pymsn-t-0.11a-r4 (08 Mar 2006)
-
- 08 Mar 2006; Gustavo Felisberto <humpback@gentoo.org>;
- -files/pymsn-t-0.9.5-arguments.patch, -files/pymsn-t.initd,
- -pymsn-t-0.9.5-r1.ebuild, +pymsn-t-0.11a-r4.ebuild:
- Removed older versions and updated to a working version. Closes bug #111224.
- Thanks to everyone that helped there.
-
-*pymsn-t-0.9.5-r1 (14 Sep 2005)
-
- 14 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
- -pymsn-t-0.9.5.ebuild, +pymsn-t-0.9.5-r1.ebuild:
- Fixing path in config file, credits to Albert Holm for spoting this one in
- #105998
-
-*pymsn-t-0.9.5 (28 Aug 2005)
-
- 28 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
- -files/pymsn-t-0.9.3-arguments.patch, -files/pymsn-t-0.9.3-config.patch,
- +files/pymsn-t-0.9.5-arguments.patch, files/pymsn-t.initd,
- -pymsn-t-0.9.3.ebuild, +pymsn-t-0.9.5.ebuild:
- Updated to 0.9.5 and changed the ebuild to use the new jabber-base package.
- This will make it easyer to maintain jabber packages.
-
-*pymsn-t-0.9.3 (23 Aug 2005)
-
- 23 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
- -files/pymsn-t-0.9.2-arguments.patch,
- +files/pymsn-t-0.9.3-arguments.patch, +files/pymsn-t-0.9.3-config.patch,
- -pymsn-t-0.9.2.ebuild, +pymsn-t-0.9.3.ebuild:
- Removed old version and added new 0.9.3, also QA issue #103421
-
-*pymsn-t-0.9.2 (18 Apr 2005)
-
- 18 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>;
- +files/pymsn-t-0.9.2-arguments.patch, +files/pymsn-t.initd,
- +pymsn-t-0.9.2.ebuild:
- Initial import see bug #88597 for more info
+++ /dev/null
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX pymsn-t-0.11.3-delete-reactor.patch 361 SHA256 d989d06d9e94f1a2786dfa51e1cf715e4dc0db95583b08ce606b555aef017bae SHA512 5d94633a614138d760bea4447038d99e7177eb96d44d00b2a496c0773dace54780eb0050b9f179bb5039cbf8b26be67462ac5acd631aac856f4e88393ac40755 WHIRLPOOL 7f326b8e2fd0379144b4d44a2d0fd5b6fd7b2ead06da22726c17d1b93336d4d914835fe7c12e754475f9847891b2d91a7db16f32cf1ccc0eb4362e54b2bffbe1
-AUX pymsn-t-0.11.3-imaging-pillow.patch 322 SHA256 5be9c203e946908f16aa4121a72f985f8126098ace01e9e07a8d5feb078922bd SHA512 cac1e792d3c1048fd1c25a7963e653dcd4d5924fb1aba7e6132e79fb3d9ea909efde64f1b1bd835103511ce54bd655ae47ea4ad5e4eac3374db5b7a2c97df47e WHIRLPOOL 88189289c6a1f44e75e65b5dc0d9938155e70626cacc1002f9fa9d76f22cff127a539e3f540806811ba1f45c948c440eedcb584912032eaf09551541fb797890
-AUX pymsn-t-0.11.3-protocol-version.patch 609 SHA256 008aedc95f1c2020a156d941c74784ca1385f12426342885fa7ff8474365b5a3 SHA512 ea5b4956d4b848f8d637b36069e2bec0b6bfdba94aabcaecf83388d2806ec740b789440f00dff93e3b091379c8bf3953268f4fd94a86c211bb48a4fa2fd9174e WHIRLPOOL 6cdb67433e196201db21877b0c3431fc97feaf61f61e3491df6986fe3467d657c5da8bfdb51cdf81429b6fb21e18dc833984e8d74c6382d5a69033e8a51a6270
-AUX pymsn-t-0.11.3-remove-pid.patch 1173 SHA256 b4a09f2af01f752a2703d14204cb954a0641afedb1be391f1b9f6f980b234845 SHA512 b151e827b62e49b4d91966a2019d26cad8076a335dd263a3bb00f13b8bfb4bddcf9c5f7d0683d14a967e67f469ad2ff540b10c2c1ffc4f8ebef94a4feb26e0d5 WHIRLPOOL 56a1c85f9d78e3171484a17de8eb0e2151e42aecb43f282c8c097f09912ceaecb3b99bc3ef9776409b798a27ba09c85ab9b0237b2494a51c1ca90f6edf710e16
-AUX pymsn-t-0.11.3-twisted13.patch 352 SHA256 81058d7be7116ff7fff6ec86eecbb30132b6b34bbc647e6e0147185365fb0fde SHA512 78be5c3af94d197d442182452fe34ef7f31828cd1eb158846296a6a7837971998e9bb470d8a5c51081ce00b66a0fa003bcbd273c8ddd80cd560022f8c6f8b7f0 WHIRLPOOL 6970c624b3699ce213564dc0e5e620df092b151cf99fc9f340e103e65df370088d7af8a16cc0bc30c8fde9238515b44bb6d72fe20a458c013067bd7a70792a14
-AUX pymsn-t-0.11.3-unexpected-xfr.patch 1984 SHA256 0407e9e69684275b11d404e77e9b70e694e461d4c9891ee3c7d79717999a84e9 SHA512 5ab2b6a577ff835338724add6befb4394a2f85ba521a3dad543d501980ef3b7cb1a930a966b2b898166e7473972da624d683072f2e3f687991e07ebaa4157195 WHIRLPOOL c9323c1c51776e4e0d8fc6b18d635c693ee0a7825bb624d0d41532819862a1553501655360b682ac1c0b4eb1004cc5564b7267f4cb4435f0fc7db8c81a2268e6
-AUX pymsn-t-0.11.3-use-non-deprecated-hashlib.patch 4605 SHA256 12004937d29e090e147ddd8f7aa5ae7e615a5df27c4db6a7b28824859937dd27 SHA512 7ec0f9f4c111ab2a43b9bf4ad1a5cb1b07174d0e3063cdbe86961a72a535c231d5f3f972b43e492afa8ebc7af32d27884d40a39a8a227187f3bf5cadb17272b6 WHIRLPOOL f51aad356f9350bfb47ec88b4447c63345d0ff01ae91ab587182bec60398e1b26bbb3e6cdf6b90036dea620fabc4a732de4408bb16c0cdd80c6197667a1e56b8
-AUX pymsn-t-initd 670 SHA256 557dc37a1c51b03188623e3b4fd0329eea87ee4428bb397439359656daa3d431 SHA512 683089271c42556db2e2b817ad469a1a4b1ebd687279233178f28f56c542f00a4679fd8cd9430664c9bdd2e670e4f86f5682a6cf7621a31b773254043c6e8f27 WHIRLPOOL acdda704c13bb71fecd97f4e49ce242f285c269a7ff9ad590a4b3157a4739420985e44824a31ed345a0a3bc6d41b27d6a25883c1ff730c4d26caacfd8896fb3c
-AUX pymsn-t-initd-r1 716 SHA256 c1bc1f8144c07d3b12e91aeb25d4914ebfd779843ae5f7d821486e573b6119ec SHA512 bdb877a87b31908ecc0e1efcda3996874f1c589fdc441a433b3f7bd5449e20a8456b342e969fefd175db7095234c2189836a95917fc983359aa0bbbdae2b9396 WHIRLPOOL 388d2ed2767c3d8c4f33ed0e1623ad53772629007eac1d49d617f3cb2db2fd9920d4f83da2d6494a6826a39ccaeabffa4554c69b466a0376756295c3cf93b2dd
-DIST pymsnt-0.11.3.tar.gz 162549 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c SHA512 57ed58c51ddaceb877e22c0703f59299fd1e75add6de9b6d937025a12f9ea669c24c8de70a5995500101a0537dd3549676df475d87df63ec29d6c773a2a31563 WHIRLPOOL f5af4d65f6e8d193ecef07739c29b30e841f4f7fb32c972a9c58e6550700da3c0ae3fdfa3bb9d077e7369b05f0582ab305f76c593c6457d43fa5455caa7386bb
-EBUILD pymsn-t-0.11.3-r4.ebuild 1927 SHA256 b54d27080370b8be02eac10b395aec08b646fec4470273d37754d23303ea7f20 SHA512 6037a44846d636c8bd67dcc50925849c3ec95daece80c479953c6f518e9cc1ca831d93fcf385a58774fb76be7ca3b54edf84e6ea545699d41f6b27b94152d6f0 WHIRLPOOL 45d134b377abf66e2916c8df9aff694512a779d420347f61a28058e2c4cd0cc53b5a3a321f1bbd43331fbdf85fe06afe0300cd27590b3201ec90c9aef16221f3
-MISC ChangeLog 6128 SHA256 6ce5f620b7bef78471ef157616376a8accc4c9ef966a4d1e423037216b567d75 SHA512 2c61338ce3d3fecdc77c1edd7807bb35b1347f4a6f3ea0ca4058a4419b22d570a7ed46ae57b7091f303bc155d2849b73636f4a79150254da4e2128853f808533 WHIRLPOOL a2e4568d71e235c47eccf13366c7b71001a7893e07ad6dafbc442b2a8d0fec6d8af5ed82fca4ace3808b3e6afb27112ed65fbf71a98d0efdf1412800f89e33d5
-MISC metadata.xml 233 SHA256 06ee3fd43c4bea5d5528843a5a6fedaeea4ad97807b81ea46c4ba57b8f54b6d0 SHA512 5df742525093b710948af605715ac9388b02568dce7b9ed08e0e1dc6da07201f02e7669760bae395a4caafa7a5f41cfb826a3062ed0ee6132dd13727fcaf7764 WHIRLPOOL d699a25e0e2ff171780e0028d8db48b20d65a7ca59cf9927aca54ff12c099b57c0cec2768ae5d827a2ff332b98d699285cec62c283297f6a10aabfe1ed88d998
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJW1yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkRsQANsNBGo8VkYmGlg9xI6r2My5
-O4JB/DJ9V8q2jUjM6Ek+SS5e9Asa8EqYgDIxQF16uoOD/XH32BHwltSJ5Wn4QQV5
-gF6U9+/rCDzv59mLt1294nf/StmN5K2xIuySqMtoC2cSDK+8uLhNPlvVXeKMUv6h
-PT+5sVGxFiViqlaUszOnGy2UUT0iOiBBlcrQjJLrc5AcLu62UhF22JAESBcH5T2J
-b3mBOdwyUQ0srcrNleuEAiao+f/pJtZwh/oOVgdkHNMJybk+8BBijV2iecOPbW5a
-okCPL26CqhQt4xIA77AjrnO5iatJUusyAaWe6kdcaIDIdjbvZ2YRGvroEwC/4ksb
-WMokZ7HTIsQgQpTHPQVLDAe12AS/omd/xiGonLXFmrbZwlDXEazUBwuGVaRb5nJD
-B3yIxPinu38JFjgPALAt9dVzZJ3IQ2XlxTrDJqsf8cbh2MXksjdIbzJ2vPzZJW01
-IMO+eIYz8E6/fO/1v1xlSHT+ks4/x9VvpNk1ENixAAk1SJ1ESOQN6MtUdpaDhwNc
-CPsgqeFnYV/ntCjlV3cS2r7+l20LRoa+Qylu8Xhw5zLRiO7rtAz0XeI+1+ZVXXt5
-jUdt7E2c+4oRhdThcyy+2+c2xPuDbYkjpDlXr88IyeMO+AzPW1R+7rnrTFCXifdi
-XqkElTv45jFOn4ir4+BM
-=wqJf
------END PGP SIGNATURE-----
+++ /dev/null
---- 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()
+++ /dev/null
-diff -Naur pymsnt-0.11.3/src/utils.py pymsnt-0.11.3-1/src/utils.py
---- pymsnt-0.11.3/src/utils.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/utils.py 2013-09-15 00:27:56.815633838 +0200
-@@ -25,7 +25,7 @@
-
-
- try:
-- import Image
-+ from PIL import Image
- import StringIO
-
- def convertToPNG(imageData):
+++ /dev/null
-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"
+++ /dev/null
---- 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)
+++ /dev/null
---- pymsnt-0.11.3/src/main.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/main.py 2013-09-15 00:57:20.297587280 +0200
-@@ -328,7 +328,7 @@
-
- # Daemonise the process and write the PID file
- if config.background and os.name == "posix":
-- twistd.daemonize()
-+ twistd.daemonize(reactor,os)
- if config.pid:
- self.writePID()
-
+++ /dev/null
---- 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
+++ /dev/null
-diff -Naur pymsnt-0.11.3/src/avatar.py pymsnt-0.11.3-1/src/avatar.py
---- pymsnt-0.11.3/src/avatar.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/avatar.py 2011-09-04 13:40:02.350321866 +0200
-@@ -6,7 +6,12 @@
- from twisted.internet import reactor
- from twisted.words.xish.domish import Element
-
--import sha, base64, os, os.path
-+import base64, os, os.path
-+
-+try:
-+ from hashlib import sha1
-+except ImportError:
-+ from sha import sha as sha1
-
- import utils
- import config
-@@ -34,7 +39,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 -Naur pymsnt-0.11.3/src/legacy/msn/msnp11chl.py pymsnt-0.11.3-1/src/legacy/msn/msnp11chl.py
---- pymsnt-0.11.3/src/legacy/msn/msnp11chl.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/legacy/msn/msnp11chl.py 2011-09-04 13:40:02.351321854 +0200
-@@ -1,16 +1,20 @@
- # Copyright 2005 James Bunton <james@delx.cjb.net>
- # Licensed for distribution under the GPL version 2, check COPYING for details
-
--import md5
- import struct
-
-+try:
-+ from hashlib import md5
-+except ImportError:
-+ from md5 import md5
-+
- MSNP11_PRODUCT_ID = "PROD0090YUAUV{2B"
- MSNP11_PRODUCT_KEY = "YMM8C_H7KCQ2S_KL"
- MSNP11_MAGIC_NUM = 0x0E79A9C1
-
-
- 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 -Naur pymsnt-0.11.3/src/legacy/msn/msn.py pymsnt-0.11.3-1/src/legacy/msn/msn.py
---- pymsnt-0.11.3/src/legacy/msn/msn.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/legacy/msn/msn.py 2011-09-04 13:40:02.351321854 +0200
-@@ -106,9 +106,12 @@
-
-
- # 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 urllib import quote, unquote
--
-+try:
-+ from hashlib import sha1
-+except ImportError:
-+ from sha import sha as sha1
-
- MSN_PROTOCOL_VERSION = "MSNP11 CVR0" # protocol version
- MSN_PORT = 1863 # default dispatch server port
-@@ -490,7 +493,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 +521,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 -Naur pymsnt-0.11.3/src/utils.py pymsnt-0.11.3-1/src/utils.py
---- pymsnt-0.11.3/src/utils.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/utils.py 2011-09-04 13:40:02.351321854 +0200
-@@ -1,17 +1,17 @@
- # Copyright 2004-2005 James Bunton <james@delx.cjb.net>
- # Licensed for distribution under the GPL version 2, check COPYING for details
-
-+try:
-+ from hashlib import sha1
-+except ImportError:
-+ from sha import sha as sha1
-
-+def socks5Hash(sid, initiator, target):
-+ return sha1("%s%s%s" % (sid, initiator, target)).hexdigest()
-
- def getLang(el):
- return el.getAttribute((u'http://www.w3.org/XML/1998/namespace', u'lang'))
-
--
--import sha
--def socks5Hash(sid, initiator, target):
-- return sha.new("%s%s%s" % (sid, initiator, target)).hexdigest()
--
--
- import urllib
- import os.path
- def getURLBits(url, assumedType=None):
-diff -Naur pymsnt-0.11.3/src/xdb.py pymsnt-0.11.3-1/src/xdb.py
---- pymsnt-0.11.3/src/xdb.py 2008-02-08 14:55:07.000000000 +0100
-+++ pymsnt-0.11.3-1/src/xdb.py 2011-09-04 13:40:02.351321854 +0200
-@@ -6,9 +6,13 @@
- import os
- import os.path
- import shutil
--import md5
- import config
-
-+try:
-+ from hashlib import md5
-+except ImportError:
-+ from md5 import md5
-+
- X = os.path.sep
- SPOOL_UMASK = 0077
-
-@@ -23,7 +27,7 @@
- return file.replace("@", "%")
-
- def makeHash(file):
-- return md5.md5(file).hexdigest()[0:3]
-+ return md5(file).hexdigest()[0:3]
-
-
- class XDB:
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2011 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-initd,v 1.1 2011/09/04 10:26:35 hanno Exp $
-
-depend() {
- need net
- use jabber-server
-}
-
-start() {
- ebegin "Starting MSN Jabber Transport"
- start-stop-daemon --start --pidfile /var/run/jabber/pymsn-t.pid -u jabber -g 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 $?
-}
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2013 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-initd-r1,v 1.1 2013/09/14 23:05:48 hanno Exp $
-
-depend() {
- need net
- use jabber-server
-}
-
-start() {
- ebegin "Starting MSN Jabber Transport"
- checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
- start-stop-daemon --start --pidfile /var/run/jabber/pymsn-t.pid -u jabber -g jabber \
- --exec 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 $?
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-im</herd>
- <longdescription>Python based jabber transport for MSN</longdescription>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2015 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-r4.ebuild,v 1.3 2015/04/08 18:03:12 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-MY_P="${P/pymsn-t/pymsnt}"
-DESCRIPTION="Python based jabber transport for MSN"
-HOMEPAGE="http://delx.net.au/projects/pymsnt/"
-SRC_URI="http://delx.net.au/projects/pymsnt/tarballs/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="net-im/jabber-base"
-RDEPEND="${DEPEND}
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/twisted-words[${PYTHON_USEDEP}]
- dev-python/twisted-web[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]"
-
-src_prepare() {
- 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}-use-non-deprecated-hashlib.patch"
- epatch "${FILESDIR}/${P}-imaging-pillow.patch"
- epatch "${FILESDIR}/${P}-twisted13.patch"
-}
-
-src_install() {
- python_moduleinto ${PN}
- cp PyMSNt.py ${PN}.py
- python_domodule ${PN}.py data src
-
- insinto /etc/jabber
- newins config-example.xml ${PN}.xml
- fperms 600 /etc/jabber/${PN}.xml
- fowners jabber:jabber /etc/jabber/${PN}.xml
- fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
- sed -i \
- -e "s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
- -e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
- -e "s:<host>[^\<]*</host>:<host>example.org</host>:" \
- -e "s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
- "${ED}/etc/jabber/${PN}.xml"
-
- newinitd "${FILESDIR}/${PN}-initd-r1" ${PN}
- sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}"
- python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
-}
projects / gentoo.git / commitdiff