Added patches for 2.6 deprecation warnings. Closes bug #281997

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 107 insertions, 7 deletions

diff --git a/dev-python/xmpppy/ChangeLog b/dev-python/xmpppy/ChangeLog
index 44c6d9b965c5..83abedb064ba 100644
--- a/dev-python/xmpppy/ChangeLog
+++ b/dev-python/xmpppy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/xmpppy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/ChangeLog,v 1.15 2009/09/04 14:58:47 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/ChangeLog,v 1.16 2010/01/28 03:57:00 neurogeek Exp $
+
+  28 Jan 2010; Jesus Rivero <neurogeek@gentoo.org> xmpppy-0.5.0_rc1.ebuild,
+  +files/xmpppy-hashlib_ssl_deprecation.patch:
+  Added patches for 2.6 deprecation warnings. Closes bug #281997
 
   04 Sep 2009; Patrick Lauer <patrick@gentoo.org> -xmpppy-0.4.1.ebuild:
   Remove old
diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest
index b7e79bae904e..516ae4fc1fed 100644
--- a/dev-python/xmpppy/Manifest
+++ b/dev-python/xmpppy/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xmpppy-hashlib_ssl_deprecation.patch 3556 RMD160 1d67fe9f0867e0da2dfb2212c77f2c188a039a80 SHA1 b623f279d36226cbb9aa15f9230e794e6f4f7eb2 SHA256 383cf2d985393f798c05e44ef48a2d6c3807256bb75ca36628a4f246e5071e93
 DIST xmpppy-0.5.0-rc1.tar.gz 84993 RMD160 b715fd7ec54d007d18b1b83dcdeaefdec93a67b8 SHA1 e6e67ffe6b5acad47792226d1cfcfa1f07780a24 SHA256 96d9230be2a130ce8ba4cfd09ee9487de0fa7cfe21639977b596c637b267d094
-EBUILD xmpppy-0.5.0_rc1.ebuild 763 RMD160 c483e2e05c09d9d1c6f22872deca5fdf2241233e SHA1 777151980bb66cd65d70e7e145b6e50245d25881 SHA256 7b5cf3db474c40d4d736a9a1b9c861948efe7ade1d14ae3c18537d9c147eb2b5
-MISC ChangeLog 2043 RMD160 fe36e9a954357b8f8f7b5e2ab47d8a769097879d SHA1 ec3d05a34606719b7a2f26a9ff6c0794c7a8fa51 SHA256 842e88584835f8fb3731106ebe8a50e0f9fe85db5a8cd08ac2e5cab84f7df7f2
+EBUILD xmpppy-0.5.0_rc1.ebuild 888 RMD160 ebe9d2df61062bf71fc86df231e30719c3cf1d41 SHA1 9398ea2d9191fc8a4a7b4cb1138e300043dbfbd8 SHA256 4badc6349ab116eb955fd3af17496558c4ef179089f02869cdb75fd1fada9fb3
+MISC ChangeLog 2234 RMD160 f8de149bda1250c9275a77b158a260930808bab3 SHA1 0d28812436587f0846c1ac57c46ac1328cf9f9a9 SHA256 21b16643a0e139c33d0c5eeeb78a4713f5ddc5487fd0d83380e6f8cef2a7695e
 MISC metadata.xml 739 RMD160 2c8ecc831c598bfd2f31646ffd3e9346f0bb412c SHA1 5b0af69528e13faabe33e38a97956a0e955a9abb SHA256 5c64348beb3be788e5000a51a650c2f7af3f69a132b4863af5bffb0eb2e70db5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktg/ewACgkQdIssYB9vBoPDlgCfR/ZMyanOug8i9KbNwHbuP5iK
+60EAn2d0UcIT632cSqO3X0W9liB3p2Ho
+=UreX
+-----END PGP SIGNATURE-----
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..f7f1787dea13
--- /dev/null
+++ b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
@@ -0,0 +1,76 @@
+#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 @@
+ 
+ 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()
++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 @@
+ 
+         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())
+             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 = sha(sha(self.password).hexdigest()+token).hexdigest()
++            for foo in xrange(int(seq)): hash = sha(hash).hexdigest()
+             query.setTagData('hash',hash)
+             method='0k'
+         else:
+@@ -81,7 +81,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.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
+@@ -31,6 +31,7 @@
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
++import ssl
+ 
+ # determine which DNS resolution library is available
+ HAVE_DNSPYTHON = False
+@@ -312,9 +313,9 @@
+         """ 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
+ 
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
index c650e3bdd118..a0ae4c20da69 100644
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3 2009/09/04 15:33:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild,v 1.4 2010/01/28 03:57:00 neurogeek Exp $
 
-inherit eutils distutils
+EAPI="2"
+inherit distutils
 
 MY_P="${P/_/-}"
 
@@ -27,6 +28,14 @@ S="${WORKDIR}/${MY_P}"
 
 PYTHON_MODNAME="xmpp"
 
+src_prepare(){
+
+	python_version
+	[[ ${PYVER} == 2.6 ]] && \
+		epatch "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
+
+}
+
 src_install(){
 	distutils_src_install
 	use doc && dohtml -A py -r doc/.