diff options
| author | drochner <drochner@pkgsrc.org> | 2008-07-19 13:36:51 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2008-07-19 13:36:51 +0000 |
| commit | 8dd67b175af87113f74af7997ca825cf33490b54 (patch) | |
| tree | bfb8db263addcec17d34021bb86c73cacce56765 /devel/mercurial | |
| parent | b7583fa4b8d1dce21a45a7b1dfe2bc9863e40d01 (diff) | |
| download | pkgsrc-8dd67b175af87113f74af7997ca825cf33490b54.tar.gz | |
add patch from upstream CVS to fix path checking on git style patch
import (CVE-2008-2942), bump PKGREVISION
Diffstat (limited to 'devel/mercurial')
| -rw-r--r-- | devel/mercurial/Makefile | 3 | ||||
| -rw-r--r-- | devel/mercurial/distinfo | 3 | ||||
| -rw-r--r-- | devel/mercurial/patches/patch-ab | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index cba5b29339d..32cf5a62b1f 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2008/05/30 13:14:18 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2008/07/19 13:36:51 drochner Exp $ # DISTNAME= mercurial-1.0.1 +PKGREVISION= 1 CATEGORIES= devel scm MASTER_SITES= http://www.selenic.com/mercurial/release/ diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index 8c48d9bd5d9..77314480797 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2008/05/30 13:14:18 wiz Exp $ +$NetBSD: distinfo,v 1.13 2008/07/19 13:36:51 drochner Exp $ SHA1 (mercurial-1.0.1.tar.gz) = ada3e6d2128283efeefb7b44f9a1e0dfc22d62f1 RMD160 (mercurial-1.0.1.tar.gz) = f451ab56660f46a51b4588de966ec0718f38cd7b Size (mercurial-1.0.1.tar.gz) = 809348 bytes SHA1 (patch-aa) = 561d75cf56c00ff66806586a5f89359995dd7d60 +SHA1 (patch-ab) = 8d918bf58962b9cd02622a7142c9ae4d9c17233d diff --git a/devel/mercurial/patches/patch-ab b/devel/mercurial/patches/patch-ab new file mode 100644 index 00000000000..f35701fe997 --- /dev/null +++ b/devel/mercurial/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.1 2008/07/19 13:36:51 drochner Exp $ + +--- mercurial/patch.py.orig 2008-07-19 15:16:17.000000000 +0200 ++++ mercurial/patch.py +@@ -1039,9 +1039,12 @@ def applydiff(ui, fp, changed, strip=1, + continue + elif state == 'git': + gitpatches = values ++ cwd = os.getcwd() + for gp in gitpatches: + if gp.op in ('COPY', 'RENAME'): +- copyfile(gp.oldpath, gp.path) ++ src, dst = [util.canonpath(cwd, cwd, x) ++ for x in [gp.oldpath, gp.path]] ++ copyfile(src, dst) + changed[gp.path] = (gp.op, gp) + else: + raise util.Abort(_('unsupported parser state: %s') % state) |