diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/xmpppy | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/xmpppy')
-rw-r--r-- | dev-python/xmpppy/Manifest | 1 | ||||
-rw-r--r-- | dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch | 69 | ||||
-rw-r--r-- | dev-python/xmpppy/metadata.xml | 18 | ||||
-rw-r--r-- | dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild | 38 | ||||
-rw-r--r-- | dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild | 42 |
5 files changed, 168 insertions, 0 deletions
diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest new file mode 100644 index 000000000000..e3eacd477914 --- /dev/null +++ b/dev-python/xmpppy/Manifest @@ -0,0 +1 @@ +DIST xmpppy-0.5.0-rc1.tar.gz 84993 SHA256 96d9230be2a130ce8ba4cfd09ee9487de0fa7cfe21639977b596c637b267d094 SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699 WHIRLPOOL d2a7fa4c526e6d55ffd1e7b633aafacd862d5efbe1db448ec92abfa8f9ff52af0fa726bad1da8b8d3351e483ff3180496f6eb7a9645a278c0f18039a94dee13a 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..c91ec5457f58 --- /dev/null +++ b/dev-python/xmpppy/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>maintainer-needed@gentoo.org</email> + </maintainer> + <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-r1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild new file mode 100644 index 000000000000..22a0bfba010f --- /dev/null +++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="|| ( + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/pydns[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch" +) + +python_install_all() { + distutils-r1_python_install_all + use doc && dohtml -A py -r doc/. +} diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild new file mode 100644 index 000000000000..49104c845a0e --- /dev/null +++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="3" +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils 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="|| ( + dev-python/dnspython + dev-python/pydns + )" +DEPEND="${RDEPEND} + dev-python/setuptools" + +S="${WORKDIR}/${MY_P}" + +PYTHON_MODNAME="xmpp" + +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch" +} + +src_install() { + distutils_src_install + use doc && dohtml -A py -r doc/. +} |