[pkgsrc/pkgsrc-2008Q2]: pkgsrc/devel/mercurial pullup ticket #2455 requested ...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/82afe9cef477
branches:  pkgsrc-2008Q2
changeset: 544194:82afe9cef477
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Tue Jul 22 08:04:31 2008 +0000

description:
pullup ticket #2455 requested by drochner
mercurial: fix for path check on patch import

revisions pulled up:
pkgsrc/devel/mercurial/Makefile         1.19
pkgsrc/devel/mercurial/distinfo         1.13
pkgsrc/devel/mercurial/patches/patch-ab 1.1

   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Sat Jul 19 13:36:51 UTC 2008

   Modified Files:
           pkgsrc/devel/mercurial: Makefile distinfo
   Added Files:
           pkgsrc/devel/mercurial/patches: patch-ab

   Log Message:
   add patch from upstream CVS to fix path checking on git style patch
   import (CVE-2008-2942), bump PKGREVISION

diffstat:

 devel/mercurial/Makefile         |   3 ++-
 devel/mercurial/distinfo         |   3 ++-
 devel/mercurial/patches/patch-ab |  18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r f8be8644bf4f -r 82afe9cef477 devel/mercurial/Makefile
--- a/devel/mercurial/Makefile  Sun Jul 20 11:07:13 2008 +0000
+++ b/devel/mercurial/Makefile  Tue Jul 22 08:04:31 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2008/05/30 13:14:18 wiz Exp $
+# $NetBSD: Makefile,v 1.18.4.1 2008/07/22 08:04:31 rtr Exp $
 #
 
 DISTNAME=      mercurial-1.0.1
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  http://www.selenic.com/mercurial/release/
 
diff -r f8be8644bf4f -r 82afe9cef477 devel/mercurial/distinfo
--- a/devel/mercurial/distinfo  Sun Jul 20 11:07:13 2008 +0000
+++ b/devel/mercurial/distinfo  Tue Jul 22 08:04:31 2008 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2008/05/30 13:14:18 wiz Exp $
+$NetBSD: distinfo,v 1.12.4.1 2008/07/22 08:04:31 rtr 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 -r f8be8644bf4f -r 82afe9cef477 devel/mercurial/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/mercurial/patches/patch-ab  Tue Jul 22 08:04:31 2008 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.2.2 2008/07/22 08:04:31 rtr 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)