reinit the tree, so we can have metadata

5 files changed, 159 insertions, 0 deletions

diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest
new file mode 100644
index 000000000000..a1e36ac33867
--- /dev/null
+++ b/dev-python/xmpppy/Manifest
@@ -0,0 +1,7 @@
+AUX xmpppy-0.5.0_rc1-ssl_fields.patch 1243 SHA256 3c0b684ca4a7b4cabbe7817ce81c101137cd4daa243ed04a52b4b6132b4e6c55 SHA512 4f9065add9da4a1ef66ee13834f0a3f16b9fa8b2ffc5d3938756683ff6ee3b514fd154739e08e471f5ef7eb6331c25abd6c60ec9d56f8a4e1c57521e8510b766 WHIRLPOOL 07c138dc2a7715858968a5f1b6d87c0f2a5e8226e5c317f48f6168ad4d448a79dcef23f6b406a850de5761f196ba4a0771f3af3879fb3567754598444e57a650
+AUX xmpppy-hashlib_ssl_deprecation.patch 2990 SHA256 7bce976579ad18b95a48df664f409e3a6013cbd6122d9a89cf170be2fb5e19af SHA512 1b085dad2d71daf81d7be877a4710c900895f6725322e52210ad3f3e2eba0ef609119ada5ab6c42a3f880317a66555ba3e13187b06cacd7c454189c4152f67f7 WHIRLPOOL 474057c3f2097d6b87fbc24b234c6b99439905bda6018b961be4f697e70dfe7963853c69ad87a20be50ea158eb6edc9f8625451c5ad7217301731b6564138183
+DIST xmpppy-0.5.0-rc1.tar.gz 84993 SHA256 96d9230be2a130ce8ba4cfd09ee9487de0fa7cfe21639977b596c637b267d094 SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699 WHIRLPOOL d2a7fa4c526e6d55ffd1e7b633aafacd862d5efbe1db448ec92abfa8f9ff52af0fa726bad1da8b8d3351e483ff3180496f6eb7a9645a278c0f18039a94dee13a
+EBUILD xmpppy-0.5.0_rc1-r2.ebuild 815 SHA256 0c83215659fbff1c0fbefdac432456d574d8301eddfb5dc9df7e7f26b86dac2a SHA512 605465389d2a4efb6c698af85f2b2df427995d82213de9847df1097dc80bbe0689fe4eaa2c2feb56a9b44671de96068260a2e4ed3eced5441bb6b2c4a84c8592 WHIRLPOOL 2797856cf8b0d13d32ed551bce3e3ac9462b3630c437f914240b0a676281f81211376f70df8092ab0181b84fb328af5311e82a2310d524202e875d1d2b93449f
+MISC ChangeLog 3938 SHA256 21dec625748c7478328728ffc0973932fd28da76b9fe7ad95925add738152d52 SHA512 b47a48e0c6cc129f7269aed3b497c853eb4bb6bfee16dd383fe75bc16c53de5318224d1ca2008e2bfdb93b9d525a3cb471a09e7a6281f0c31a4db589e809e444 WHIRLPOOL 8e4e2635a9d8bc6b8078026a1f5b18e6dae49e0aed72fde24f78facead0551365a18c900450e30c9cb1fb7a615b027272e13a62e9a0630e249d467b45bdfa4f6
+MISC ChangeLog-2015 3315 SHA256 04bd3432e8983bd30e99197a801838883130782c65d61e5bdbbfaadc338f6f71 SHA512 b9e6ca14d57744ea48c2b356248b425ab914e985b7bec26963f66135c4cd2fb4424993c5c383e5a1f4d2b0431439dee214e599aae4982d3a6e5c5c640b28dfe1 WHIRLPOOL 163d2be5a6c9fea2fef6e300dce7baca8e7b871008710d51530b684e708cf257ae65f9a929a185a983e081b55a9b0642e1da76c4b2bb3f467d9622b8058da177
+MISC metadata.xml 722 SHA256 ec6a4fda971328fcb7c802a59b1895b8b7f94e5648d519fceeace740d5c4cc44 SHA512 669662f0f5c8f767b221abc07d59eedc4d97762316951bcda01ba249c831a7ef47e90dfd18c22f243e2b8851b7a616128c78036a619ca1a5dd846208e7632773 WHIRLPOOL 71d2020b270f667427e6eca0d573bebd469d544cea94b0442fc4f02a744adc680bc922e1f8205e23f9c2a8f5bcc8df1b71fe3fe72b2eaad760cdf1f7c1387380
diff --git a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
new file mode 100644
index 000000000000..a39af1821fdb
--- /dev/null
+++ b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
@@ -0,0 +1,28 @@
+Taken from https://bugs.gentoo.org/show_bug.cgi?id=535758
+Kudos to Anton Bolshakov <blshkv@pentoo.ch> for this patch
+
+--- xmpp/transports.py.orig	2015-01-05 15:41:23.000000000 +0800
++++ xmpp/transports.py	2015-01-06 15:52:25.916240681 +0800
+@@ -27,7 +27,7 @@
+ Also exception 'error' is defined to allow capture of this module specific exceptions.
+ """
+ 
+-import socket,select,base64,dispatcher,sys
++import socket,ssl,select,base64,dispatcher,sys
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
+@@ -314,9 +314,10 @@
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
+         warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
+-        tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+-        tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+-        tcpsock._sslServer = tcpsock._sslObj.server()
++        tcpsock._sslObj    = ssl.wrap_socket(tcpsock._sock, None, None)
++        tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
++        tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
++
+         tcpsock._recv = tcpsock._sslObj.read
+         tcpsock._send = tcpsock._sslObj.write
+ 
diff --git a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
new file mode 100644
index 000000000000..489de037a488
--- /dev/null
+++ b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
@@ -0,0 +1,69 @@
+--- xmpp/auth.py
++++ xmpp/auth.py
+@@ -21,11 +21,16 @@
+ 
+ from protocol import *
+ from client import PlugIn
+-import sha,base64,random,dispatcher,re
++import base64,random,dispatcher,re
+ 
+-import md5
+-def HH(some): return md5.new(some).hexdigest()
+-def H(some): return md5.new(some).digest()
++try:
++    from hashlib import md5, sha1
++except ImportError:
++    from md5 import new as md5
++    from sha import new as sha1
++
++def HH(some): return md5(some).hexdigest()
++def H(some): return md5(some).digest()
+ def C(some): return ':'.join(some)
+ 
+ class NonSASL(PlugIn):
+@@ -54,15 +59,15 @@
+ 
+         if query.getTag('digest'):
+             self.DEBUG("Performing digest authentication",'ok')
+-            query.setTagData('digest',sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
++            query.setTagData('digest',sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
+             if query.getTag('password'): query.delChild('password')
+             method='digest'
+         elif query.getTag('token'):
+             token=query.getTagData('token')
+             seq=query.getTagData('sequence')
+             self.DEBUG("Performing zero-k authentication",'ok')
+-            hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest()
+-            for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
++            hash = sha1(sha1(self.password).hexdigest()+token).hexdigest()
++            for foo in xrange(int(seq)): hash = sha1(hash).hexdigest()
+             query.setTagData('hash',hash)
+             method='0k'
+         else:
+@@ -81,7 +86,7 @@
+     def authComponent(self,owner):
+         """ Authenticate component. Send handshake stanza and wait for result. Returns "ok" on success. """
+         self.handshake=0
+-        owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
++        owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
+         owner.RegisterHandler('handshake',self.handshakeHandler,xmlns=NS_COMPONENT_ACCEPT)
+         while not self.handshake:
+             self.DEBUG("waiting on handshake",'notify')
+--- xmpp/transports.py
++++ xmpp/transports.py
+@@ -31,6 +31,7 @@
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
++import warnings
+ 
+ # determine which DNS resolution library is available
+ HAVE_DNSPYTHON = False
+@@ -312,6 +313,7 @@
+         """ Immidiatedly switch socket to TLS mode. Used internally."""
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
++        warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
+         tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+         tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+         tcpsock._sslServer = tcpsock._sslObj.server()
diff --git a/dev-python/xmpppy/metadata.xml b/dev-python/xmpppy/metadata.xml
new file mode 100644
index 000000000000..f972de4d8621
--- /dev/null
+++ b/dev-python/xmpppy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		xmpppy is a Python library that is targeted to provide easy scripting with
+		Jabber. Similar projects are Twisted Words and jabber.py. This library was
+		not designed from scratch. It inherits some code from jabberpy and have very
+		similar API in many places. Though it is separate project since it have almost
+		completely different architecture and primarily aims to work with jabberd2 -
+		the new Open Source Jabber Server.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xmpppy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
new file mode 100644
index 000000000000..bdf5748f70d5
--- /dev/null
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Python library providing easy scripting with Jabber"
+HOMEPAGE="http://xmpppy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmpppy/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+IUSE="doc"
+
+RDEPEND="
+	|| (
+		virtual/python-dnspython[${PYTHON_USEDEP}]
+		dev-python/pydns:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
+	"${FILESDIR}/${P}-ssl_fields.patch"
+)
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}