--- a/components/mercurial/Makefile Tue Apr 18 09:26:27 2017 -0700
+++ b/components/mercurial/Makefile Tue Apr 18 09:04:46 2017 -0700
@@ -28,16 +28,16 @@
PATH=$(USRBINDIR):$(GNUBIN):$(USRSBINDIR)
COMPONENT_NAME= mercurial
-COMPONENT_VERSION= 4.1
+COMPONENT_VERSION= 4.1.3
COMPONENT_PROJECT_URL= http://mercurial-scm.org/
COMPONENT_ARCHIVE_HASH= \
- sha256:7b33c32cdd1d518bc2e2ae223e6ef63c486cf52e9d01a45b99cf8eab7bea5274
+ sha256:103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8
COMPONENT_ARCHIVE_URL= https://www.mercurial-scm.org/release/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_BUGDB= utility/hg
COMPONENT_ANITYA_ID= 1969
-TPNO= 33715
+TPNO= 34883
# Mercurial does not yet support Python 3.
PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
--- a/components/mercurial/patches/manpages.patch Tue Apr 18 09:26:27 2017 -0700
+++ b/components/mercurial/patches/manpages.patch Tue Apr 18 09:04:46 2017 -0700
@@ -13170,6 +13170,6 @@
.sp
-This manual page is copyright 2005 Bryan O\(aqSullivan.
+This manual page is copyright 2005 Bryan O'Sullivan.
- Mercurial is copyright 2005\-2016 Matt Mackall.
+ Mercurial is copyright 2005\-2017 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/sshpeer.patch Tue Apr 18 09:04:46 2017 -0700
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Augie Fackler <[email protected]>
+# Date 1492114180 14400
+# Thu Apr 13 16:09:40 2017 -0400
+# Node ID ec81fd7580f3e31aa92e8834ffbcf2a8e80e72e3
+# Parent 35afb54dbb4df2975dbbf0e1525b98611f18ba85
+sshpeer: try harder to snag stderr when stdout closes unexpectedly
+
+Resolves test failures on FreeBSD, but I'm not happy about the fix.
+
+diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py
+--- a/mercurial/sshpeer.py
++++ b/mercurial/sshpeer.py
+@@ -110,9 +110,17 @@ class doublepipe(object):
+ if mainready:
+ meth = getattr(self._main, methname)
+ if data is None:
+- return meth()
++ r = meth()
+ else:
+- return meth(data)
++ r = meth(data)
++ if not r and data != 0:
++ # We've observed a condition that indicates the
++ # stdout closed unexpectedly. Check stderr one
++ # more time and snag anything that's there before
++ # letting anyone know the main part of the pipe
++ # closed prematurely.
++ _forwardoutput(self._ui, self._side)
++ return r
+
+ def close(self):
+ return self._main.close()
Binary file tools/.gnupg/pubring.gpg has changed