Update py-urllib3 to 1.14:

1.14 (2015-12-29)
+++++++++++++++++

* contrib: SOCKS proxy support! (Issue #762)

* Fixed AppEngine handling of transfer-encoding header and bug
  in Timeout defaults checking. (Issue #763)


1.13.1 (2015-12-18)
+++++++++++++++++++

* Fixed regression in IPv6 + SSL for match_hostname. (Issue #761)


1.13 (2015-12-14)
+++++++++++++++++

* Fixed ``pip install urllib3[secure]`` on modern pip. (Issue #706)

* pyopenssl: Fixed SSL3_WRITE_PENDING error. (Issue #717)

* pyopenssl: Support for TLSv1.1 and TLSv1.2. (Issue #696)

* Close connections more defensively on exception. (Issue #734)

* Adjusted ``read_chunked`` to handle gzipped, chunk-encoded bodies without
  repeatedly flushing the decoder, to function better on Jython. (Issue #743)

* Accept ``ca_cert_dir`` for SSL-related PoolManager configuration. (Issue #758)


1.12 (2015-09-03)
+++++++++++++++++

* Rely on ``six`` for importing ``httplib`` to work around
  conflicts with other Python 3 shims. (Issue #688)

* Add support for directories of certificate authorities, as supported by
  OpenSSL. (Issue #701)

* New exception: ``NewConnectionError``, raised when we fail to establish
  a new connection, usually ``ECONNREFUSED`` socket error.


1.11 (2015-07-21)
+++++++++++++++++

* When ``ca_certs`` is given, ``cert_reqs`` defaults to
  ``'CERT_REQUIRED'``. (Issue #650)

* ``pip install urllib3[secure]`` will install Certifi and
  PyOpenSSL as dependencies. (Issue #678)

* Made ``HTTPHeaderDict`` usable as a ``headers`` input value
  (Issues #632, #679)

* Added `urllib3.contrib.appengine <https://urllib3.readthedocs.org/en/latest/contrib.html#google-app-engine>`_
  which has an ``AppEngineManager`` for using ``URLFetch`` in a
  Google AppEngine environment. (Issue #664)

* Dev: Added test suite for AppEngine. (Issue #631)

* Fix performance regression when using PyOpenSSL. (Issue #626)

* Passing incorrect scheme (e.g. ``foo://``) will raise
  ``ValueError`` instead of ``AssertionError`` (backwards
  compatible for now, but please migrate). (Issue #640)

* Fix pools not getting replenished when an error occurs during a
  request using ``release_conn=False``. (Issue #644)

* Fix pool-default headers not applying for url-encoded requests
  like GET. (Issue #657)

* log.warning in Python 3 when headers are skipped due to parsing
  errors. (Issue #642)

* Close and discard connections if an error occurs during read.
  (Issue #660)

* Fix host parsing for IPv6 proxies. (Issue #668)

* Separate warning type SubjectAltNameWarning, now issued once
  per host. (Issue #671)

* Fix ``httplib.IncompleteRead`` not getting converted to
  ``ProtocolError`` when using ``HTTPResponse.stream()``
  (Issue #674)

1.10.4 (2015-05-03)
+++++++++++++++++++

* Migrate tests to Tornado 4. (Issue #594)

* Append default warning configuration rather than overwrite.
  (Issue #603)

* Fix streaming decoding regression. (Issue #595)

* Fix chunked requests losing state across keep-alive connections.
  (Issue #599)

* Fix hanging when chunked HEAD response has no body. (Issue #605)


1.10.3 (2015-04-21)
+++++++++++++++++++

* Emit ``InsecurePlatformWarning`` when SSLContext object is missing.
  (Issue #558)

* Fix regression of duplicate header keys being discarded.
  (Issue #563)

* ``Response.stream()`` returns a generator for chunked responses.
  (Issue #560)

* Set upper-bound timeout when waiting for a socket in PyOpenSSL.
  (Issue #585)

* Work on platforms without `ssl` module for plain HTTP requests.
  (Issue #587)

* Stop relying on the stdlib's default cipher list. (Issue #588)


1.10.2 (2015-02-25)
+++++++++++++++++++

* Fix file descriptor leakage on retries. (Issue #548)

* Removed RC4 from default cipher list. (Issue #551)

* Header performance improvements. (Issue #544)

* Fix PoolManager not obeying redirect retry settings. (Issue #553)


1.10.1 (2015-02-10)
+++++++++++++++++++

* Pools can be used as context managers. (Issue #545)

* Don't re-use connections which experienced an SSLError. (Issue #529)

* Don't fail when gzip decoding an empty stream. (Issue #535)

* Add sha256 support for fingerprint verification. (Issue #540)

* Fixed handling of header values containing commas. (Issue #533)

3 files changed, 61 insertions, 36 deletions

diff --git a/www/py-urllib3/Makefile b/www/py-urllib3/Makefile
index 8def6b331c8..56fa449e5c5 100644
--- a/www/py-urllib3/Makefile
+++ b/www/py-urllib3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/03/09 15:50:48 imil Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/02 10:17:45 wiz Exp $
 
-DISTNAME=	urllib3-1.10.1
+DISTNAME=	urllib3-1.14
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	https://pypi.python.org/packages/source/u/urllib3/
+MASTER_SITES=	${MASTER_SITE_PYPI:=u/urllib3/}
 
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://urllib3.readthedocs.org/
@@ -12,5 +12,22 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-ndg_httpsclient-[0-9]*:../../security/py-ndg_httpsclient
+DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
+DEPENDS+=	${PYPKGPREFIX}-Socks-[0-9]*:../../net/py-Socks
+
+# actually TEST_DEPENDS
+BUILD_DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
+BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+# four test failures as of 1.14, reported as
+# https://github.com/shazow/urllib3/issues/774
+do-test:
+	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-urllib3/PLIST b/www/py-urllib3/PLIST
index 04b24fc28ae..c9db1e87190 100644
--- a/www/py-urllib3/PLIST
+++ b/www/py-urllib3/PLIST
@@ -1,83 +1,91 @@
-@comment $NetBSD: PLIST,v 1.2 2015/03/09 15:50:48 imil Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/01/02 10:17:45 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/pbr.json
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/urllib3/__init__.py
 ${PYSITELIB}/urllib3/__init__.pyc
 ${PYSITELIB}/urllib3/__init__.pyo
+${PYSITELIB}/urllib3/_collections.py
 ${PYSITELIB}/urllib3/_collections.pyc
 ${PYSITELIB}/urllib3/_collections.pyo
+${PYSITELIB}/urllib3/connection.py
 ${PYSITELIB}/urllib3/connection.pyc
 ${PYSITELIB}/urllib3/connection.pyo
+${PYSITELIB}/urllib3/connectionpool.py
 ${PYSITELIB}/urllib3/connectionpool.pyc
 ${PYSITELIB}/urllib3/connectionpool.pyo
-${PYSITELIB}/urllib3/exceptions.pyc
-${PYSITELIB}/urllib3/exceptions.pyo
-${PYSITELIB}/urllib3/fields.pyc
-${PYSITELIB}/urllib3/fields.pyo
-${PYSITELIB}/urllib3/filepost.pyc
-${PYSITELIB}/urllib3/filepost.pyo
-${PYSITELIB}/urllib3/poolmanager.pyc
-${PYSITELIB}/urllib3/poolmanager.pyo
-${PYSITELIB}/urllib3/request.pyc
-${PYSITELIB}/urllib3/request.pyo
-${PYSITELIB}/urllib3/response.pyc
-${PYSITELIB}/urllib3/response.pyo
-${PYSITELIB}/urllib3/_collections.py
-${PYSITELIB}/urllib3/connection.py
-${PYSITELIB}/urllib3/connectionpool.py
 ${PYSITELIB}/urllib3/contrib/__init__.py
 ${PYSITELIB}/urllib3/contrib/__init__.pyc
 ${PYSITELIB}/urllib3/contrib/__init__.pyo
+${PYSITELIB}/urllib3/contrib/appengine.py
+${PYSITELIB}/urllib3/contrib/appengine.pyc
+${PYSITELIB}/urllib3/contrib/appengine.pyo
+${PYSITELIB}/urllib3/contrib/ntlmpool.py
 ${PYSITELIB}/urllib3/contrib/ntlmpool.pyc
 ${PYSITELIB}/urllib3/contrib/ntlmpool.pyo
+${PYSITELIB}/urllib3/contrib/pyopenssl.py
 ${PYSITELIB}/urllib3/contrib/pyopenssl.pyc
 ${PYSITELIB}/urllib3/contrib/pyopenssl.pyo
-${PYSITELIB}/urllib3/contrib/ntlmpool.py
-${PYSITELIB}/urllib3/contrib/pyopenssl.py
+${PYSITELIB}/urllib3/contrib/socks.py
+${PYSITELIB}/urllib3/contrib/socks.pyc
+${PYSITELIB}/urllib3/contrib/socks.pyo
 ${PYSITELIB}/urllib3/exceptions.py
+${PYSITELIB}/urllib3/exceptions.pyc
+${PYSITELIB}/urllib3/exceptions.pyo
 ${PYSITELIB}/urllib3/fields.py
+${PYSITELIB}/urllib3/fields.pyc
+${PYSITELIB}/urllib3/fields.pyo
 ${PYSITELIB}/urllib3/filepost.py
+${PYSITELIB}/urllib3/filepost.pyc
+${PYSITELIB}/urllib3/filepost.pyo
 ${PYSITELIB}/urllib3/packages/__init__.py
 ${PYSITELIB}/urllib3/packages/__init__.pyc
 ${PYSITELIB}/urllib3/packages/__init__.pyo
+${PYSITELIB}/urllib3/packages/ordered_dict.py
 ${PYSITELIB}/urllib3/packages/ordered_dict.pyc
 ${PYSITELIB}/urllib3/packages/ordered_dict.pyo
+${PYSITELIB}/urllib3/packages/six.py
 ${PYSITELIB}/urllib3/packages/six.pyc
 ${PYSITELIB}/urllib3/packages/six.pyo
-${PYSITELIB}/urllib3/packages/ordered_dict.py
-${PYSITELIB}/urllib3/packages/six.py
 ${PYSITELIB}/urllib3/packages/ssl_match_hostname/__init__.py
 ${PYSITELIB}/urllib3/packages/ssl_match_hostname/__init__.pyc
 ${PYSITELIB}/urllib3/packages/ssl_match_hostname/__init__.pyo
+${PYSITELIB}/urllib3/packages/ssl_match_hostname/_implementation.py
 ${PYSITELIB}/urllib3/packages/ssl_match_hostname/_implementation.pyc
 ${PYSITELIB}/urllib3/packages/ssl_match_hostname/_implementation.pyo
-${PYSITELIB}/urllib3/packages/ssl_match_hostname/_implementation.py
 ${PYSITELIB}/urllib3/poolmanager.py
+${PYSITELIB}/urllib3/poolmanager.pyc
+${PYSITELIB}/urllib3/poolmanager.pyo
 ${PYSITELIB}/urllib3/request.py
+${PYSITELIB}/urllib3/request.pyc
+${PYSITELIB}/urllib3/request.pyo
 ${PYSITELIB}/urllib3/response.py
+${PYSITELIB}/urllib3/response.pyc
+${PYSITELIB}/urllib3/response.pyo
 ${PYSITELIB}/urllib3/util/__init__.py
 ${PYSITELIB}/urllib3/util/__init__.pyc
 ${PYSITELIB}/urllib3/util/__init__.pyo
+${PYSITELIB}/urllib3/util/connection.py
 ${PYSITELIB}/urllib3/util/connection.pyc
 ${PYSITELIB}/urllib3/util/connection.pyo
+${PYSITELIB}/urllib3/util/request.py
 ${PYSITELIB}/urllib3/util/request.pyc
 ${PYSITELIB}/urllib3/util/request.pyo
+${PYSITELIB}/urllib3/util/response.py
 ${PYSITELIB}/urllib3/util/response.pyc
 ${PYSITELIB}/urllib3/util/response.pyo
+${PYSITELIB}/urllib3/util/retry.py
 ${PYSITELIB}/urllib3/util/retry.pyc
 ${PYSITELIB}/urllib3/util/retry.pyo
+${PYSITELIB}/urllib3/util/ssl_.py
 ${PYSITELIB}/urllib3/util/ssl_.pyc
 ${PYSITELIB}/urllib3/util/ssl_.pyo
+${PYSITELIB}/urllib3/util/timeout.py
 ${PYSITELIB}/urllib3/util/timeout.pyc
 ${PYSITELIB}/urllib3/util/timeout.pyo
+${PYSITELIB}/urllib3/util/url.py
 ${PYSITELIB}/urllib3/util/url.pyc
 ${PYSITELIB}/urllib3/util/url.pyo
-${PYSITELIB}/urllib3/util/connection.py
-${PYSITELIB}/urllib3/util/request.py
-${PYSITELIB}/urllib3/util/response.py
-${PYSITELIB}/urllib3/util/retry.py
-${PYSITELIB}/urllib3/util/ssl_.py
-${PYSITELIB}/urllib3/util/timeout.py
-${PYSITELIB}/urllib3/util/url.py
diff --git a/www/py-urllib3/distinfo b/www/py-urllib3/distinfo
index 319b3c753a9..4d3b5228b89 100644
--- a/www/py-urllib3/distinfo
+++ b/www/py-urllib3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 02:47:31 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/01/02 10:17:45 wiz Exp $
 
-SHA1 (urllib3-1.10.1.tar.gz) = 434ff4f51b566076ed2f41ff71f24e1b0d5c9ebd
-RMD160 (urllib3-1.10.1.tar.gz) = 807574c6a2bd477ceb160aa0a3dbd457e2043fba
-SHA512 (urllib3-1.10.1.tar.gz) = 078436f83adc7c93606bcafe3937bbd24b683051aa551e6de24d9555e2d7579473ca6a364932fd2fee0ac6910b6d2c3d4349da8c59461c024eac7a0b57c4a509
-Size (urllib3-1.10.1.tar.gz) = 129860 bytes
+SHA1 (urllib3-1.14.tar.gz) = a6df7af9bf4e834756ca390e1dd278adfd4d52ff
+RMD160 (urllib3-1.14.tar.gz) = 601c965838e20a80e1245d977f7aa66114a2a84e
+SHA512 (urllib3-1.14.tar.gz) = 8c315b442bc7454e421f2c801cc2bbfc011fb2eb5dcbd2ff7d6078dab0bb5254e3e1489496758cec190ebd0c249962fa1fe24fe6535e844a681350e9d7353562
+Size (urllib3-1.14.tar.gz) = 161497 bytes