fossil: update to 2.4.

Based on PR 52850 by dziltener@lyrion.ch.

Changes for Version 2.4 (2017-11-03)

    New feature: URL Aliases. URL Aliases allow an administrator to define their own URLs on the web interface that are rewritten to built-in URLs with specific parameters. Create and configure URL Aliases using the /Setup/URL_Aliases menu option in the web interface.
    Add tech-note search capability.
    Add the -r|--revision and -o|--origin options to the annotate command.
    Add the origin= query parameter to the /annotate webpage.
    The fossil annotate command and the /annotate web page go backwards in time as far as can be computed in 30 milliseconds by default, rather than stopping after 20 steps. The new limit= query parameter or the --limit command-line option can be used to alter this timeout.
    Provide separate on-line help screens for each setting.
    Back out support for the --no-dir-symlinks option
    Remove support from the legacy configuration sync protocol. The only way now to do a configuration push or pull is to use the new protocol that was added in 2011.
    Add the from= and to= query parameters to /fdiff in order to get a diff of two files in the same check-in.
    Fix the "ssh://" protocol to prevent an attack whereby the attacker convinces a victim to run a "clone" with a dodgy URL and thereby gains access to their system.
    Provide a checkbox that will temporarily disable all ad-units.
    Improvements to the /stat page
    Various new hyperlinks to the /bloblist and /bigbloblist pages.
    Correct the /doc page to support read-only repositories.
    Correct /zip, /tarball, zip, and tarball pages and commands to honor the versioned manifest setting when outside of an open checkout directory.
    The admin-log and access-log settings are now on by default for new repositories.
    Update the built-in SQLite to version 3.21.0.

Changes for Version 2.3 (2017-07-21)

    Update the built-in SQLite to version 3.20.0 (beta).
    Update internal Unicode character tables, used in regular expression handling, from version 9.0 to 10.0.
    Show the last-sync-URL on the /urllist page.
    Added the "Event Summary" activity report. example
    Added the "Security Audit" page, available to administrators only
    Added the Last Login time to the user list page, for administrators only
    Added the --numstat option to the fossil diff command
    Limit the size of the heap and stack on unix systems, as a proactive defense against the Stack Clash attack.
    Fix "database locked" warnings caused by "PRAGMA optimize".
    Fix a potential XSS vulnerability on the /help webpage.
    Documentation updates

4 files changed, 36 insertions, 21 deletions

diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 9675b025dcc..cd9dd107a85 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2017/04/22 14:30:58 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2017/12/23 21:11:32 wiz Exp $
 
-DISTNAME=	fossil-src-2.2
+DISTNAME=	fossil-src-2.4
 PKGNAME=	${DISTNAME:S/-src//}
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	devel scm
 MASTER_SITES=	https://www.fossil-scm.org/index.html/uv/
 
@@ -17,6 +17,8 @@ CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
 
+.include "options.mk"
+
 pre-configure:
 	${MKDIR} ${WRKSRC}/bld
 
diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo
index ad3c192737c..0b53f03ca45 100644
--- a/devel/fossil/distinfo
+++ b/devel/fossil/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.28 2017/04/19 12:23:34 joerg Exp $
+$NetBSD: distinfo,v 1.29 2017/12/23 21:11:32 wiz Exp $
 
-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
+SHA1 (fossil-src-2.4.tar.gz) = 3851ae290a178853456ad39189b28e2256eaac88
+RMD160 (fossil-src-2.4.tar.gz) = d30aead999eb8d1eb5f77b4ac509f2dcd17e1283
+SHA512 (fossil-src-2.4.tar.gz) = de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
+Size (fossil-src-2.4.tar.gz) = 4919205 bytes
diff --git a/devel/fossil/options.mk b/devel/fossil/options.mk
new file mode 100644
index 00000000000..a6f9b05db2b
--- /dev/null
+++ b/devel/fossil/options.mk
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.1 2017/12/23 21:11:32 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.fossil
+PKG_SUPPORTED_OPTIONS=	fossil-system-sqlite fossil-th1-hooks json tcl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mfossil-system-sqlite)
+CONFIGURE_ARGS+=	--disable-internal-sqlite
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.20.0
+.include "../../databases/sqlite3/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mfossil-th1-hooks)
+CONFIGURE_ARGS+=	--with-th1-hooks
+.endif
+
+.if !empty(PKG_OPTIONS:Mjson)
+CONFIGURE_ARGS+=	--json
+.endif
+
+.if !empty(PKG_OPTIONS:Mtcl)
+CONFIGURE_ARGS+=	--with-tcl
+CONFIGURE_ARGS+=	--with-tcl-private-stubs
+.include "../../lang/tcl/buildlink3.mk"
+.endif
diff --git a/devel/fossil/patches/patch-src_export.c b/devel/fossil/patches/patch-src_export.c
deleted file mode 100644
index c41d7057508..00000000000
--- a/devel/fossil/patches/patch-src_export.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$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;