Twisted 17.5.0:

Bugfixes:

spawnProcess no longer opens an unwanted console on Windows
The transition to the hyperlink package adds IPv6 support to twisted.python.url.URL. This is now deprecated and new code should use hyperlink directly
twisted.logger now buffers only 200 events by default (reduced from 65536) while waiting for observers to be configured.
The transition of twisted.python.url to using the hyperlink package enables a URL.click() with no arguments (or 0-length string argument) to resolve dot segments in the path.
twisted.protocols.finger now works on Python 3.
TLS-related tests now pass when run with OpenSSL 1.1.0. This makes tests pass again on macOS and Windows, as cryptography 1.8 and later include OpenSSL 1.1.0.
UNIX socket endpoints now process all messages from recvmsg's ancillary data via twisted.internet.unix.Server.doRead/twisted.internet.unix.Client.doRead, while discarding and logging ones that don't contain file descriptors.
twisted.internet.endpoints.HostnameEndpoint and twisted.web.client.Agent work again with reactors that do not provide IReactorPluggableNameResolver. This undoes the changes that broke downstream users such as treq.testing. Note that passing reactors that do not provide IReactorPluggableNameResolver to either is deprecated.
A Python 3 Perspective Broker server which receives a remote call with keyword arguments from a Python 2 client will now decode any keys which are binary to strings instead of crashing. This fixes interoperability between Python 2 Buildbot clients and Python 3 Buildbot servers.
twisted.internet._threadedselect now works on both Python 2 and 3.
twisted.internet.interfaces.IResolverSimple implementers will now always be passed bytes, properly IDNA encoded if required, on Python 2. On Python 3, they will now be passed correctly IDNA-encoded Unicode forms of the domain, taking advantage of the idna library from PyPI if possible. This is to avoid Python's standard library (which has an out of date idna module) from mis- encoding domain names when non-ASCII Unicode is passed to it.

5 files changed, 54 insertions, 88 deletions

diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index c999dd0c26d..04978d2dba9 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2017/02/16 11:10:21 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/06/21 18:35:35 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=	1
 COMMENT=	Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
 DEPENDS+=	${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
 DEPENDS+=	${PYPKGPREFIX}-constantly-[0-9]*:../../devel/py-constantly
+DEPENDS+=	${PYPKGPREFIX}-hyperlink-[0-9]*:../../www/py-hyperlink
 DEPENDS+=	${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
@@ -18,13 +18,6 @@ REPLACE_PYTHON+=	src/twisted/python/test/pullpipe.py
 
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -Du_int=uint32_t
 
-# twisted will install files present in the source directory even
-# though they were not in the tarball.  Therefore, we must clean the
-# .orig files from patches.  This is done pre-install rather than
-# post-patch so that mkpatches(1) will still work.
-pre-install:
-	rm -f ${WRKSRC}/twisted/runner/portmap.c.orig
-
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	for i in cftp ckeygen conch mailmail pyhtmlizer tkconch trial twist twistd; do \
@@ -39,7 +32,6 @@ do-test:
 # created during self test.
 CHECK_FILES_SKIP+=	${PREFIX}/${PYSITELIB}/twisted/plugins/dropin.cache
 
-# egg.mk restricts the Python version list
-.include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 4251228b5d9..0498f4baceb 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.38 2017/02/13 18:59:04 adam Exp $
+# $NetBSD: Makefile.common,v 1.39 2017/06/21 18:35:35 adam Exp $
 #
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-DISTNAME=	Twisted-17.1.0
+DISTNAME=	Twisted-17.5.0
 CATEGORIES=	net python
 MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index 9dd7d1470a7..3242399eb76 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2017/02/13 18:59:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2017/06/21 18:35:35 adam Exp $
 bin/cftp-${PYVERSSUFFIX}
 bin/ckeygen-${PYVERSSUFFIX}
 bin/conch-${PYVERSSUFFIX}
@@ -87,6 +87,9 @@ ${PYSITELIB}/twisted/application/runner/_runner.pyo
 ${PYSITELIB}/twisted/application/runner/test/__init__.py
 ${PYSITELIB}/twisted/application/runner/test/__init__.pyc
 ${PYSITELIB}/twisted/application/runner/test/__init__.pyo
+${PYSITELIB}/twisted/application/runner/test/mockreactor.py
+${PYSITELIB}/twisted/application/runner/test/mockreactor.pyc
+${PYSITELIB}/twisted/application/runner/test/mockreactor.pyo
 ${PYSITELIB}/twisted/application/runner/test/test_exit.py
 ${PYSITELIB}/twisted/application/runner/test/test_exit.pyc
 ${PYSITELIB}/twisted/application/runner/test/test_exit.pyo
@@ -495,9 +498,9 @@ ${PYSITELIB}/twisted/internet/_signals.pyo
 ${PYSITELIB}/twisted/internet/_sslverify.py
 ${PYSITELIB}/twisted/internet/_sslverify.pyc
 ${PYSITELIB}/twisted/internet/_sslverify.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/internet/_threadedselect.py
-${PLIST.py2x}${PYSITELIB}/twisted/internet/_threadedselect.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/internet/_threadedselect.pyo
+${PYSITELIB}/twisted/internet/_threadedselect.py
+${PYSITELIB}/twisted/internet/_threadedselect.pyc
+${PYSITELIB}/twisted/internet/_threadedselect.pyo
 ${PYSITELIB}/twisted/internet/_win32serialport.py
 ${PYSITELIB}/twisted/internet/_win32serialport.pyc
 ${PYSITELIB}/twisted/internet/_win32serialport.pyo
@@ -800,12 +803,12 @@ ${PYSITELIB}/twisted/internet/utils.pyo
 ${PYSITELIB}/twisted/internet/win32eventreactor.py
 ${PYSITELIB}/twisted/internet/win32eventreactor.pyc
 ${PYSITELIB}/twisted/internet/win32eventreactor.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/internet/wxreactor.py
-${PLIST.py2x}${PYSITELIB}/twisted/internet/wxreactor.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/internet/wxreactor.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/internet/wxsupport.py
-${PLIST.py2x}${PYSITELIB}/twisted/internet/wxsupport.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/internet/wxsupport.pyo
+${PYSITELIB}/twisted/internet/wxreactor.py
+${PYSITELIB}/twisted/internet/wxreactor.pyc
+${PYSITELIB}/twisted/internet/wxreactor.pyo
+${PYSITELIB}/twisted/internet/wxsupport.py
+${PYSITELIB}/twisted/internet/wxsupport.pyc
+${PYSITELIB}/twisted/internet/wxsupport.pyo
 ${PYSITELIB}/twisted/logger/__init__.py
 ${PYSITELIB}/twisted/logger/__init__.pyc
 ${PYSITELIB}/twisted/logger/__init__.pyo
@@ -947,15 +950,15 @@ ${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/mailmail.py
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/mailmail.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/mailmail.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/smtp.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/smtp.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/smtp.pyo
+${PYSITELIB}/twisted/mail/smtp.py
+${PYSITELIB}/twisted/mail/smtp.pyc
+${PYSITELIB}/twisted/mail/smtp.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.py
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/__init__.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/__init__.pyo
+${PYSITELIB}/twisted/mail/test/__init__.py
+${PYSITELIB}/twisted/mail/test/__init__.pyc
+${PYSITELIB}/twisted/mail/test/__init__.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/pop3testserver.py
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/pop3testserver.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/pop3testserver.pyo
@@ -984,9 +987,9 @@ ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3client.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.py
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_smtp.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_smtp.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_smtp.pyo
+${PYSITELIB}/twisted/mail/test/test_smtp.py
+${PYSITELIB}/twisted/mail/test/test_smtp.pyc
+${PYSITELIB}/twisted/mail/test/test_smtp.pyo
 ${PYSITELIB}/twisted/names/__init__.py
 ${PYSITELIB}/twisted/names/__init__.pyc
 ${PYSITELIB}/twisted/names/__init__.pyo
@@ -1269,9 +1272,9 @@ ${PYSITELIB}/twisted/protocols/basic.pyo
 ${PYSITELIB}/twisted/protocols/dict.py
 ${PYSITELIB}/twisted/protocols/dict.pyc
 ${PYSITELIB}/twisted/protocols/dict.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/protocols/finger.py
-${PLIST.py2x}${PYSITELIB}/twisted/protocols/finger.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/protocols/finger.pyo
+${PYSITELIB}/twisted/protocols/finger.py
+${PYSITELIB}/twisted/protocols/finger.pyc
+${PYSITELIB}/twisted/protocols/finger.pyo
 ${PYSITELIB}/twisted/protocols/ftp.py
 ${PYSITELIB}/twisted/protocols/ftp.pyc
 ${PYSITELIB}/twisted/protocols/ftp.pyo
@@ -1496,6 +1499,7 @@ ${PYSITELIB}/twisted/python/systemd.pyo
 ${PYSITELIB}/twisted/python/test/__init__.py
 ${PYSITELIB}/twisted/python/test/__init__.pyc
 ${PYSITELIB}/twisted/python/test/__init__.pyo
+${PYSITELIB}/twisted/python/test/_deprecatetests.py.3only
 ${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.py
 ${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyo
@@ -1629,8 +1633,6 @@ ${PYSITELIB}/twisted/runner/inetdconf.pyo
 ${PYSITELIB}/twisted/runner/inetdtap.py
 ${PYSITELIB}/twisted/runner/inetdtap.pyc
 ${PYSITELIB}/twisted/runner/inetdtap.pyo
-${PYSITELIB}/twisted/runner/portmap.c
-${PLIST.py2x}${PYSITELIB}/twisted/runner/portmap.so
 ${PYSITELIB}/twisted/runner/procmon.py
 ${PYSITELIB}/twisted/runner/procmon.pyc
 ${PYSITELIB}/twisted/runner/procmon.pyo
@@ -1643,9 +1645,6 @@ ${PYSITELIB}/twisted/runner/test/__init__.pyo
 ${PYSITELIB}/twisted/runner/test/test_inetdconf.py
 ${PYSITELIB}/twisted/runner/test/test_inetdconf.pyc
 ${PYSITELIB}/twisted/runner/test/test_inetdconf.pyo
-${PYSITELIB}/twisted/runner/test/test_inetdtap.py
-${PYSITELIB}/twisted/runner/test/test_inetdtap.pyc
-${PYSITELIB}/twisted/runner/test/test_inetdtap.pyo
 ${PYSITELIB}/twisted/runner/test/test_procmon.py
 ${PYSITELIB}/twisted/runner/test/test_procmon.pyc
 ${PYSITELIB}/twisted/runner/test/test_procmon.pyo
@@ -1715,9 +1714,9 @@ ${PYSITELIB}/twisted/spread/test/test_pbfailure.pyo
 ${PYSITELIB}/twisted/spread/util.py
 ${PYSITELIB}/twisted/spread/util.pyc
 ${PYSITELIB}/twisted/spread/util.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/tap/__init__.py
-${PLIST.py2x}${PYSITELIB}/twisted/tap/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/tap/__init__.pyo
+${PYSITELIB}/twisted/tap/__init__.py
+${PYSITELIB}/twisted/tap/__init__.pyc
+${PYSITELIB}/twisted/tap/__init__.pyo
 ${PYSITELIB}/twisted/tap/ftp.py
 ${PYSITELIB}/twisted/tap/ftp.pyc
 ${PYSITELIB}/twisted/tap/ftp.pyo
@@ -1878,9 +1877,9 @@ ${PYSITELIB}/twisted/test/test_failure.pyo
 ${PYSITELIB}/twisted/test/test_fdesc.py
 ${PYSITELIB}/twisted/test/test_fdesc.pyc
 ${PYSITELIB}/twisted/test/test_fdesc.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/test/test_finger.py
-${PLIST.py2x}${PYSITELIB}/twisted/test/test_finger.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/test/test_finger.pyo
+${PYSITELIB}/twisted/test/test_finger.py
+${PYSITELIB}/twisted/test/test_finger.pyc
+${PYSITELIB}/twisted/test/test_finger.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/test/test_formmethod.py
 ${PLIST.py2x}${PYSITELIB}/twisted/test/test_formmethod.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/test/test_formmethod.pyo
@@ -2268,9 +2267,9 @@ ${PYSITELIB}/twisted/web/client.pyo
 ${PYSITELIB}/twisted/web/demo.py
 ${PYSITELIB}/twisted/web/demo.pyc
 ${PYSITELIB}/twisted/web/demo.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/web/distrib.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/distrib.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/distrib.pyo
+${PYSITELIB}/twisted/web/distrib.py
+${PYSITELIB}/twisted/web/distrib.pyc
+${PYSITELIB}/twisted/web/distrib.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/web/domhelpers.py
 ${PLIST.py2x}${PYSITELIB}/twisted/web/domhelpers.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/web/domhelpers.pyo
@@ -2337,12 +2336,12 @@ ${PYSITELIB}/twisted/web/test/requesthelper.pyo
 ${PYSITELIB}/twisted/web/test/test_agent.py
 ${PYSITELIB}/twisted/web/test/test_agent.pyc
 ${PYSITELIB}/twisted/web/test/test_agent.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_cgi.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_cgi.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_cgi.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_distrib.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_distrib.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_distrib.pyo
+${PYSITELIB}/twisted/web/test/test_cgi.py
+${PYSITELIB}/twisted/web/test/test_cgi.pyc
+${PYSITELIB}/twisted/web/test/test_cgi.pyo
+${PYSITELIB}/twisted/web/test/test_distrib.py
+${PYSITELIB}/twisted/web/test/test_distrib.pyc
+${PYSITELIB}/twisted/web/test/test_distrib.pyo
 ${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_domhelpers.py
 ${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_domhelpers.pyc
 ${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_domhelpers.pyo
@@ -2418,9 +2417,9 @@ ${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_xml.pyo
 ${PYSITELIB}/twisted/web/test/test_xmlrpc.py
 ${PYSITELIB}/twisted/web/test/test_xmlrpc.pyc
 ${PYSITELIB}/twisted/web/test/test_xmlrpc.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/web/twcgi.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/twcgi.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/twcgi.pyo
+${PYSITELIB}/twisted/web/twcgi.py
+${PYSITELIB}/twisted/web/twcgi.pyc
+${PYSITELIB}/twisted/web/twcgi.pyo
 ${PYSITELIB}/twisted/web/util.py
 ${PYSITELIB}/twisted/web/util.pyc
 ${PYSITELIB}/twisted/web/util.pyo
@@ -2506,9 +2505,6 @@ ${PYSITELIB}/twisted/words/protocols/jabber/xmlstream.pyo
 ${PYSITELIB}/twisted/words/protocols/jabber/xmpp_stringprep.py
 ${PYSITELIB}/twisted/words/protocols/jabber/xmpp_stringprep.pyc
 ${PYSITELIB}/twisted/words/protocols/jabber/xmpp_stringprep.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/words/protocols/oscar.py
-${PLIST.py2x}${PYSITELIB}/twisted/words/protocols/oscar.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/words/protocols/oscar.pyo
 ${PYSITELIB}/twisted/words/service.py
 ${PYSITELIB}/twisted/words/service.pyc
 ${PYSITELIB}/twisted/words/service.pyo
@@ -2563,9 +2559,6 @@ ${PYSITELIB}/twisted/words/test/test_jabberxmlstream.pyo
 ${PYSITELIB}/twisted/words/test/test_jabberxmppstringprep.py
 ${PYSITELIB}/twisted/words/test/test_jabberxmppstringprep.pyc
 ${PYSITELIB}/twisted/words/test/test_jabberxmppstringprep.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_oscar.py
-${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_oscar.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_oscar.pyo
 ${PYSITELIB}/twisted/words/test/test_service.py
 ${PYSITELIB}/twisted/words/test/test_service.pyc
 ${PYSITELIB}/twisted/words/test/test_service.pyo
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index 12d09df6b13..d1f15a77b15 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.32 2017/02/13 18:59:04 adam Exp $
+$NetBSD: distinfo,v 1.33 2017/06/21 18:35:35 adam Exp $
 
-SHA1 (Twisted-17.1.0.tar.bz2) = 1cd9e3e39323f555a89d882cbbcf001015bd3113
-RMD160 (Twisted-17.1.0.tar.bz2) = ce9ce8386a05395b81297029b66680dc07b559eb
-SHA512 (Twisted-17.1.0.tar.bz2) = e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966
-Size (Twisted-17.1.0.tar.bz2) = 2997334 bytes
-SHA1 (patch-src_twisted_runner_portmap.c) = b3bd85bfa067bdb7050e83eeff53da83b3e6b998
+SHA1 (Twisted-17.5.0.tar.bz2) = 51e8b9ea7573f1f1154fb4fb7b04ba84af654647
+RMD160 (Twisted-17.5.0.tar.bz2) = ce39147fb5db15edbc09632492e1d4744ba07bef
+SHA512 (Twisted-17.5.0.tar.bz2) = 0fd10e5db7c87daf0d2225cec9929f1040f0c67e9605bfb1a5bc84db8b825e943cfa08e094c32c25c680bddc6587bfdc525a994ad7b785396e5ddb2621649379
+Size (Twisted-17.5.0.tar.bz2) = 2993816 bytes
diff --git a/net/py-twisted/patches/patch-src_twisted_runner_portmap.c b/net/py-twisted/patches/patch-src_twisted_runner_portmap.c
deleted file mode 100644
index 1a75adfea76..00000000000
--- a/net/py-twisted/patches/patch-src_twisted_runner_portmap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_twisted_runner_portmap.c,v 1.1 2016/11/01 15:55:46 wiz Exp $
-
-Let's be polite and let the system first include its headers before
-Python redefines everything.
-
---- src/twisted/runner/portmap.c.orig	2016-10-26 02:57:22.000000000 +0000
-+++ src/twisted/runner/portmap.c
-@@ -7,9 +7,9 @@
- 
- /* portmap.c: A simple Python wrapper for pmap_set(3) and pmap_unset(3) */
- 
--#include <Python.h>
- #include <rpc/rpc.h>
- #include <rpc/pmap_clnt.h>
-+#include <Python.h>
- 
- static PyObject * portmap_set(PyObject *self, PyObject *args)
- {