Commit 847fef4d authored by Olivier Duchateau's avatar Olivier Duchateau
Browse files

MFH: r405052 r407795 r408138 r410451 r412140

Update to 3.6.3 (regularly bugfix release)

Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.6.2_.282016-1-1.29

- 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

Update to 3.7.1 (out-of-cycle bugfix release)

Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7.1_.282016-2-3.29

Update to 3.7.2

Changelog: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7.2_.282016-3-1.29

Update to 2.7.3

Changes: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.7.3_.282016-3-29.29

Security:	e1085b15-f609-11e5-a230-0014a5a57822

Approved by:	ports-secteam (erwin@)
parent 103364b4
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mercurial
PORTVERSION= 3.6.2
PORTVERSION= 3.7.3
CATEGORIES= devel python
MASTER_SITES= http://mercurial.selenic.com/release/
......
SHA256 (mercurial-3.6.2.tar.gz) = 09c567049c3e30f791db0cf5937346c7ff3568deadf4eb1d4e2f7c80001cb3d6
SIZE (mercurial-3.6.2.tar.gz) = 4518349
SHA256 (mercurial-3.7.3.tar.gz) = c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30
SIZE (mercurial-3.7.3.tar.gz) = 4636732
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
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment