diff options
author | bjs <bjs@pkgsrc.org> | 2008-08-29 21:11:00 +0000 |
---|---|---|
committer | bjs <bjs@pkgsrc.org> | 2008-08-29 21:11:00 +0000 |
commit | 2f64c14530b00fd4fb6c56a13b153a335b4d4cbe (patch) | |
tree | 55d25bc891260bfc0ad3506e29e07d0ad02f7361 /devel/mercurial | |
parent | b272dbbe41e5216839111319c19e2f8ef54413f1 (diff) | |
download | pkgsrc-2f64c14530b00fd4fb6c56a13b153a335b4d4cbe.tar.gz |
Update to mercurial-1.0.2
This is a relatively small bugfix release with two security fixes.
Security:
* ensure that git patches only touch files within the repository
(CVE-2008-2942)
* hgweb: fix "allowpull" permission being ignored when pulling from
hgweb
General:
* commit: handle copies of previously deleted files (issue 1175)
* bisect: allow for having multiple resulting changesets
* fix Python 2.3 compatibility
* make mq patches and .hgtags hardlink-safe again
* various documentation improvements and fixes
* fix a crash when addremove was called to replace a deleted directory
with a symlink
* make branches output easier to parse (issue 1230)
* fix inactive branches detection (issue 1104)
* hgweb: fix a crash in archive when the URL did not end in an
expected
archive type
* sshserver: fix a crash in error handling code
* fix the patchbomb extension on Windows by including email package in
binary installations
* handle symlinks when OS supports them but FS doesn't (issue 1149)
Extensions:
* mq:
* fix qrefresh losing metadata on the last refreshed file (issue
1134)
* fix a crash when renaming a patch just after a versioned queue
initialization
* fix the path of an explicitly specified queue when merging
patches
* strip now updates the working directory only if a parent was
stripped
* convert:
* CVS: fix a crash when converting an existing working copy
* monotone: fix quotes and backslashes parsing when reading
commit
messages
* Subversion: correctly normalize paths and slashes
* Subversion: fix compatibility with Subversion 1.5
* git: allow converter to work with recent git releases
* color:
* get coloring for qseries --verbose output
* improve mq extension detection
* reset coloring before and after outputting colorized lines
* highlight: fix a performance issue when detecting file types from
large files
* notify: take the diff options into account
Diffstat (limited to 'devel/mercurial')
-rw-r--r-- | devel/mercurial/Makefile | 5 | ||||
-rw-r--r-- | devel/mercurial/distinfo | 11 | ||||
-rw-r--r-- | devel/mercurial/patches/patch-aa | 18 | ||||
-rw-r--r-- | devel/mercurial/patches/patch-ab | 18 |
4 files changed, 16 insertions, 36 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 32cf5a62b1f..73d539561fd 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2008/07/19 13:36:51 drochner Exp $ +# $NetBSD: Makefile,v 1.20 2008/08/29 21:11:00 bjs Exp $ # -DISTNAME= mercurial-1.0.1 -PKGREVISION= 1 +DISTNAME= mercurial-1.0.2 CATEGORIES= devel scm MASTER_SITES= http://www.selenic.com/mercurial/release/ diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index 77314480797..842cf3726f3 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.13 2008/07/19 13:36:51 drochner Exp $ +$NetBSD: distinfo,v 1.14 2008/08/29 21:11:00 bjs 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 +SHA1 (mercurial-1.0.2.tar.gz) = 6d5be655276770192b889cee279bdcc0aee977e3 +RMD160 (mercurial-1.0.2.tar.gz) = 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a +Size (mercurial-1.0.2.tar.gz) = 815530 bytes +SHA1 (patch-aa) = 8ed03677099f99776e2ab19af917abeb010ab473 diff --git a/devel/mercurial/patches/patch-aa b/devel/mercurial/patches/patch-aa index 13a0ce4739e..bac54edeabf 100644 --- a/devel/mercurial/patches/patch-aa +++ b/devel/mercurial/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.6 2008/05/30 13:14:18 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2008/08/29 21:11:00 bjs Exp $ ---- doc/Makefile.orig 2008-05-22 20:48:40.000000000 +0000 +--- doc/Makefile.orig 2008-08-13 18:11:47.000000000 -0400 +++ doc/Makefile -@@ -15,7 +15,7 @@ hg.1.txt: hg.1.gendoc.txt - touch hg.1.txt +@@ -4,7 +4,7 @@ HTML=$(SOURCES:%.txt=%.html) + PREFIX=/usr/local + MANDIR=$(PREFIX)/share/man + INSTALL=install -c +-PYTHON=python ++PYTHON=$(PYTHONBIN) - hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py -- python gendoc.py > $@ -+ ${PYTHONBIN} gendoc.py > $@ + all: man html - %: %.xml - xmlto man $*.xml ; \ diff --git a/devel/mercurial/patches/patch-ab b/devel/mercurial/patches/patch-ab deleted file mode 100644 index f35701fe997..00000000000 --- a/devel/mercurial/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$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) |