Update net/py-netlib to 0.14.0.

Changes:
* netlib: Refactored HTTP protocol handling code
* netlib: ALPN support
* netlib: fixed a bug in the optional certificate verification.
* netlib: Initial Python 3.5 support (this is the first prerequisite for
  3.x support in mitmproxy)

3 files changed, 147 insertions, 77 deletions

diff --git a/net/py-netlib/Makefile b/net/py-netlib/Makefile
index 810a02cede5..aa3cd711361 100644
--- a/net/py-netlib/Makefile
+++ b/net/py-netlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/08/23 14:31:25 leot Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/16 18:32:32 leot Exp $
 
-DISTNAME=	netlib-0.13.1
+DISTNAME=	netlib-0.14.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PYPI:=n/netlib/}
+MASTER_SITES=	${MASTER_SITE_PYPI}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://github.com/mitmproxy/netlib
@@ -14,12 +14,19 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.15.1:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.7:../../security/py-asn1
-DEPENDS+=	${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
-DEPENDS+=	${PYPKGPREFIX}-cryptography>=0.9:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-backports.ssl_match_hostname>=3.4.0.2:../../security/py-backports.ssl_match_hostname
+DEPENDS+=	${PYPKGPREFIX}-certifi>=2015.9.6.2:../../security/py-certifi
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.0:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-hpack>=1.0.1:../../net/py-hpack
+DEPENDS+=	${PYPKGPREFIX}-ipaddress>=1.0.14:../../net/py-ipaddress
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.2:../../security/py-passlib
+DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.13.1
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.14.0
+
+# XXX: Get rid of garbage files (probably will not needed for future versions)
+pre-configure:
+	rm -rf ${WRKSRC}/netlib/__pycache__/
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-netlib/PLIST b/net/py-netlib/PLIST
index f9a02dfed47..0c8b0e13c6f 100644
--- a/net/py-netlib/PLIST
+++ b/net/py-netlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/23 14:31:25 leot Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/11/16 18:32:32 leot Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -12,30 +12,57 @@ ${PYSITELIB}/netlib/__init__.pyo
 ${PYSITELIB}/netlib/certutils.py
 ${PYSITELIB}/netlib/certutils.pyc
 ${PYSITELIB}/netlib/certutils.pyo
-${PYSITELIB}/netlib/http.py
-${PYSITELIB}/netlib/http.pyc
-${PYSITELIB}/netlib/http.pyo
-${PYSITELIB}/netlib/http2/__init__.py
-${PYSITELIB}/netlib/http2/__init__.pyc
-${PYSITELIB}/netlib/http2/__init__.pyo
-${PYSITELIB}/netlib/http2/frame.py
-${PYSITELIB}/netlib/http2/frame.pyc
-${PYSITELIB}/netlib/http2/frame.pyo
-${PYSITELIB}/netlib/http2/protocol.py
-${PYSITELIB}/netlib/http2/protocol.pyc
-${PYSITELIB}/netlib/http2/protocol.pyo
-${PYSITELIB}/netlib/http_auth.py
-${PYSITELIB}/netlib/http_auth.pyc
-${PYSITELIB}/netlib/http_auth.pyo
-${PYSITELIB}/netlib/http_cookies.py
-${PYSITELIB}/netlib/http_cookies.pyc
-${PYSITELIB}/netlib/http_cookies.pyo
-${PYSITELIB}/netlib/http_status.py
-${PYSITELIB}/netlib/http_status.pyc
-${PYSITELIB}/netlib/http_status.pyo
-${PYSITELIB}/netlib/http_uastrings.py
-${PYSITELIB}/netlib/http_uastrings.pyc
-${PYSITELIB}/netlib/http_uastrings.pyo
+${PYSITELIB}/netlib/encoding.py
+${PYSITELIB}/netlib/encoding.pyc
+${PYSITELIB}/netlib/encoding.pyo
+${PYSITELIB}/netlib/exceptions.py
+${PYSITELIB}/netlib/exceptions.pyc
+${PYSITELIB}/netlib/exceptions.pyo
+${PYSITELIB}/netlib/http/__init__.py
+${PYSITELIB}/netlib/http/__init__.pyc
+${PYSITELIB}/netlib/http/__init__.pyo
+${PYSITELIB}/netlib/http/authentication.py
+${PYSITELIB}/netlib/http/authentication.pyc
+${PYSITELIB}/netlib/http/authentication.pyo
+${PYSITELIB}/netlib/http/cookies.py
+${PYSITELIB}/netlib/http/cookies.pyc
+${PYSITELIB}/netlib/http/cookies.pyo
+${PYSITELIB}/netlib/http/headers.py
+${PYSITELIB}/netlib/http/headers.pyc
+${PYSITELIB}/netlib/http/headers.pyo
+${PYSITELIB}/netlib/http/http1/__init__.py
+${PYSITELIB}/netlib/http/http1/__init__.pyc
+${PYSITELIB}/netlib/http/http1/__init__.pyo
+${PYSITELIB}/netlib/http/http1/assemble.py
+${PYSITELIB}/netlib/http/http1/assemble.pyc
+${PYSITELIB}/netlib/http/http1/assemble.pyo
+${PYSITELIB}/netlib/http/http1/read.py
+${PYSITELIB}/netlib/http/http1/read.pyc
+${PYSITELIB}/netlib/http/http1/read.pyo
+${PYSITELIB}/netlib/http/http2/__init__.py
+${PYSITELIB}/netlib/http/http2/__init__.pyc
+${PYSITELIB}/netlib/http/http2/__init__.pyo
+${PYSITELIB}/netlib/http/http2/connections.py
+${PYSITELIB}/netlib/http/http2/connections.pyc
+${PYSITELIB}/netlib/http/http2/connections.pyo
+${PYSITELIB}/netlib/http/http2/frame.py
+${PYSITELIB}/netlib/http/http2/frame.pyc
+${PYSITELIB}/netlib/http/http2/frame.pyo
+${PYSITELIB}/netlib/http/message.py
+${PYSITELIB}/netlib/http/message.pyc
+${PYSITELIB}/netlib/http/message.pyo
+${PYSITELIB}/netlib/http/request.py
+${PYSITELIB}/netlib/http/request.pyc
+${PYSITELIB}/netlib/http/request.pyo
+${PYSITELIB}/netlib/http/response.py
+${PYSITELIB}/netlib/http/response.pyc
+${PYSITELIB}/netlib/http/response.pyo
+${PYSITELIB}/netlib/http/status_codes.py
+${PYSITELIB}/netlib/http/status_codes.pyc
+${PYSITELIB}/netlib/http/status_codes.pyo
+${PYSITELIB}/netlib/http/user_agents.py
+${PYSITELIB}/netlib/http/user_agents.pyc
+${PYSITELIB}/netlib/http/user_agents.pyo
 ${PYSITELIB}/netlib/odict.py
 ${PYSITELIB}/netlib/odict.pyc
 ${PYSITELIB}/netlib/odict.pyo
@@ -45,6 +72,9 @@ ${PYSITELIB}/netlib/socks.pyo
 ${PYSITELIB}/netlib/tcp.py
 ${PYSITELIB}/netlib/tcp.pyc
 ${PYSITELIB}/netlib/tcp.pyo
+${PYSITELIB}/netlib/tutils.py
+${PYSITELIB}/netlib/tutils.pyc
+${PYSITELIB}/netlib/tutils.pyo
 ${PYSITELIB}/netlib/utils.py
 ${PYSITELIB}/netlib/utils.pyc
 ${PYSITELIB}/netlib/utils.pyo
@@ -54,9 +84,15 @@ ${PYSITELIB}/netlib/version.pyo
 ${PYSITELIB}/netlib/version_check.py
 ${PYSITELIB}/netlib/version_check.pyc
 ${PYSITELIB}/netlib/version_check.pyo
-${PYSITELIB}/netlib/websockets.py
-${PYSITELIB}/netlib/websockets.pyc
-${PYSITELIB}/netlib/websockets.pyo
+${PYSITELIB}/netlib/websockets/__init__.py
+${PYSITELIB}/netlib/websockets/__init__.pyc
+${PYSITELIB}/netlib/websockets/__init__.pyo
+${PYSITELIB}/netlib/websockets/frame.py
+${PYSITELIB}/netlib/websockets/frame.pyc
+${PYSITELIB}/netlib/websockets/frame.pyo
+${PYSITELIB}/netlib/websockets/protocol.py
+${PYSITELIB}/netlib/websockets/protocol.pyc
+${PYSITELIB}/netlib/websockets/protocol.pyo
 ${PYSITELIB}/netlib/wsgi.py
 ${PYSITELIB}/netlib/wsgi.pyc
 ${PYSITELIB}/netlib/wsgi.pyo
@@ -75,41 +111,68 @@ ${PYSITELIB}/test/data/server.key
 ${PYSITELIB}/test/data/text_cert
 ${PYSITELIB}/test/data/text_cert_2
 ${PYSITELIB}/test/data/text_cert_weird1
-${PYSITELIB}/test/data/verificationcerts/8117bdb9.0
-${PYSITELIB}/test/data/verificationcerts/9d45e6a9.0
-${PYSITELIB}/test/data/verificationcerts/interm.key
-${PYSITELIB}/test/data/verificationcerts/trusted-chain.crt
-${PYSITELIB}/test/data/verificationcerts/trusted-interm.crt
-${PYSITELIB}/test/data/verificationcerts/trusted.key
-${PYSITELIB}/test/data/verificationcerts/trusted.pem
-${PYSITELIB}/test/data/verificationcerts/untrusted-chain.crt
-${PYSITELIB}/test/data/verificationcerts/untrusted-interm.crt
-${PYSITELIB}/test/data/verificationcerts/untrusted.crt
-${PYSITELIB}/test/data/verificationcerts/verification-server.key
-${PYSITELIB}/test/http2/__init__.py
-${PYSITELIB}/test/http2/__init__.pyc
-${PYSITELIB}/test/http2/__init__.pyo
-${PYSITELIB}/test/http2/test_frames.py
-${PYSITELIB}/test/http2/test_frames.pyc
-${PYSITELIB}/test/http2/test_frames.pyo
-${PYSITELIB}/test/http2/test_protocol.py
-${PYSITELIB}/test/http2/test_protocol.pyc
-${PYSITELIB}/test/http2/test_protocol.pyo
+${PYSITELIB}/test/data/verificationcerts/9da13359.0
+${PYSITELIB}/test/data/verificationcerts/generate.py
+${PYSITELIB}/test/data/verificationcerts/generate.pyc
+${PYSITELIB}/test/data/verificationcerts/generate.pyo
+${PYSITELIB}/test/data/verificationcerts/self-signed.crt
+${PYSITELIB}/test/data/verificationcerts/self-signed.key
+${PYSITELIB}/test/data/verificationcerts/trusted-leaf.crt
+${PYSITELIB}/test/data/verificationcerts/trusted-leaf.key
+${PYSITELIB}/test/data/verificationcerts/trusted-root.crt
+${PYSITELIB}/test/data/verificationcerts/trusted-root.key
+${PYSITELIB}/test/data/verificationcerts/trusted-root.srl
+${PYSITELIB}/test/http/__init__.py
+${PYSITELIB}/test/http/__init__.pyc
+${PYSITELIB}/test/http/__init__.pyo
+${PYSITELIB}/test/http/http1/__init__.py
+${PYSITELIB}/test/http/http1/__init__.pyc
+${PYSITELIB}/test/http/http1/__init__.pyo
+${PYSITELIB}/test/http/http1/test_assemble.py
+${PYSITELIB}/test/http/http1/test_assemble.pyc
+${PYSITELIB}/test/http/http1/test_assemble.pyo
+${PYSITELIB}/test/http/http1/test_read.py
+${PYSITELIB}/test/http/http1/test_read.pyc
+${PYSITELIB}/test/http/http1/test_read.pyo
+${PYSITELIB}/test/http/http2/__init__.py
+${PYSITELIB}/test/http/http2/__init__.pyc
+${PYSITELIB}/test/http/http2/__init__.pyo
+${PYSITELIB}/test/http/http2/test_frames.py
+${PYSITELIB}/test/http/http2/test_frames.pyc
+${PYSITELIB}/test/http/http2/test_frames.pyo
+${PYSITELIB}/test/http/http2/test_protocol.py
+${PYSITELIB}/test/http/http2/test_protocol.pyc
+${PYSITELIB}/test/http/http2/test_protocol.pyo
+${PYSITELIB}/test/http/test_authentication.py
+${PYSITELIB}/test/http/test_authentication.pyc
+${PYSITELIB}/test/http/test_authentication.pyo
+${PYSITELIB}/test/http/test_cookies.py
+${PYSITELIB}/test/http/test_cookies.pyc
+${PYSITELIB}/test/http/test_cookies.pyo
+${PYSITELIB}/test/http/test_headers.py
+${PYSITELIB}/test/http/test_headers.pyc
+${PYSITELIB}/test/http/test_headers.pyo
+${PYSITELIB}/test/http/test_message.py
+${PYSITELIB}/test/http/test_message.pyc
+${PYSITELIB}/test/http/test_message.pyo
+${PYSITELIB}/test/http/test_request.py
+${PYSITELIB}/test/http/test_request.pyc
+${PYSITELIB}/test/http/test_request.pyo
+${PYSITELIB}/test/http/test_response.py
+${PYSITELIB}/test/http/test_response.pyc
+${PYSITELIB}/test/http/test_response.pyo
+${PYSITELIB}/test/http/test_status_codes.py
+${PYSITELIB}/test/http/test_status_codes.pyc
+${PYSITELIB}/test/http/test_status_codes.pyo
+${PYSITELIB}/test/http/test_user_agents.py
+${PYSITELIB}/test/http/test_user_agents.pyc
+${PYSITELIB}/test/http/test_user_agents.pyo
 ${PYSITELIB}/test/test_certutils.py
 ${PYSITELIB}/test/test_certutils.pyc
 ${PYSITELIB}/test/test_certutils.pyo
-${PYSITELIB}/test/test_http.py
-${PYSITELIB}/test/test_http.pyc
-${PYSITELIB}/test/test_http.pyo
-${PYSITELIB}/test/test_http_auth.py
-${PYSITELIB}/test/test_http_auth.pyc
-${PYSITELIB}/test/test_http_auth.pyo
-${PYSITELIB}/test/test_http_cookies.py
-${PYSITELIB}/test/test_http_cookies.pyc
-${PYSITELIB}/test/test_http_cookies.pyo
-${PYSITELIB}/test/test_http_uastrings.py
-${PYSITELIB}/test/test_http_uastrings.pyc
-${PYSITELIB}/test/test_http_uastrings.pyo
+${PYSITELIB}/test/test_encoding.py
+${PYSITELIB}/test/test_encoding.pyc
+${PYSITELIB}/test/test_encoding.pyo
 ${PYSITELIB}/test/test_imports.py
 ${PYSITELIB}/test/test_imports.pyc
 ${PYSITELIB}/test/test_imports.pyo
@@ -128,15 +191,15 @@ ${PYSITELIB}/test/test_utils.pyo
 ${PYSITELIB}/test/test_version_check.py
 ${PYSITELIB}/test/test_version_check.pyc
 ${PYSITELIB}/test/test_version_check.pyo
-${PYSITELIB}/test/test_websockets.py
-${PYSITELIB}/test/test_websockets.pyc
-${PYSITELIB}/test/test_websockets.pyo
 ${PYSITELIB}/test/test_wsgi.py
 ${PYSITELIB}/test/test_wsgi.pyc
 ${PYSITELIB}/test/test_wsgi.pyo
 ${PYSITELIB}/test/tservers.py
 ${PYSITELIB}/test/tservers.pyc
 ${PYSITELIB}/test/tservers.pyo
-${PYSITELIB}/test/tutils.py
-${PYSITELIB}/test/tutils.pyc
-${PYSITELIB}/test/tutils.pyo
+${PYSITELIB}/test/websockets/__init__.py
+${PYSITELIB}/test/websockets/__init__.pyc
+${PYSITELIB}/test/websockets/__init__.pyo
+${PYSITELIB}/test/websockets/test_websockets.py
+${PYSITELIB}/test/websockets/test_websockets.pyc
+${PYSITELIB}/test/websockets/test_websockets.pyo
diff --git a/net/py-netlib/distinfo b/net/py-netlib/distinfo
index 577362327d5..a7e5dd8c3ba 100644
--- a/net/py-netlib/distinfo
+++ b/net/py-netlib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 00:35:31 agc Exp $
+$NetBSD: distinfo,v 1.6 2015/11/16 18:32:32 leot Exp $
 
-SHA1 (netlib-0.13.1.tar.gz) = 750a635a1fbcd24089805bf2cf38c2bc1790a7e5
-RMD160 (netlib-0.13.1.tar.gz) = 6eeece7262d8b57f0d7efca6e0825cfab3d83cfc
-SHA512 (netlib-0.13.1.tar.gz) = 9a8706b917d76ed9750d17b915fd8d140dc68c933f9405dfcc859fdb1974807113168b4b21e1c0f4fff820dc645ea6bbd515490b2855ff9dc3666d5b8202c5fc
-Size (netlib-0.13.1.tar.gz) = 71293 bytes
+SHA1 (netlib-0.14.0.tar.gz) = 4788912485e72cb7b57020578d45282fa7bf1416
+RMD160 (netlib-0.14.0.tar.gz) = ad3da450ea603d42d82096d21c56c4056b06196a
+SHA512 (netlib-0.14.0.tar.gz) = a6f6f59f9aecf8321b7251cc4108b836ab3b203239eea570427f7c3eb5848ba1d57dfccd14f2a0432140e511baadf666b67dadf6ade3642aecf90cc107276c2b
+Size (netlib-0.14.0.tar.gz) = 92426 bytes