Update to Fossil 2.2:

    GIT comment tags are now handled by Fossil during import/export.
    Show the content of README files on directory listings.
    Support for Basic Authentication if enabled (default off).
    Show the hash algorithms used on the /rcvfromlist page.
    The /tarball and /zip pages now use the the r= query parameter to
    select which check-in to deliver. The uuid= query parameter is still
    accepted for backwards compatibility.
    Update the built-in SQLite to version 3.18.0.
    Run "PRAGMA optimize" on the database connection as it is closing.
    Add support for hash policies that control which of the
    Hardened-SHA1 or SHA3-256 algorithms is used to name new artifacts.
    Add the "gshow" and "gcat" subcommands to fossil stash.
    Add the /juvlist web page and use it to construct the
    Download Page of the Fossil self-hosting website using Ajax.
    Use the hardened SHA1 implemenation by Marc Stevens and Dan Shumow.
    Add the ability to read and understand artifact names that are
    based on SHA3-256 rather than SHA1, but do not actually generate any
    such names.
    Added the sha3sum command.
    Add checkbox widgets to various web pages.
    Add the fossil all ui command
    Add the /file webpage
    Enhance the /brlist webpage to make use of branch colors.
    Add support for the ms=EXACT|LIKE|GLOB|REGEXP query parameter on the
    /timeline webpage, with associated form widgets.
    Enhance the changes and status commands with many new filter options
    so that specific kinds of changes can be found without having to pipe
    through grep or sed.
    Enhanced the fossil sql command so that it opens the checkout
    database and the configuration database in addition to the
    respository database.
    Various TH1 enhancements.
    Rename crnl-glob setting to crlf-glob, but keep crnl-glob as a
    compatibility alias.
    Added the --command option to the diff command.
    Fix ticket set when using the "+" prefix with fields from the
    "ticketchng" table.
    Remove the "fusefs" command from builds that do not have the
    underlying support enabled.
    Fixes for incremental git import/export.
    Minor security enhancements to encrypted repositories.

3 files changed, 20 insertions, 7 deletions

diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 8492ad44f53..7ce8e64464e 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2017/02/21 00:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/04/19 12:23:34 joerg Exp $
 
-DISTNAME=	fossil-src-1.36
+DISTNAME=	fossil-src-2.2
 PKGNAME=	${DISTNAME:S/-src//}
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	devel scm
diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo
index db573dcefc0..ad3c192737c 100644
--- a/devel/fossil/distinfo
+++ b/devel/fossil/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.27 2016/10/25 17:57:39 kamil Exp $
+$NetBSD: distinfo,v 1.28 2017/04/19 12:23:34 joerg Exp $
 
-SHA1 (fossil-src-1.36.tar.gz) = 593e44c87aeb80559d46f5c13d4c37a922cb5662
-RMD160 (fossil-src-1.36.tar.gz) = 09bd50cb295d2ca0a38cdcf1c52131628e07e6ae
-SHA512 (fossil-src-1.36.tar.gz) = 95535d1ca2dbb891e6436b7ecd343d75f57c95bdc790c16f4c82d21b5c49e1d3509bec30332b2929ee7afa49f7a00301287e3752a8b83f153e88c91d3bbfdacf
-Size (fossil-src-1.36.tar.gz) = 4721453 bytes
+SHA1 (fossil-src-2.2.tar.gz) = b4e1899a174af3631764c6ce5309c30ff9520b22
+RMD160 (fossil-src-2.2.tar.gz) = 060a45797e4f688809f1790202ae16d04987274e
+SHA512 (fossil-src-2.2.tar.gz) = 1a1aedf3f9883a64f9f98c9a01857f5fb69cff0be23817016a4bc405b2efc85f21ac86a771d5e7314128e3fabc21444ac717017cf0935241fd4af964b7c086e0
+Size (fossil-src-2.2.tar.gz) = 4826890 bytes
+SHA1 (patch-src_export.c) = 098ed4cfc33bc559e08f790307be2d526956f5e1
diff --git a/devel/fossil/patches/patch-src_export.c b/devel/fossil/patches/patch-src_export.c
new file mode 100644
index 00000000000..c41d7057508
--- /dev/null
+++ b/devel/fossil/patches/patch-src_export.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_export.c,v 1.1 2017/04/19 12:23:34 joerg Exp $
+
+--- src/export.c.orig	2017-04-19 12:13:17.766852878 +0000
++++ src/export.c
+@@ -511,6 +511,7 @@ void export_cmd(void){
+   db_multi_exec("CREATE TEMPORARY TABLE oldblob(rid INTEGER PRIMARY KEY)");
+   db_multi_exec("CREATE TEMPORARY TABLE oldcommit(rid INTEGER PRIMARY KEY)");
+   db_multi_exec("CREATE TEMP TABLE xmark(tname TEXT UNIQUE, trid INT, tuuid TEXT)");
++  db_multi_exec("CREATE INDEX xmark_trid ON xmark(trid)");
+   if( markfile_in!=0 ){
+     Stmt qb,qc;
+     FILE *f;