From owner-svn-ports-all@freebsd.org Mon Nov 25 17:18:36 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A42B41B2F68; Mon, 25 Nov 2019 17:18:36 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47MDJr3vjSz4fHX; Mon, 25 Nov 2019 17:18:36 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6950FFF51; Mon, 25 Nov 2019 17:18:36 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAPHIaPY093340; Mon, 25 Nov 2019 17:18:36 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAPHIahq093338; Mon, 25 Nov 2019 17:18:36 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201911251718.xAPHIahq093338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Mon, 25 Nov 2019 17:18:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518410 - in head/textproc/py-elasticsearch5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/textproc/py-elasticsearch5: . files X-SVN-Commit-Revision: 518410 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2019 17:18:36 -0000 Author: kai Date: Mon Nov 25 17:18:35 2019 New Revision: 518410 URL: https://svnweb.freebsd.org/changeset/ports/518410 Log: textproc/py-elasticsearch5: Prepare for urllib3 >= 1.25 * Backport a patch from the 7.x branch of upstream repository that fixes a possible runtime issue with urllib3 1.25 [1] since that release verifies SSL certificates by default. Disabling SSL certificate verification via "verify_certs" in elasticsearch won't work then as expected thus set "cert_reqs=CERT_NONE" explicitly to restore that behavior. PR: 241875, 229322 [1] Approved by: maintainer timeout (elastic, 14 days) MFH: 2019Q4 Added: head/textproc/py-elasticsearch5/files/patch-elasticsearch_connection_http__urllib3.py (contents, props changed) Modified: head/textproc/py-elasticsearch5/Makefile Modified: head/textproc/py-elasticsearch5/Makefile ============================================================================== --- head/textproc/py-elasticsearch5/Makefile Mon Nov 25 15:56:43 2019 (r518409) +++ head/textproc/py-elasticsearch5/Makefile Mon Nov 25 17:18:35 2019 (r518410) @@ -3,7 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 5.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 5 Added: head/textproc/py-elasticsearch5/files/patch-elasticsearch_connection_http__urllib3.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-elasticsearch5/files/patch-elasticsearch_connection_http__urllib3.py Mon Nov 25 17:18:35 2019 (r518410) @@ -0,0 +1,14 @@ +Fix verify_certs=False behavior for urllib >= 1.25. Backported from the 7.x branch: + +https://github.com/elastic/elasticsearch-py/commit/4c531c5cdbd5ba8b59be16c2fa15d5cf81d0a92f + +--- elasticsearch/connection/http_urllib3.py.orig 2018-01-16 15:26:23 UTC ++++ elasticsearch/connection/http_urllib3.py +@@ -84,6 +84,7 @@ class Urllib3HttpConnection(Connection): + 'cert_reqs': 'CERT_REQUIRED', + }) + else: ++ kw["cert_reqs"] = "CERT_NONE" + warnings.warn( + 'Connecting to %s using SSL with verify_certs=False is insecure.' % host) + kw.update({