5 files changed, 63 insertions, 14 deletions

diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index 9647400c91a0..5a6cc8a86010 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	xmpppy
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	net-im python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-rc1/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}rc1
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	A Python library that provides easy scripting with Jabber
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:${PORTSDIR}/dns/py-dnspython
 
-USE_PYTHON=	2.4+
+USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	yes
 
 post-patch:
diff --git a/net-im/py-xmpppy/distinfo b/net-im/py-xmpppy/distinfo
index 1c1b04677d6d..297705f8047e 100644
--- a/net-im/py-xmpppy/distinfo
+++ b/net-im/py-xmpppy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmpppy-0.4.1.tar.gz) = ca36d685643f2c56ab07323a09ece9e4
-SHA256 (xmpppy-0.4.1.tar.gz) = 1724d3ffd3210b3ca48e218954d8c2c10821bce1d0f5c66ec3e70de6389b38eb
-SIZE (xmpppy-0.4.1.tar.gz) = 473698
+MD5 (xmpppy-0.5.0rc1.tar.gz) = e0d2b3f9e4a278c163431e64adb0c861
+SHA256 (xmpppy-0.5.0rc1.tar.gz) = 519b025b3c9600c26c5805d0c612fe01e61330d2b9869f05c7c416c627820b9a
+SIZE (xmpppy-0.5.0rc1.tar.gz) = 84996
diff --git a/net-im/py-xmpppy/files/patch-setup.py b/net-im/py-xmpppy/files/patch-setup.py
new file mode 100644
index 000000000000..1987eb8a4b61
--- /dev/null
+++ b/net-im/py-xmpppy/files/patch-setup.py
@@ -0,0 +1,19 @@
+--- setup.py.orig	2010-04-03 20:46:52.000000000 +0800
++++ setup.py	2010-04-03 20:47:04.000000000 +0800
+@@ -1,7 +1,6 @@
+ #!/usr/bin/python
+ # -*- coding: koi8-r -*-
+ from distutils.core import setup,sys
+-from setuptools import setup
+ import os
+ 
+ if sys.version < '2.2.3':
+@@ -11,7 +10,7 @@ if sys.version < '2.2.3':
+ 
+ # Set proper release version in source code also!!!
+ setup(name='xmpppy',
+-      version='0.5.0rc1',
++      version='0.5.0',
+       author='Alexey Nezhdanov',
+       author_email='snakeru@users.sourceforge.net',
+       url='http://xmpppy.sourceforge.net/',
diff --git a/net-im/py-xmpppy/files/patch-xmpp-auth.py b/net-im/py-xmpppy/files/patch-xmpp-auth.py
index db7c46813ff1..a3e262bec652 100644
--- a/net-im/py-xmpppy/files/patch-xmpp-auth.py
+++ b/net-im/py-xmpppy/files/patch-xmpp-auth.py
@@ -1,14 +1,20 @@
---- xmpp/auth.py.orig	2009-12-10 20:43:19.000000000 +0800
-+++ xmpp/auth.py	2009-12-10 20:44:17.000000000 +0800
-@@ -21,9 +21,9 @@
+--- xmpp/auth.py.orig	2010-04-03 21:45:50.000000000 +0800
++++ xmpp/auth.py	2010-04-03 21:45:56.000000000 +0800
+@@ -19,13 +19,13 @@ Provides library with all Non-SASL and S
+ Can be used both for client and transport authentication.
+ """
  
++from hashlib import md5
  from protocol import *
  from client import PlugIn
 -import sha,base64,random,dispatcher,re
 +import base64,random,dispatcher,re
  
 -import md5
-+import hashlib 
- def HH(some): return md5.new(some).hexdigest()
- def H(some): return md5.new(some).digest()
+-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):
diff --git a/net-im/py-xmpppy/files/patch-xmpp-transports.py b/net-im/py-xmpppy/files/patch-xmpp-transports.py
new file mode 100644
index 000000000000..b06e1a81de7d
--- /dev/null
+++ b/net-im/py-xmpppy/files/patch-xmpp-transports.py
@@ -0,0 +1,24 @@
+--- xmpp/transports.py.orig	2010-04-06 21:05:04.000000000 +0800
++++ xmpp/transports.py	2010-04-06 21:05:20.000000000 +0800
+@@ -27,7 +27,7 @@ Transports are stackable so you - f.e. T
+ 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 *
+@@ -312,9 +312,9 @@ class TLS(PlugIn):
+         """ 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, 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
+