From: Arfrever Frehtes Taifersar Arahesis Date: Wed, 23 Jun 2010 18:19:37 +0000 (+0000) Subject: Unconditionally apply fix for deprecation warnings. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77f84d710c14be96c9946898928b4ae2a334b336;p=gentoo.git Unconditionally apply fix for deprecation warnings. Package-Manager: portage-HEAD/cvs/Linux x86_64 --- diff --git a/dev-python/xmpppy/ChangeLog b/dev-python/xmpppy/ChangeLog index 04f5af63f24b..97d9d19aeca3 100644 --- a/dev-python/xmpppy/ChangeLog +++ b/dev-python/xmpppy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/xmpppy # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/ChangeLog,v 1.17 2010/02/07 20:49:11 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/ChangeLog,v 1.18 2010/06/23 18:19:37 arfrever Exp $ + + 23 Jun 2010; Arfrever Frehtes Taifersar Arahesis + xmpppy-0.5.0_rc1.ebuild, files/xmpppy-hashlib_ssl_deprecation.patch: + Unconditionally apply fix for deprecation warnings. 07 Feb 2010; Peter Volkov xmpppy-0.5.0_rc1.ebuild: Add inherit eutils: epatch is defined there. diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest index 2b8d9b359701..6660473ef2f2 100644 --- a/dev-python/xmpppy/Manifest +++ b/dev-python/xmpppy/Manifest @@ -1,5 +1,5 @@ -AUX xmpppy-hashlib_ssl_deprecation.patch 3556 RMD160 1d67fe9f0867e0da2dfb2212c77f2c188a039a80 SHA1 b623f279d36226cbb9aa15f9230e794e6f4f7eb2 SHA256 383cf2d985393f798c05e44ef48a2d6c3807256bb75ca36628a4f246e5071e93 +AUX xmpppy-hashlib_ssl_deprecation.patch 2990 RMD160 20bc4981690a6cd52382341c165834b29a7194e4 SHA1 9a6a4d71b3a69724a0c669e4ba2a289d0ade9483 SHA256 7bce976579ad18b95a48df664f409e3a6013cbd6122d9a89cf170be2fb5e19af DIST xmpppy-0.5.0-rc1.tar.gz 84993 RMD160 b715fd7ec54d007d18b1b83dcdeaefdec93a67b8 SHA1 e6e67ffe6b5acad47792226d1cfcfa1f07780a24 SHA256 96d9230be2a130ce8ba4cfd09ee9487de0fa7cfe21639977b596c637b267d094 -EBUILD xmpppy-0.5.0_rc1.ebuild 889 RMD160 f183a9d32cfb18a2b58d615bcdc293c521f8a824 SHA1 1f08eb67917513ecf1debfceea4cfd9a9ff1c2b5 SHA256 0cfca39946a662becd168c57671eb2e92d377b5ae7882ee83c998dae88aab22d -MISC ChangeLog 2346 RMD160 3d0cde4e2aa9e750541e5fa015be20a5140a8e90 SHA1 0a679e1a4c520abbf21f28e7507060d107c4bf19 SHA256 6612f77ff01c8ef102cc14786d9d87121052f75d6e09d4b1ddbc4c5e5bb31c5e +EBUILD xmpppy-0.5.0_rc1.ebuild 870 RMD160 a24915148115b73b3a11d81040cf698a6126a4db SHA1 0732610c20b216f4921664a0cc5869b299f53068 SHA256 cac75a497f82797de06ccc37392d6dfaf7d91c45d140bbe534e02088966c8a08 +MISC ChangeLog 2550 RMD160 a86001201ee93d1411ad49998a5d1f53f75a85b5 SHA1 c6f1819095c16475364231fa28a2e5d750895e7d SHA256 bfbe8cd65df631042c8ed9fbdc3e49f846dd13168ee5c2486c013e40382ec9e0 MISC metadata.xml 739 RMD160 2c8ecc831c598bfd2f31646ffd3e9346f0bb412c SHA1 5b0af69528e13faabe33e38a97956a0e955a9abb SHA256 5c64348beb3be788e5000a51a650c2f7af3f69a132b4863af5bffb0eb2e70db5 diff --git a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch index f7f1787dea13..489de037a488 100644 --- a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch +++ b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch @@ -1,32 +1,32 @@ -#Patch by Jesus Rivero (neurogeek) -#Added on 01-27-2010 -#Sent to upstream on 01-27-2010 - -diff -uNr xmpppy-0.5.0-rc1.org/xmpp/auth.py xmpppy-0.5.0-rc1/xmpp/auth.py ---- xmpppy-0.5.0-rc1.org/xmpp/auth.py 2010-01-28 01:00:03.000000000 +0000 -+++ xmpppy-0.5.0-rc1/xmpp/auth.py 2010-01-28 01:03:30.000000000 +0000 -@@ -21,11 +21,11 @@ +--- xmpp/auth.py ++++ xmpp/auth.py +@@ -21,11 +21,16 @@ from protocol import * from client import PlugIn -import sha,base64,random,dispatcher,re -+from hashlib import sha1 as sha, md5 +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 +54,15 @@ +@@ -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',sha(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'): @@ -35,42 +35,35 @@ diff -uNr xmpppy-0.5.0-rc1.org/xmpp/auth.py xmpppy-0.5.0-rc1/xmpp/auth.py 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 = sha(sha(self.password).hexdigest()+token).hexdigest() -+ for foo in xrange(int(seq)): hash = sha(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 +81,7 @@ +@@ -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=[sha(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') - -diff -uNr xmpppy-0.5.0-rc1.org/xmpp/transports.py xmpppy-0.5.0-rc1/xmpp/transports.py ---- xmpppy-0.5.0-rc1.org/xmpp/transports.py 2010-01-28 01:00:03.000000000 +0000 -+++ xmpppy-0.5.0-rc1/xmpp/transports.py 2010-01-28 02:35:09.000000000 +0000 +--- xmpp/transports.py ++++ xmpp/transports.py @@ -31,6 +31,7 @@ from simplexml import ustr from client import PlugIn from protocol import * -+import ssl ++import warnings # determine which DNS resolution library is available HAVE_DNSPYTHON = False -@@ -312,9 +313,9 @@ +@@ -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 -- 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, cert_reqs=ssl.CERT_NONE) -+ #tcpsock._sslIssuer = tcpsock._sslObj.issuer() -+ #tcpsock._sslServer = tcpsock._sslObj.server() - tcpsock._recv = tcpsock._sslObj.read - tcpsock._send = tcpsock._sslObj.write - ++ 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/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild index c59b49a3b347..580401d93913 100644 --- a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild +++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild,v 1.5 2010/02/07 20:49:11 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild,v 1.6 2010/06/23 18:19:37 arfrever Exp $ EAPI="2" inherit eutils distutils @@ -29,11 +29,8 @@ S="${WORKDIR}/${MY_P}" PYTHON_MODNAME="xmpp" src_prepare(){ - - python_version - [[ ${PYVER} == 2.6 ]] && \ - epatch "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch" - + distutils_src_prepare + epatch "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch" } src_install(){