pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Update monotone and monotone-server to 0.22 (fro...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1c768fddffa1
branches: trunk
changeset: 497992:1c768fddffa1
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Tue Aug 09 22:02:30 2005 +0000
description:
Update monotone and monotone-server to 0.22 (from 0.19):
Mon Aug 8 23:23:53 PDT 2005
0.22 release. new crypto library, bug fixes, ui improvements
- switch from crypto++ to botan as underlying crypto library.
this should not cause any user-visible changes; let us know
if it does. special thanks to Matt Johnston
<matt%ucc.asn.au@localhost>, Kaushik Veeraraghavan
<kaushikv%gmail.com@localhost>, Matthew Gregan
<kinetik%orcon.net.nz@localhost>.
- incompatible change to netsync permission hooks: the
get_netsync_anonymous_read_permitted hook has been removed;
instead, get_netsync_read_permitted will be called with a
key name of nil. server administrators should update/review
their configuration
- new option for merge and propagate: --lca. Until we get a
long-term solution to the various 3-way merge problems, this
should be more convenient than using explicit_merge.
- many small improvements to error messages, fixes of minor
annoyances, netsync tickers more accurate, etc.
Sun Jul 17 16:48:26 PDT 2005
0.21 release. bug fixes, performance improvements, and ui
improvements.
- fixes a number of major performance bugs in 0.20's netsync
implementation. special thanks to Matt Johnston
<matt%ucc.asn.au@localhost>.
- fixes a number of major bugs in 0.20's (rewritten)
cvs_import command.
- configury kluges to work around g++ 4.0/boost 1.32
incompatibilities. special thanks to Christof Petig
<christof%petig-baender.de@localhost>, Matthew Gregan
<kinetik%orcon.net.nz@localhost>, Jordan Breeding
<jordan.breeding%mac.com@localhost>.
- ui enhancements:
- new netsync option "--exclude": branches are included if
they match any of the given globs, unless they match any
of the given --exclude globs. special thanks to Timothy
Brownawell <tbrownaw%gmail.com@localhost>.
- new netsync option client "--set-default": makes it easy
to change default server/branches.
- "diff" now takes options "--context" and "--external", to
output context diffs and to invoke an external diff
program for full control over output formatting. new
option "--diff-args" pass arguments to external diff
program; new hook "external_diff" allows further
configuration. special thanks to Vladimir Vukicevic
<vladimirv%gmail.com@localhost>.
- b: and t: selectors now match exactly, instead of matching
as substrings. globbing is supported for inexact
matching. special thanks to Brian Downing
<bdowning%lavos.net@localhost>, Jordan Breeding
<jordan.breeding%mac.com@localhost>.
- new command 'db kill_tag_locally'. special thanks to Jordan
Breeding <jordan.breeding%mac.com@localhost>.
- now uses sqlite3 prepared statements. special thanks to
Derek Scherger <derek%echologic.com@localhost>.
- 'db migrate' is now a complete no-op if there is no
migration to do; automated scripts can now call it
optimistically and cheaply to guarantee up-to-dateness.
- new hash correctness tests. special thanks to Kaushik
Veeraraghavan <kaushikv%gmail.com@localhost>.
- upgrading from 0.20: you must run 'monotone db
migrate' once against each of your databases, to add
new sql indexes.
Tue Jul 5 23:57:10 PDT 2005
0.20 release. features, ui improvements, performance
improvements, and bug fixes.
- major changes in netsync UI: serve/sync/push/pull now take a
list of globs; clients can request arbitrary sets of
branches, not just predefined "collections". write
permissions are now granted on a per-db level (they were
before anyway).
- where you used to say, e.g., "monotone pull
net.venge.monotone", you should instead say
"monotone pull net.venge.monotone*". This may
require shell-quoting.
- 'get_netsync_write_permitted' hooks must be changed
to take only one argument, the 'identity'.
'get_netsync_{read,anonymous_read}_permitted' hooks
now take a branch argument instead of a collection,
and will be called for each branch that a client
requests.
- 0.19 clients cannot talk to 0.20 servers, and vice-versa.
- special thanks to Timothy Brownawell
<tbrownaw%gmail.com@localhost>, Richard Levitte
<richard%levitte.org@localhost>.
- other major changes:
- cvs_import re-written; many bugs fixed. now
supports tags.
- many minor netsync changes:
- netsync traffic is now cryptographically authenticated
against corruption and man-in-the-middle attacks.
special thanks to Ethan Blanton <elb%elitists.net@localhost>,
Matt Johnston <matt%ucc.asn.au@localhost>.
- new hooks that are called when server receives data:
note_netsync_*_received. special thanks to Timothy
Brownawell <tbrownaw%gmail.com@localhost>.
- ancestry graphs that pass outside the given branch
are now synchronized correctly. special thanks to
Timothy Brownawell <tbrownaw%gmail.com@localhost>.
- UI improvements:
- 'log' options changed: --depth has become --last;
new options --no-merges, --diffs, --brief.
- 'status' has new option --brief. special thanks to
Derek Scherger <derek%echologic.com@localhost>.
- 'serve' has new option --pid-file. special thanks
to Matthew Gregan <kinetik%orcon.net.nz@localhost>.
- all commands taking restrictions now take option
--depth, to limit recursion through subdirectories.
special thanks to Joel Reed <joelwreed%comcast.com@localhost>.
- merge command all take --author, --date now.
- 'checkout', 'update' take --revision, instead of
using positional arguments. special thanks to Derek
Scherger <derek%echologic.com@localhost>, Richard Levitte
<richard%levitte.org@localhost>.
- 'commit' takes new --message-file option.
- new features:
- new commands: "db kill_branch_locally", "db
kill_revision_locally", useful for correcting some
mistakes. special thanks to Brian Campbell
<brian.p.campbell%dartmouth.edu@localhost>, Sebastian Spaeth
<Sebastian%sspaeth.de@localhost>.
- new file attribute 'manual_merge', to prevent invocation of
merger on binary files. hook added to guess correct
value at 'add' time. special thanks to Riccardo
Ghetta <birrachiara%tin.it@localhost>.
- new 'earlier than', 'later than' selectors. special
thanks to Riccardo Ghetta <birrachiara%tin.it@localhost>.
- new automate commands:
- 'stdio', for efficient use by
front-ends. special thanks to Timothy Brownawell
<tbrownaw%gmail.com@localhost>.
- 'certs', for fetching certs on a revision in a
parseable (basic io-based) format. special thanks
to Grahame Bowland <grahame%angrygoats.net@localhost>.
- 'inventory' output changed incompatibly; should be
much more usable now, and stable. special thanks to
Derek Scherger <derek%echologic.com@localhost>.
- better memory/performance when handling large files.
special thanks to Eric Anderson
<anderse-monotone%cello.hpl.hp.com@localhost>, Timothy Brownawell
<tbrownaw%gmail.com@localhost>, Matt Johnston <matt%ucc.asn.au@localhost>,
Matthew Gregan <kinetik%orcon.net.nz@localhost>.
- new text mode browser in contrib/mtbrowse.sh, by Henry
Nestler <Henry%BigFoot.de@localhost>.
- improved zsh completion in contrib/monotone.zsh_completion,
by Joel Reed <joelwreed%comcast.com@localhost>.
- upgrading from 0.19: database and working copies are
fully compatible. netsync clients and servers need
to be upgraded together, as described above. the
many ui changes may require script updates.
diffstat:
devel/monotone-server/Makefile | 6 +++---
devel/monotone-server/files/branches.conf | 7 ++++---
devel/monotone-server/files/hooks.conf | 21 ++++++++-------------
devel/monotone/Makefile | 10 ++--------
devel/monotone/distinfo | 9 ++++-----
devel/monotone/patches/patch-aa | 15 ---------------
6 files changed, 21 insertions(+), 47 deletions(-)
diffs (152 lines):
diff -r 0eb871c5d836 -r 1c768fddffa1 devel/monotone-server/Makefile
--- a/devel/monotone-server/Makefile Tue Aug 09 21:33:23 2005 +0000
+++ b/devel/monotone-server/Makefile Tue Aug 09 22:02:30 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/05/21 04:10:17 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/09 22:02:31 jmmv Exp $
#
-DISTNAME= monotone-server-0.19
+DISTNAME= monotone-server-0.22
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,7 +10,7 @@
HOMEPAGE= http://www.venge.net/monotone/
COMMENT= Simplifies the configuration of a dedicated Monotone server
-DEPENDS+= monotone>=0.19:../../devel/monotone
+DEPENDS+= monotone>=0.22:../../devel/monotone
EXTRACT_ONLY= # empty
NO_BUILD= yes
diff -r 0eb871c5d836 -r 1c768fddffa1 devel/monotone-server/files/branches.conf
--- a/devel/monotone-server/files/branches.conf Tue Aug 09 21:33:23 2005 +0000
+++ b/devel/monotone-server/files/branches.conf Tue Aug 09 22:02:30 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: branches.conf,v 1.1.1.1 2005/01/12 12:52:50 jmmv Exp $
+# $NetBSD: branches.conf,v 1.2 2005/08/09 22:02:31 jmmv Exp $
#
# This file belongs to the monotone-server package. It lists all branches
-# that will be served by Monotone, each one in its own line.
+# that will be served by Monotone, each one in its own line. Shell globs
+# are allowed.
#
-#net.example.project1
+#net.example.project1*
#net.example.project2.subbranch
diff -r 0eb871c5d836 -r 1c768fddffa1 devel/monotone-server/files/hooks.conf
--- a/devel/monotone-server/files/hooks.conf Tue Aug 09 21:33:23 2005 +0000
+++ b/devel/monotone-server/files/hooks.conf Tue Aug 09 22:02:30 2005 +0000
@@ -1,4 +1,4 @@
--- $NetBSD: hooks.conf,v 1.1.1.1 2005/01/12 12:52:50 jmmv Exp $
+-- $NetBSD: hooks.conf,v 1.2 2005/08/09 22:02:31 jmmv Exp $
--
-- This file belongs to the monotone-server package. This is the typical
-- ~/.monotonerc configuration file, but is system-wide.
@@ -11,30 +11,25 @@
return false
end
-function get_netsync_read_permitted (collection, identity)
--- if (collection == "net.example.project1") then
+function get_netsync_read_permitted (branch, identity)
+-- if (branch == "net.example.project1") then
+-- if (identity == nil) then return true end
-- if (identity == "user1%example.org@localhost") then return true end
-- end
--- if (collection == "net.example.project2.subbranch") then
+-- if (branch == "net.example.project2.subbranch") then
-- if (identity == "user1%example.org@localhost") then return true end
-- if (identity == "user2%example.org@localhost") then return true end
-- end
return false
end
-function get_netsync_write_permitted (collection, identity)
--- if (collection == "net.example.project1") then
+function get_netsync_write_permitted (branch, identity)
+-- if (branch == "net.example.project1") then
-- if (identity == "user1%example.org@localhost") then return true end
-- end
--- if (collection == "net.example.project2.subbranch") then
+-- if (branch == "net.example.project2.subbranch") then
-- if (identity == "user1%example.org@localhost") then return true end
-- if (identity == "user2%example.org@localhost") then return true end
-- end
return false
end
-
-function get_netsync_anonymous_read_permitted (collection)
--- if (collection == "net.example.project1") then return true end
--- if (collection == "net.example.project2.branch2") then return true end
- return false
-end
diff -r 0eb871c5d836 -r 1c768fddffa1 devel/monotone/Makefile
--- a/devel/monotone/Makefile Tue Aug 09 21:33:23 2005 +0000
+++ b/devel/monotone/Makefile Tue Aug 09 22:02:30 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/06/18 14:33:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/09 22:02:30 jmmv Exp $
#
-DISTNAME= monotone-0.19
-PKGREVISION= 1
+DISTNAME= monotone-0.22
CATEGORIES= devel
MASTER_SITES= http://www.venge.net/monotone/downloads/
@@ -18,8 +17,6 @@
USE_LANGUAGES= c c++
USE_MAKEINFO= yes
-CONFIGURE_ARGS+= --with-bundled-lua=no
-CONFIGURE_ARGS+= --with-bundled-sqlite=no
CONFIGURE_ARGS+= BOOST_SUFFIX=-mt
PKG_OPTIONS_VAR= PKG_OPTIONS.monotone
@@ -35,10 +32,7 @@
.endif
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0eb871c5d836 -r 1c768fddffa1 devel/monotone/distinfo
--- a/devel/monotone/distinfo Tue Aug 09 21:33:23 2005 +0000
+++ b/devel/monotone/distinfo Tue Aug 09 22:02:30 2005 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/05/09 23:50:05 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/08/09 22:02:30 jmmv Exp $
-SHA1 (monotone-0.19.tar.gz) = 49a4094ecc0ca817c193bd10158d3e4f6af11cbc
-RMD160 (monotone-0.19.tar.gz) = 9bcc5f9a5d03b452f49e4d6dacda682e1f3f6a64
-Size (monotone-0.19.tar.gz) = 4796447 bytes
-SHA1 (patch-aa) = 173b48dea55518a7d4c23d90a6a958339f26f4ac
+SHA1 (monotone-0.22.tar.gz) = b72acaf4b050983d08b777844fd339f74e53ac09
+RMD160 (monotone-0.22.tar.gz) = c3aef55be673b68d9a116a94b8a5445b0770aaf7
+Size (monotone-0.22.tar.gz) = 5038069 bytes
diff -r 0eb871c5d836 -r 1c768fddffa1 devel/monotone/patches/patch-aa
--- a/devel/monotone/patches/patch-aa Tue Aug 09 21:33:23 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/05/09 23:50:06 rillig Exp $
-
-Needed for chdir() on POSIX systems.
-
---- app_state.cc.orig Sun May 1 08:09:52 2005
-+++ app_state.cc Mon May 9 19:42:52 2005
-@@ -3,6 +3,8 @@
- #include <vector>
- #ifdef WIN32
- #include <io.h> /* for chdir() */
-+#else
-+#include <unistd.h>
- #endif
- #include <cstdlib> // for strtoul()
-
Home |
Main Index |
Thread Index |
Old Index