diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /net-im/err | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'net-im/err')
-rw-r--r-- | net-im/err/Manifest | 7 | ||||
-rw-r--r-- | net-im/err/err-6.1.7.ebuild (renamed from net-im/err/err-6.1.4.ebuild) | 64 | ||||
-rw-r--r-- | net-im/err/files/err-6.1.4-slixmpp.patch | 190 | ||||
-rw-r--r-- | net-im/err/metadata.xml | 1 |
4 files changed, 34 insertions, 228 deletions
diff --git a/net-im/err/Manifest b/net-im/err/Manifest index 008078bef012..bbb6a447465a 100644 --- a/net-im/err/Manifest +++ b/net-im/err/Manifest @@ -1,6 +1,5 @@ -AUX err-6.1.4-slixmpp.patch 8036 BLAKE2B 1217bc47c7e8dfb6496aff8f4bbb0e3c328d9491f5920a05ec0bebd9995392700499ef2d566778afd667b9ccce6d459afc59a79811d70689debf454d1663554a SHA512 dce31ad8ccc3e0df7cf3e8b228dacb276601e5dd2c087329c5d9bbfa5c491103a886f66fd558c2612851ec8f8be8eb4f064bd4b7397a7f8e60ca71440254e82f AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb -DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d -EBUILD err-6.1.4.ebuild 2398 BLAKE2B 7473ede2525b2d21818eb4eb30b172f301f54ed72b744ea046ba9f3f60172dfbdf125d98a2650bd2001d4d86ba1b5b09279f47f405719bb359863ac600f69401 SHA512 1eca01501945beb4d87dec19657f64266335846da4d5fb8a8db63a76ec018b631fe91d462994397540ef5a8abe6b4bed44669fd47e83d44d939d8203eb334707 -MISC metadata.xml 380 BLAKE2B f7ff1d900aeb6780d50175a0305a1d625a7d46419afdf40e51217935efeca4eaf95436a16794d51f7589a0fa7f22a51802051029ffd63db1e74727bab2169d43 SHA512 54aef259890a22f028adf553b29b1b2e96363f6c53b4986b894cbd70511b8c7c372571053f6f6e4b7bdce16b0d8e22ac48d7fd7b8916cfe29ee4e938bc42057a +DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b +EBUILD err-6.1.7.ebuild 2301 BLAKE2B db443e087f79581fe8b2923c2ade30fbc2d5f895972407388aece1e8bfa49c8c6c5acd69c45a60286ea3a87c3be5b98fd18bebd9a1a67ac379ec30d6b6e3357a SHA512 a26edde9eb6479a18a216a3538551d1bd5a0c6f69600f55e3abb9e7029b5359ff8c29c3efdeff96119d12e8d97a587fb12b812348969c46aadf87d59da7e91ef +MISC metadata.xml 404 BLAKE2B 48dcc65233789fccd5fb8e8c578416d5d4af4deb9c3263161ef95417f910d8e856cccebbc0362acd9cb4e8869a73d0a3fb0c9a648cfe23ae582c8ebf98144379 SHA512 dbe913214c697fdd99816bd2f3ccb190d557000cc489130dda73942aeb07e0843d6765e70859c7b7ca5217c3ec8cde26d45d02036f656f0520f1f2c0f2fb1ec5 diff --git a/net-im/err/err-6.1.4.ebuild b/net-im/err/err-6.1.7.ebuild index 65c20b5d54fb..c5e128e55c30 100644 --- a/net-im/err/err-6.1.4.ebuild +++ b/net-im/err/err-6.1.7.ebuild @@ -1,41 +1,43 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 MY_PN="errbot" MY_P="${MY_PN}-${PV}" -inherit distutils-r1 user - DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable" HOMEPAGE="https://errbot.readthedocs.io/en/latest/" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" IUSE="irc +xmpp" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=" +DEPEND=" + acct-group/err + acct-user/err" +RDEPEND="${DEPEND} dev-python/ansi[${PYTHON_USEDEP}] dev-python/bottle[${PYTHON_USEDEP}] dev-python/colorlog[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] dev-python/daemonize[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/dulwich-0.19.16[${PYTHON_USEDEP}] + dev-python/deepmerge[${PYTHON_USEDEP}] + dev-python/dulwich[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] - <dev-python/markdown-3.0[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/webtest[${PYTHON_USEDEP}] - dev-python/yapsy[${PYTHON_USEDEP}] irc? ( dev-python/irc[${PYTHON_USEDEP}] ) @@ -43,35 +45,29 @@ RDEPEND=" dev-python/pyasn1[${PYTHON_USEDEP}] dev-python/pyasn1-modules[${PYTHON_USEDEP}] dev-python/slixmpp[${PYTHON_USEDEP}] - ) -" + )" +BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" -PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" ) +distutils_enable_tests pytest -S="${WORKDIR}/${MY_P}" +python_prepare_all() { + sed -i -e '/pygments-markdown-lexer/d' setup.py || die -# NOTES: -# 1. Support for BOT_SENTRY option is missing, cause -# we do not have apropriate packages in portage yet -# 2. Currently only XMPP is supported(IRC still untested) -# 3. Internal web server is temporarily removed (rocket-err from requires.txt) -# 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt) - -pkg_setup() { - ebegin "Creating err group and user" - enewgroup 'err' - enewuser 'err' -1 -1 -1 'err' - eend ${?} + # NameError: name 'slack' is not defined + rm tests/backend_tests/slack_test.py || die + + distutils-r1_python_prepare_all } -python_prepare_all() { - sed -i \ - -e '/rocket-errbot/d' \ - -e 's/dnspython3/dnspython/' \ - -e '/pygments-markdown-lexer/d' \ - setup.py || die +python_test() { + local deselect=( + --deselect tests/commands_test.py::test_plugin_cycle + --deselect tests/commands_test.py::test_broken_plugin + --deselect tests/commands_test.py::test_backup + --deselect tests/plugin_management_test.py::test_check_dependencies_requi + ) - distutils-r1_python_prepare_all + pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}" } python_install_all() { diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch deleted file mode 100644 index ccccc171f238..000000000000 --- a/net-im/err/files/err-6.1.4-slixmpp.patch +++ /dev/null @@ -1,190 +0,0 @@ -From e68c539c727c7275665a198fc7a217a3c1ad3be2 Mon Sep 17 00:00:00 2001 -From: Birger Schacht <1143280+bisco2@users.noreply.github.com> -Date: Sat, 11 Jul 2020 11:20:53 +0000 -Subject: [PATCH] Replace sleekxmpp with slixmpp (#1430) - -* Start moving to slixmpp - -* Pass a default value for ssl_version to the XMPPConnection ---- - .../plugin_development/backend_specifics.rst | 6 +-- - errbot/backends/xmpp.py | 49 +++++++++---------- - setup.py | 4 +- - -diff --git a/errbot/backends/xmpp.py b/errbot/backends/xmpp.py -index 08f49340..e27c2893 100644 ---- a/errbot/backends/xmpp.py -+++ b/errbot/backends/xmpp.py -@@ -2,7 +2,6 @@ - import sys - from functools import lru_cache - --from threading import Thread - from time import sleep - - from errbot.backends.base import Message, Room, Presence, RoomNotJoinedError, Identifier, RoomOccupant, Person -@@ -13,10 +12,10 @@ - log = logging.getLogger(__name__) - - try: -- from sleekxmpp import ClientXMPP -- from sleekxmpp.xmlstream import resolver, cert -- from sleekxmpp import JID -- from sleekxmpp.exceptions import IqError -+ from slixmpp import ClientXMPP -+ from slixmpp.xmlstream import resolver, cert -+ from slixmpp import JID -+ from slixmpp.exceptions import IqError - - except ImportError: - log.exception("Could not start the XMPP backend") -@@ -114,15 +113,10 @@ def join(self, username=None, password=None): - :meth:`create` on it first. - """ - room = str(self) -- self.xep0045.joinMUC(room, username, password=password, wait=True) -+ self.xep0045.join_muc(room, username, password=password, wait=True) - self._bot.conn.add_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat) - self._bot.conn.add_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat) -- # Room configuration can only be done once a MUC presence stanza -- # has been received from the server. This HAS to take place in a -- # separate thread because of how SleekXMPP processes these stanzas. -- t = Thread(target=self.configure) -- t.setDaemon(True) -- t.start() -+ self.configure() - self._bot.callback_room_joined(self) - log.info('Joined room %s.', room) - -@@ -137,7 +131,7 @@ def leave(self, reason=None): - reason = "" - room = str(self) - try: -- self.xep0045.leaveMUC(room=room, nick=self.xep0045.ourNicks[room], msg=reason) -+ self.xep0045.leave_muc(room=room, nick=self.xep0045.ourNicks[room], msg=reason) - - self._bot.conn.del_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat) - self._bot.conn.del_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat) -@@ -148,7 +142,7 @@ def leave(self, reason=None): - - def create(self): - """ -- Not supported on this back-end (SleekXMPP doesn't support it). -+ Not supported on this back-end (Slixmpp doesn't support it). - Will join the room to ensure it exists, instead. - """ - logging.warning( -@@ -186,7 +180,7 @@ def joined(self): - :getter: - Returns `True` if the room has been joined, `False` otherwise. - """ -- return str(self) in self.xep0045.getJoinedRooms() -+ return str(self) in self.xep0045.get_joined_rooms() - - @property - def topic(self): -@@ -214,7 +208,7 @@ def topic(self, topic): - :param topic: - The topic to set. - """ -- # Not supported by SleekXMPP at the moment :( -+ # Not supported by Slixmpp at the moment :( - raise NotImplementedError("Setting the topic is not supported on this back-end.") - - @property -@@ -261,16 +255,16 @@ def configure(self): - affiliation = None - while affiliation is None: - sleep(0.5) -- affiliation = self.xep0045.getJidProperty( -+ affiliation = self.xep0045.get_jid_property( - room=room, -- nick=self.xep0045.ourNicks[room], -- jidProperty='affiliation' -+ nick=self.xep0045.our_nicks[room], -+ jid_property='affiliation' - ) - - if affiliation == "owner": - log.debug('Configuring room %s: we have owner affiliation.', room) -- form = self.xep0045.getRoomConfig(room) -- self.xep0045.configureRoom(room, form) -+ form = yield from self.xep0045.get_room_config(room) -+ self.xep0045.configure_room(room, form) - else: - log.debug("Not configuring room %s: we don't have owner affiliation (affiliation=%s)", room, affiliation) - -@@ -291,7 +285,7 @@ def real_jid(self): - Will only work if the errbot is moderator in the MUC or it is not anonymous. - """ - room_jid = self._node + '@' + self._domain -- jid = JID(self._room.xep0045.getJidProperty(room_jid, self.resource, 'jid')) -+ jid = JID(self._room.xep0045.get_jid_property(room_jid, self.resource, 'jid')) - return jid.bare - - @property -@@ -303,7 +297,8 @@ def room(self): - - class XMPPConnection(object): - def __init__(self, jid, password, feature=None, keepalive=None, -- ca_cert=None, server=None, use_ipv6=None, bot=None): -+ ca_cert=None, server=None, use_ipv6=None, bot=None, -+ ssl_version=None): - if feature is None: - feature = {} - self._bot = bot -@@ -317,7 +312,7 @@ def __init__(self, jid, password, feature=None, keepalive=None, - self.client.register_plugin('xep_0249') # XMPP direct MUC invites - - if keepalive is not None: -- self.client.whitespace_keepalive = True # Just in case SleekXMPP's default changes to False in the future -+ self.client.whitespace_keepalive = True # Just in case Slixmpp's default changes to False in the future - self.client.whitespace_keepalive_interval = keepalive - - if use_ipv6 is not None: -@@ -348,7 +343,7 @@ def disconnect(self): - self.connected = False - - def serve_forever(self): -- self.client.process(block=True) -+ self.client.process() - - def add_event_handler(self, name, cb): - self.client.add_event_handler(name, cb) -@@ -447,7 +442,7 @@ def incoming_message(self, xmppmsg): - msg.to = self._build_person(xmppmsg['to'].full) - - msg.nick = xmppmsg['mucnick'] -- msg.delayed = bool(xmppmsg['delay']._get_attr('stamp')) # this is a bug in sleekxmpp it should be ['from'] -+ msg.delayed = bool(xmppmsg['delay']._get_attr('stamp')) # this is a bug in slixmpp it should be ['from'] - self.callback_message(msg) - - def _idd_from_event(self, event): -@@ -582,7 +577,7 @@ def rooms(self): - A list of :class:`~errbot.backends.base.XMPPMUCRoom` instances. - """ - xep0045 = self.conn.client.plugin['xep_0045'] -- return [XMPPRoom(room, self) for room in xep0045.getJoinedRooms()] -+ return [XMPPRoom(room, self) for room in xep0045.get_joined_rooms()] - - def query_room(self, room): - """ -diff --git a/setup.py b/setup.py -index 3d0c09f8..4a3c1ea1 100755 ---- a/setup.py -+++ b/setup.py -@@ -105,12 +105,12 @@ def read(fname, encoding='ascii'): - }, - extras_require={ - 'graphic': ['PySide', ], -- 'hipchat': ['hypchat', 'sleekxmpp', 'pyasn1', 'pyasn1-modules'], -+ 'hipchat': ['hypchat', 'slixmpp', 'pyasn1', 'pyasn1-modules'], - 'IRC': ['irc', ], - 'slack': ['slackclient>=1.0.5,<2.0', ], - 'slack-rtm': ['slackclient>=2.0', ], - 'telegram': ['python-telegram-bot', ], -- 'XMPP': ['sleekxmpp', 'pyasn1', 'pyasn1-modules'], -+ 'XMPP': ['slixmpp', 'pyasn1', 'pyasn1-modules'], - ':python_version<"3.7"': ['dataclasses'], # backward compatibility for 3.3->3.6 for dataclasses - ':sys_platform!="win32"': ['daemonize'], - }, diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml index abf56ae3f09c..6c33b0c08be1 100644 --- a/net-im/err/metadata.xml +++ b/net-im/err/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <stabilize-allarches/> <use> <flag name="irc">Pull optional dependencies, needed for IRC backend</flag> </use> |