mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-08 12:30:44 +02:00
xmpppy: Delete, fixed in gentoo
This commit is contained in:
parent
4215412d18
commit
e77ce325ab
4 changed files with 0 additions and 134 deletions
|
|
@ -1 +0,0 @@
|
|||
DIST xmpppy-0.5.0-rc1.tar.gz 84993 SHA256 96d9230be2a130ce8ba4cfd09ee9487de0fa7cfe21639977b596c637b267d094 SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699 WHIRLPOOL d2a7fa4c526e6d55ffd1e7b633aafacd862d5efbe1db448ec92abfa8f9ff52af0fa726bad1da8b8d3351e483ff3180496f6eb7a9645a278c0f18039a94dee13a
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
--- 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()
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
--- 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
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
# Copyright 1999-2015 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="|| (
|
||||
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}/${PN}-ssl.patch"
|
||||
)
|
||||
|
||||
python_install_all() {
|
||||
use doc && HTML_DOCS=( doc/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
Loading…
Reference in a new issue