* [gentoo-commits] repo/gentoo:master commit in: dev-python/xmpppy/, dev-python/xmpppy/files/, profiles/
@ 2019-10-15 16:35 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2019-10-15 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 99140e8162aaea96d64277023371b7e465be66fc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 16:33:11 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 16:35:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99140e81
dev-python/xmpppy: Remove last-rited pkg
Closes: https://bugs.gentoo.org/694280
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/xmpppy/Manifest | 1 -
.../xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch | 28 ---------
.../files/xmpppy-hashlib_ssl_deprecation.patch | 69 ----------------------
dev-python/xmpppy/metadata.xml | 16 -----
dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild | 39 ------------
profiles/package.mask | 1 -
6 files changed, 154 deletions(-)
diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest
deleted file mode 100644
index 4e5abdff412..00000000000
--- a/dev-python/xmpppy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmpppy-0.5.0-rc1.tar.gz 84993 BLAKE2B 69cac1653e5bc8a31ed1e88acc89c5f04937d3f1dc618fef85f97167a8f4afbe8ab2d469b718dbd614508214e4074899b7ad4f31c28f6677086c1112f7dfd58f SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699
diff --git a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
deleted file mode 100644
index a39af1821fd..00000000000
--- a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Taken from https://bugs.gentoo.org/show_bug.cgi?id=535758
-Kudos to Anton Bolshakov <blshkv@pentoo.ch> for this patch
-
---- 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
-
diff --git a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
deleted file mode 100644
index 489de037a48..00000000000
--- a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
+++ /dev/null
@@ -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()
diff --git a/dev-python/xmpppy/metadata.xml b/dev-python/xmpppy/metadata.xml
deleted file mode 100644
index f972de4d862..00000000000
--- a/dev-python/xmpppy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <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-r3.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild
deleted file mode 100644
index 3fc1671aa60..00000000000
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
- "${FILESDIR}/${P}-ssl_fields.patch"
-)
-
-python_install_all() {
- use doc && HTML_DOCS=( doc/. )
- distutils-r1_python_install_all
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 86b2a0e4430..fc9b0d2fffb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -511,7 +511,6 @@ dev-python/tmdb3
dev-python/tracing
dev-python/txsocksx
dev-python/wsgilog
-dev-python/xmpppy
# Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
# Unofficial build. Superseded by official 2.49.5 release.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-15 16:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-15 16:35 [gentoo-commits] repo/gentoo:master commit in: dev-python/xmpppy/, dev-python/xmpppy/files/, profiles/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox