summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
Diffstat (limited to 'chat')
-rw-r--r--chat/py-xmpppy/Makefile21
-rw-r--r--chat/py-xmpppy/PLIST17
-rw-r--r--chat/py-xmpppy/distinfo11
-rw-r--r--chat/py-xmpppy/patches/patch-xmpp_transports.py33
4 files changed, 28 insertions, 54 deletions
diff --git a/chat/py-xmpppy/Makefile b/chat/py-xmpppy/Makefile
index 2e53987b6e1..a67c97de4b6 100644
--- a/chat/py-xmpppy/Makefile
+++ b/chat/py-xmpppy/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2020/01/26 05:26:17 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2020/12/19 19:16:22 gdt Exp $
-DISTNAME= xmpppy-0.5.0rc1
+DISTNAME= xmpppy-0.6.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 3
CATEGORIES= chat python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmpppy/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=xmpppy/}
+GITHUB_PROJECT= xmpppy
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://xmpppy.sourceforge.net/
COMMENT= XMPP (Jabber) library for Python
LICENSE= gnu-gpl-v2
@@ -17,7 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.5.0rc1
+# fails with 0.6.2
+PYTHON_VERSIONS_ACCEPTED= 27
DOCDIR= ${PREFIX}/share/doc/py-xmpppy
EXDIR= ${PREFIX}/share/examples/py-xmpppy
@@ -26,14 +27,14 @@ INSTALLATION_DIRS+= ${DOCDIR} ${EXDIR}
post-install:
${INSTALL_SCRIPT_DIR} ${DESTDIR}${EXDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/doc/examples/*.py \
+ ${INSTALL_SCRIPT} ${WRKSRC}/docs/examples/*.py \
${DESTDIR}${EXDIR}
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html \
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.html \
${DESTDIR}${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/*.png \
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.png \
${DESTDIR}${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.css \
${DESTDIR}${DOCDIR}
.include "../../lang/python/egg.mk"
diff --git a/chat/py-xmpppy/PLIST b/chat/py-xmpppy/PLIST
index d3e9c53c4a8..4d291bbcc96 100644
--- a/chat/py-xmpppy/PLIST
+++ b/chat/py-xmpppy/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 21:06:08 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/12/19 19:16:22 gdt Exp $
+bin/xmpp-message
${PYSITELIB}/xmpp/__init__.py
${PYSITELIB}/xmpp/__init__.pyc
${PYSITELIB}/xmpp/__init__.pyo
@@ -8,6 +9,9 @@ ${PYSITELIB}/xmpp/auth.pyo
${PYSITELIB}/xmpp/browser.py
${PYSITELIB}/xmpp/browser.pyc
${PYSITELIB}/xmpp/browser.pyo
+${PYSITELIB}/xmpp/cli.py
+${PYSITELIB}/xmpp/cli.pyc
+${PYSITELIB}/xmpp/cli.pyo
${PYSITELIB}/xmpp/client.py
${PYSITELIB}/xmpp/client.pyc
${PYSITELIB}/xmpp/client.pyo
@@ -26,9 +30,6 @@ ${PYSITELIB}/xmpp/features.pyo
${PYSITELIB}/xmpp/filetransfer.py
${PYSITELIB}/xmpp/filetransfer.pyc
${PYSITELIB}/xmpp/filetransfer.pyo
-${PYSITELIB}/xmpp/jep0106.py
-${PYSITELIB}/xmpp/jep0106.pyc
-${PYSITELIB}/xmpp/jep0106.pyo
${PYSITELIB}/xmpp/protocol.py
${PYSITELIB}/xmpp/protocol.pyc
${PYSITELIB}/xmpp/protocol.pyo
@@ -44,18 +45,24 @@ ${PYSITELIB}/xmpp/simplexml.pyo
${PYSITELIB}/xmpp/transports.py
${PYSITELIB}/xmpp/transports.pyc
${PYSITELIB}/xmpp/transports.pyo
+${PYSITELIB}/xmpp/xep0106.py
+${PYSITELIB}/xmpp/xep0106.pyc
+${PYSITELIB}/xmpp/xep0106.pyo
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
share/doc/py-xmpppy/advanced.html
share/doc/py-xmpppy/basic.html
share/doc/py-xmpppy/index.html
share/doc/py-xmpppy/xmpppy.css
share/doc/py-xmpppy/xmpppy_title.png
-share/examples/py-xmpppy/README.py
+share/examples/py-xmpppy/basic.py
+share/examples/py-xmpppy/bosh.py
share/examples/py-xmpppy/bot.py
share/examples/py-xmpppy/commandsbot.py
+share/examples/py-xmpppy/demo.py
share/examples/py-xmpppy/logger.py
share/examples/py-xmpppy/xsend.py
share/examples/py-xmpppy/xtalk.py
diff --git a/chat/py-xmpppy/distinfo b/chat/py-xmpppy/distinfo
index b90d992f78e..d7c1c4b4e64 100644
--- a/chat/py-xmpppy/distinfo
+++ b/chat/py-xmpppy/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/08 22:02:57 schnoebe Exp $
+$NetBSD: distinfo,v 1.4 2020/12/19 19:16:22 gdt Exp $
-SHA1 (xmpppy-0.5.0rc1.tar.gz) = 9cff61d0133857f1e97bca615763989374b2e045
-RMD160 (xmpppy-0.5.0rc1.tar.gz) = 5a62b9de440d05d423be9f74ca437ff1f874b2fc
-SHA512 (xmpppy-0.5.0rc1.tar.gz) = 7fe91ff313533a419e125bb69163dfb122723e67ca70feab00748b5deafc0c99aa002cbebf0f89b8bc7ce465bb2c775ab98509761af07d90295bc1e9c50eee23
-Size (xmpppy-0.5.0rc1.tar.gz) = 84996 bytes
+SHA1 (xmpppy-0.6.2.tar.gz) = 352311f1a4b4edba911e8fbd9638a68c482033e7
+RMD160 (xmpppy-0.6.2.tar.gz) = acd1f4bd1ffa6998824ad1eba1e7632ebb2387c6
+SHA512 (xmpppy-0.6.2.tar.gz) = 17ea07ff88ce5a5e4a577361bac7cc68a989daf482b8573f847ea2eed467441da83cd4b7e753875d232edf539840356771063b38fcfadbc5f339b7e49b8d2fb5
+Size (xmpppy-0.6.2.tar.gz) = 190749 bytes
SHA1 (patch-xmpp_debug.py) = a410b7abd534f37bba583ca9f15bf05252bc55a0
-SHA1 (patch-xmpp_transports.py) = 12b5d827a9a70374e3c7ad329b9f1c44d27285a0
diff --git a/chat/py-xmpppy/patches/patch-xmpp_transports.py b/chat/py-xmpppy/patches/patch-xmpp_transports.py
deleted file mode 100644
index c3040b6da9c..00000000000
--- a/chat/py-xmpppy/patches/patch-xmpp_transports.py
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-xmpp_transports.py,v 1.1 2015/11/08 22:02:57 schnoebe Exp $
-
-Play better with python's after 2.6.
-
-Change how we're creating the SSL object/socket.
-Change how we're getting information about the SSL/TLS connection.
-
-Changes taken from debian patch for the same purpose.
-
---- xmpp/transports.py.orig 2009-04-07 08:34:09.000000000 +0000
-+++ xmpp/transports.py
-@@ -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
-