From 5ff162a8a58aca8ef73d2ba31a898e64c3f0d3e6 Mon Sep 17 00:00:00 2001 From: Olivier Duchateau Date: Tue, 2 Feb 2016 04:44:35 +0000 Subject: [PATCH] - Update to 3.7 - Remove unneeded patch (about unsafe SSL protocols) Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7_.282016-2-1.29 --- devel/mercurial/Makefile | 2 +- devel/mercurial/distinfo | 4 +-- .../files/patch-mercurial_sslutil.py | 18 ---------- devel/mercurial/pkg-plist | 33 +++++++++++++++++-- 4 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 devel/mercurial/files/patch-mercurial_sslutil.py diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 610fbdf10550..d2b8eb4cd266 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mercurial -PORTVERSION= 3.6.3 +PORTVERSION= 3.7 CATEGORIES= devel python MASTER_SITES= http://mercurial.selenic.com/release/ diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index e998234c6a52..05599e6297d3 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,2 +1,2 @@ -SHA256 (mercurial-3.6.3.tar.gz) = 402731f27256beb9a575a6991ca3d7059976197c905337f4f5729fd940329fa8 -SIZE (mercurial-3.6.3.tar.gz) = 4521749 +SHA256 (mercurial-3.7.tar.gz) = 888e1522f92bf97053baae7333346586b5fc34c81de14af21c0fbb009c30b933 +SIZE (mercurial-3.7.tar.gz) = 4630279 diff --git a/devel/mercurial/files/patch-mercurial_sslutil.py b/devel/mercurial/files/patch-mercurial_sslutil.py deleted file mode 100644 index 48093aef1610..000000000000 --- a/devel/mercurial/files/patch-mercurial_sslutil.py +++ /dev/null @@ -1,18 +0,0 @@ -Change condition in order to prevent SSLv2 and SSLv3 protocols. -Taken from ${PYTHON_LIBDIR}/ssl.py file (found in 'create_default_context' -function). - ---- mercurial/sslutil.py.orig 2015-07-18 22:33:53 UTC -+++ mercurial/sslutil.py -@@ -28,7 +28,10 @@ try: - # maintainers for us, but that breaks too many things to - # do it in a hurry. - sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) -- sslcontext.options &= ssl.OP_NO_SSLv2 & ssl.OP_NO_SSLv3 -+ # SSLv2 is considered harmful -+ sslcontext.options |= ssl.OP_NO_SSLv2 -+ # SSLv3 has problematic security issue -+ sslcontext.options |= ssl.OP_NO_SSLv3 - if certfile is not None: - def password(): - f = keyfile or certfile diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist index 8f113bb0f97a..6c0ccc83159c 100644 --- a/devel/mercurial/pkg-plist +++ b/devel/mercurial/pkg-plist @@ -14,6 +14,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/hgext/censor.py %%PYTHON_SITELIBDIR%%/hgext/censor.pyc %%PYTHON_SITELIBDIR%%/hgext/censor.pyo +%%PYTHON_SITELIBDIR%%/hgext/chgserver.py +%%PYTHON_SITELIBDIR%%/hgext/chgserver.pyc +%%PYTHON_SITELIBDIR%%/hgext/chgserver.pyo %%PYTHON_SITELIBDIR%%/hgext/children.py %%PYTHON_SITELIBDIR%%/hgext/children.pyc %%PYTHON_SITELIBDIR%%/hgext/children.pyo @@ -152,9 +155,6 @@ bin/hg %%PYTHON_SITELIBDIR%%/hgext/patchbomb.py %%PYTHON_SITELIBDIR%%/hgext/patchbomb.pyc %%PYTHON_SITELIBDIR%%/hgext/patchbomb.pyo -%%PYTHON_SITELIBDIR%%/hgext/progress.py -%%PYTHON_SITELIBDIR%%/hgext/progress.pyc -%%PYTHON_SITELIBDIR%%/hgext/progress.pyo %%PYTHON_SITELIBDIR%%/hgext/purge.py %%PYTHON_SITELIBDIR%%/hgext/purge.pyc %%PYTHON_SITELIBDIR%%/hgext/purge.pyo @@ -323,6 +323,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/help/hgignore.5.txt %%PYTHON_SITELIBDIR%%/mercurial/help/hgrc.5.txt %%PYTHON_SITELIBDIR%%/mercurial/help/hgweb.txt +%%PYTHON_SITELIBDIR%%/mercurial/help/internals/bundles.txt +%%PYTHON_SITELIBDIR%%/mercurial/help/internals/changegroups.txt +%%PYTHON_SITELIBDIR%%/mercurial/help/internals/revlogs.txt %%PYTHON_SITELIBDIR%%/mercurial/help/merge-tools.txt %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt %%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt @@ -465,6 +468,27 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/progress.py %%PYTHON_SITELIBDIR%%/mercurial/progress.pyc %%PYTHON_SITELIBDIR%%/mercurial/progress.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/__init__.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/__init__.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/__init__.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/base85.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/base85.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/base85.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/bdiff.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/bdiff.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/bdiff.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/diffhelpers.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/diffhelpers.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/diffhelpers.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/mpatch.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/mpatch.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/mpatch.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/osutil.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/osutil.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/osutil.pyo +%%PYTHON_SITELIBDIR%%/mercurial/pure/parsers.py +%%PYTHON_SITELIBDIR%%/mercurial/pure/parsers.pyc +%%PYTHON_SITELIBDIR%%/mercurial/pure/parsers.pyo %%PYTHON_SITELIBDIR%%/mercurial/pushkey.py %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyc %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyo @@ -474,6 +498,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.py %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyc %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyo +%%PYTHON_SITELIBDIR%%/mercurial/registrar.py +%%PYTHON_SITELIBDIR%%/mercurial/registrar.pyc +%%PYTHON_SITELIBDIR%%/mercurial/registrar.pyo %%PYTHON_SITELIBDIR%%/mercurial/repair.py %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo