CVS commit: pkgsrc/devel/py-mercurial

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 19 12:12:22 UTC 2019

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_test-https.t

Log Message:
py-mercurial: Add upstream test fix.

Now all tests pass on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-https.t

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.27 pkgsrc/devel/py-mercurial/Makefile:1.28
--- pkgsrc/devel/py-mercurial/Makefile:1.27     Thu Feb 14 09:53:06 2019
+++ pkgsrc/devel/py-mercurial/Makefile  Tue Mar 19 12:12:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/02/14 09:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/03/19 12:12:22 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -24,8 +24,7 @@ INSTALLATION_DIRS+=   share/doc/mercurial
 .include "Makefile.version"
 
 # Known test failures:
-# test-https.t:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6030
+# none
 do-test:
        cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
 

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.72 pkgsrc/devel/py-mercurial/distinfo:1.73
--- pkgsrc/devel/py-mercurial/distinfo:1.72     Thu Feb 14 09:53:06 2019
+++ pkgsrc/devel/py-mercurial/distinfo  Tue Mar 19 12:12:22 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.72 2019/02/14 09:53:06 wiz Exp $
+$NetBSD: distinfo,v 1.73 2019/03/19 12:12:22 wiz Exp $
 
 SHA1 (mercurial-4.9.tar.gz) = b6364e3fb3ba609bfaeb30b0ff3d3878909453b0
 RMD160 (mercurial-4.9.tar.gz) = bc8e47451a25be0f431262318cb2c3c84503b764
 SHA512 (mercurial-4.9.tar.gz) = 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb
 Size (mercurial-4.9.tar.gz) = 7075692 bytes
+SHA1 (patch-tests_test-https.t) = 6c02b60c4462d3c46a712d7c5dd4e9239aab84d7

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-https.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-https.t:1.1
--- /dev/null   Tue Mar 19 12:12:22 2019
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-https.t  Tue Mar 19 12:12:22 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-https.t,v 1.1 2019/03/19 12:12:22 wiz Exp $
+
+Fix test failure on NetBSD. From
+https://mercurial-scm.org/repo/hg/rev/406519302520
+
+--- tests/test-https.t.orig    2019-02-01 18:44:06.000000000 +0000
++++ tests/test-https.t
+@@ -624,7 +624,7 @@ without client certificate:
+ 
+   $ P="$CERTSDIR" hg id https://localhost:$HGPORT/
+   warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?)
+-  abort: error: *handshake failure* (glob)
++  abort: error: .*(\$ECONNRESET\$|certificate required|handshake failure).* (re)
+   [255]
+ 
+ with client certificate: