Update devel/fossil to 2.18

Changes for version 2.18 (2022-02-23)

  *  Added support for [./ssl-server.md|SSL/TLS server mode] for commands
     like "[/help?cmd=server|fossil server]" and "[/help?cmd=http|fossil http]"
  *  The new [/help?cmd=cherry-pick|cherry-pick command] is an alias for
     [/help?cmd=merge|merge --cherrypick].
  *  Add new setting "[/help?cmd=large-file-size|large-file-size]".  If the size
     of any file in a commit exceeds this size, a warning is issued.
  *  Query parameter "year=YYYY" is now accepted by [/help?cmd=/timeline|/timeline].
  *  The [/help?cmd=tar|tar] and [/help?cmd=zip|zip commands] no longer
     sterilize the manifest file.
  *  Futher improvement to diff alignment in cases that involve both
     edits and indentation changes.
  *  [/doc/trunk/www/chat.md|Chat] improvements:<ul>
     <li>  [/help?cmd=/chat|The /chat page] input options have been reworked
           again for better cross-browser portability.
     <li>  When sending a [/help?cmd=/chat|/chat] message fails, it is no longer
           immediately lost and sending may optionally be retried.
     <li>  [/help?cmd=/chat|/chat] can now optionally embed attachments of certain
           types directly into message bodies via an iframe.
     <li>  Add the "--as FILENAME" option to the "[/help?cmd=chat|fossil chat send]"
           command.
     <li>  Added the "[/help?cmd=chat|fossil chat pull]" command, available to
           administrators only, for backing up the chat conversation.
     </ul>
  *  Promote the test-detach command into the [/help?cmd=detach|detach command].
  *  For "[/help?cmd=pull|fossil pull]" with the --from-parent-project option,
     if no URL is specified then use the last URL from the most recent prior
     "fossil pull --from-parent-project".
  *  Add options --project-name and --project-desc to the
     "[/help?cmd=init|fossil init]" command.
  *  The [/help?cmd=/ext|/ext page] generates the SERVER_SOFTWARE environment
     variable for clients.
  *  Fix the REQUEST_URI [/doc/trunk/www/aboutcgi.wiki#cgivar|CGI variable] such
     that it includes the query string.  This is how most other systems understand
     REQUEST_URI.
  *  Added the --transport-command option to [/help?cmd=sync|fossil sync]
     and similar.

3 files changed, 7 insertions, 25 deletions

diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index d3e549a96c7..45245d9fd2d 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2021/12/08 16:03:57 adam Exp $
+# $NetBSD: Makefile,v 1.73 2022/02/24 11:03:13 js Exp $
 
-DISTNAME=	fossil-src-2.17
+DISTNAME=	fossil-src-2.18
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	devel scm
 MASTER_SITES=	https://fossil-scm.org/home/tarball/version-${PKGVERSION_NOREV}/
 
@@ -29,7 +28,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/fossil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT-BSD2.txt \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/src/linenoise.h \
+	${INSTALL_DATA} ${WRKSRC}/extsrc/linenoise.h \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo
index 74d2f627338..ac1fc258efd 100644
--- a/devel/fossil/distinfo
+++ b/devel/fossil/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.46 2021/12/04 10:06:28 js Exp $
+$NetBSD: distinfo,v 1.47 2022/02/24 11:03:13 js Exp $
 
-BLAKE2s (fossil-src-2.17.tar.gz) = a1a0ea90955dddc8209f13a114363bf268e15a7af13b576f63cef45ea1b878af
-SHA512 (fossil-src-2.17.tar.gz) = 61b0cfa3ffe451a245647a225957daa00586dc82f87a16e0e5d478b19272b2d678f3ebcdf44b2de52211260bfb2735f190e8975d43137e0acd8f58bfdc3953fe
-Size (fossil-src-2.17.tar.gz) = 6316167 bytes
-SHA1 (patch-src_sqlite3.c) = cccf9af1ba8695dedcc5487234541d11f4538f8d
+BLAKE2s (fossil-src-2.18.tar.gz) = a8bd23687231eee4d338647d0453ac2f1477ccf412ada9456bc8c7ae288c86fe
+SHA512 (fossil-src-2.18.tar.gz) = 9dfeef1cc394af7afc6b68d2ebf084d5962698123518999130162718d450d061ab286b5f4039cde1af0e17059a9c801f1ded974fdb78b0965b73a7f8c80fd277
+Size (fossil-src-2.18.tar.gz) = 6308652 bytes
diff --git a/devel/fossil/patches/patch-src_sqlite3.c b/devel/fossil/patches/patch-src_sqlite3.c
deleted file mode 100644
index 7aea4cc5ab5..00000000000
--- a/devel/fossil/patches/patch-src_sqlite3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_sqlite3.c,v 1.1 2019/10/05 20:53:01 gutteridge Exp $
-
-SunOS needs alloca.h for alloca().
-
---- src/sqlite3.c.orig	2019-10-04 21:41:13.000000000 +0000
-+++ src/sqlite3.c
-@@ -18810,6 +18810,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
- ** that deal with sqlite3StackAlloc() failures to be unreachable.
- */
- #ifdef SQLITE_USE_ALLOCA
-+# ifdef __sun
-+# include <alloca.h>
-+# endif
- # define sqlite3StackAllocRaw(D,N)   alloca(N)
- # define sqlite3StackAllocZero(D,N)  memset(alloca(N), 0, N)
- # define sqlite3StackFree(D,P)