diff options
| author | wiz <wiz> | 2016-05-20 17:52:26 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-05-20 17:52:26 +0000 |
| commit | 952d0a2fd6b0c739d0316b5b792a65ceb1512d19 (patch) | |
| tree | c5a21539f8a008822890bd8fa143efceac5daa72 /devel | |
| parent | 82e60cfa682bb362bcd566edfe32b172a6839874 (diff) | |
| download | pkgsrc-952d0a2fd6b0c739d0316b5b792a65ceb1512d19.tar.gz | |
Fix a test failure using upstream patch.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/py-mercurial/distinfo | 3 | ||||
| -rw-r--r-- | devel/py-mercurial/patches/patch-tests_test-subrepo-git.t | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo index 08b64fdedde..1357dfc7d54 100644 --- a/devel/py-mercurial/distinfo +++ b/devel/py-mercurial/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.34 2016/05/05 12:42:46 wiz Exp $ +$NetBSD: distinfo,v 1.35 2016/05/20 17:52:26 wiz Exp $ SHA1 (mercurial-3.8.1.tar.gz) = a77ddd9640600c8901d0a870f525a660fa6251fa RMD160 (mercurial-3.8.1.tar.gz) = 0067ea6ad76a0198f0fde2e90269eef6299cd03f SHA512 (mercurial-3.8.1.tar.gz) = f5a3aae85478cf7fbb70146e56237ee569f0ad51f6bd7b7a763f4cb6333b4aa78b57fd540993c3d36ca35dbab55641e4987ab8212a0fbf32e9e3b53aee300a79 Size (mercurial-3.8.1.tar.gz) = 4766849 bytes +SHA1 (patch-tests_test-subrepo-git.t) = d4d5ab65a4e2605912882963007ed83e6f1cf747 diff --git a/devel/py-mercurial/patches/patch-tests_test-subrepo-git.t b/devel/py-mercurial/patches/patch-tests_test-subrepo-git.t new file mode 100644 index 00000000000..5c9d6508e9f --- /dev/null +++ b/devel/py-mercurial/patches/patch-tests_test-subrepo-git.t @@ -0,0 +1,21 @@ +$NetBSD: patch-tests_test-subrepo-git.t,v 1.1 2016/05/20 17:52:26 wiz Exp $ + +# HG changeset patch +# User Kevin Bullock <kbullock+mercurial@ringworld.org> +# Date 1462542084 18000 +# Node ID 3879d02cd1cc5b86ab23a4280115bcf37375dd61 +# Parent 8d5584d8345be23f98f702a421ce31b71882b4e6 +subrepo: use unset instead of env -u to fix test on BSDs (issue5229) + +--- tests/test-subrepo-git.t.orig 2016-05-01 19:36:10.000000000 +0000 ++++ tests/test-subrepo-git.t +@@ -1145,7 +1145,8 @@ test for Git CVE-2016-3068 + $ hg add .hgsub + $ hg commit -m "add subrepo" + $ cd .. +- $ env -u GIT_ALLOW_PROTOCOL hg clone malicious-subrepository malicious-subrepository-protected ++ $ unset GIT_ALLOW_PROTOCOL ++ $ hg clone malicious-subrepository malicious-subrepository-protected + Cloning into '$TESTTMP/tc/malicious-subrepository-protected/s'... (glob) + fatal: transport 'ext' not allowed + updating to branch default |