+varnish-slash: Storage Engines for Varnish-Cache

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Fri Feb 10 14:19:57 2023 +0100
Changeset:	0926f348cc1f68889f0bb5175c4a64116283f333

Modified Files:
	Makefile
Added Files:
	varnish-slash/DESCR
	varnish-slash/Makefile
	varnish-slash/distinfo
	varnish-slash/patches/patch-bootstrap
	varnish-slash/patches/patch-src_fellow__io__threads.c
	varnish-slash/patches/patch-src_fellow__log__dbg.c

Log Message:
+varnish-slash: Storage Engines for Varnish-Cache

half-baked pkg, doesn't build yet

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0926f348cc1f68889f0bb5175c4a64116283f333

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 +
 varnish-slash/DESCR                                |  4 +++
 varnish-slash/Makefile                             | 37 ++++++++++++++++++++++
 varnish-slash/distinfo                             | 11 +++++++
 varnish-slash/patches/patch-bootstrap              | 10 ++++++
 .../patches/patch-src_fellow__io__threads.c        | 16 ++++++++++
 varnish-slash/patches/patch-src_fellow__log__dbg.c | 23 ++++++++++++++
 7 files changed, 102 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index e47c1a29ec..a329b1b863 100644
--- a/Makefile
+++ b/Makefile
@@ -5818,6 +5818,7 @@ SUBDIR+=	vamp
 SUBDIR+=	vamps
 SUBDIR+=	vanitygen
 SUBDIR+=	varnish-modules
+SUBDIR+=	varnish-slash
 SUBDIR+=	vault
 SUBDIR+=	vba-m
 SUBDIR+=	vcf-split
diff --git a/varnish-slash/DESCR b/varnish-slash/DESCR
new file mode 100644
index 0000000000..19c08d9717
--- /dev/null
+++ b/varnish-slash/DESCR
@@ -0,0 +1,4 @@
+Two storage engines are provided by this project:
+
+- buddy: for in-memory, volatile storage
+- fellow: for persistent storage backed by flash memory / SSDs
diff --git a/varnish-slash/Makefile b/varnish-slash/Makefile
new file mode 100644
index 0000000000..31b3d0df5f
--- /dev/null
+++ b/varnish-slash/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD$
+
+DISTNAME=	slash-5725282989ef63d0ae0f2b9c53f4c8fb167e8991
+PKGNAME=	varnish-slash-0.0.20230206
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_GITLAB:=uplex/varnish/slash/-/archive/5725282989ef63d0ae0f2b9c53f4c8fb167e8991/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://gitlab.com/uplex/varnish/slash
+COMMENT=	Storage Engines for Varnish-Cache
+LICENSE=	2-clause-bsd
+
+BUILD_DEPENDS+=		autoconf-archive-[0-9]*:../../devel/autoconf-archive
+BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+
+USE_LIBTOOL=		yes
+USE_TOOLS+=		aclocal autoconf automake gmake m4 pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
+CONFIGURE_ENV+=		VARNISHSRC=${VARNISHSRC}
+
+VARNISHSRC=		${WRKOBJDIR}/www/varnish/work/varnish-7.2.1
+
+LIBS.NetBSD+=		-lcurses
+
+.include "../../mk/bsd.prefs.mk"
+
+#${VARNISHSRC}:
+#	cd ../../www/varnish && make
+
+pre-configure: ${VARNISHSRC}
+	cd ${WRKSRC} && ./bootstrap
+
+.include "../../lang/python/tool.mk"
+.include "../../www/varnish/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/varnish-slash/distinfo b/varnish-slash/distinfo
new file mode 100644
index 0000000000..3c0da17322
--- /dev/null
+++ b/varnish-slash/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+BLAKE2s (slash-5725282989ef63d0ae0f2b9c53f4c8fb167e8991.tar.bz2) = 2c100000339dc884e7e8b13901ec308e69aeb3e8d723c25c48736ebf9d4a7b9c
+SHA512 (slash-5725282989ef63d0ae0f2b9c53f4c8fb167e8991.tar.bz2) = 52243a6c7dbc7070bf64ceea95c0f0e34e8daa9ed18b16fb717415a07252aeb9551612a263a07729503f97d8d70e50258a09517902d2ee74cfd9dfcd13d8907a
+Size (slash-5725282989ef63d0ae0f2b9c53f4c8fb167e8991.tar.bz2) = 161935 bytes
+BLAKE2s (varnish-7.2.1.tgz) = 1aff35f8500519d17497de0634aaa404e9190c200eba47495b510038e8421a90
+SHA512 (varnish-7.2.1.tgz) = 7b9b837a8bafdf5798e81bc38163457b3bca16d933a9492800cdd2cde35c9b524a10b7e5ec931217e11d72f32feb05157a7eecfd9cf2c5856e717b634e51d089
+Size (varnish-7.2.1.tgz) = 4019119 bytes
+SHA1 (patch-bootstrap) = 14fc83710288c1237ac9a2e2fdb16bec31c0c1b9
+SHA1 (patch-src_fellow__io__threads.c) = 35cb0d4a3ab96b772c071d1e759a1a6bff316911
+SHA1 (patch-src_fellow__log__dbg.c) = 21c65b4929e96bc155a007b517d487e1903d5e19
diff --git a/varnish-slash/patches/patch-bootstrap b/varnish-slash/patches/patch-bootstrap
new file mode 100644
index 0000000000..8e54ce3092
--- /dev/null
+++ b/varnish-slash/patches/patch-bootstrap
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- bootstrap.orig	2023-02-06 07:10:31.000000000 +0000
++++ bootstrap
+@@ -22,4 +22,4 @@ automake --add-missing --copy --foreign
+ autoconf
+ 
+ cd "$WORK_DIR"
+-"$ROOT_DIR"/configure "$@"
++#"$ROOT_DIR"/configure "$@"
diff --git a/varnish-slash/patches/patch-src_fellow__io__threads.c b/varnish-slash/patches/patch-src_fellow__io__threads.c
new file mode 100644
index 0000000000..d1ab7de534
--- /dev/null
+++ b/varnish-slash/patches/patch-src_fellow__io__threads.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/fellow_io_threads.c.orig	2023-02-06 07:10:31.000000000 +0000
++++ src/fellow_io_threads.c
+@@ -233,7 +233,11 @@ fellow_io_thread_task(struct worker *wrk
+ 		r = pwrite(ctx->fd, req->buf, req->bytes, req->off);
+ 		break;
+ 	case FIOT_FALLOCATE:
++#if defined(__NetBSD__)
++		r = posix_fallocate(ctx->fd, req->off, (off_t)req->bytes);
++#else
+ 		r = fallocate(ctx->fd, req->mode, req->off, (off_t)req->bytes);
++#endif
+ 		break;
+ 	default:
+ 		WRONG("cmd in io_thread_task");
diff --git a/varnish-slash/patches/patch-src_fellow__log__dbg.c b/varnish-slash/patches/patch-src_fellow__log__dbg.c
new file mode 100644
index 0000000000..a199868d9c
--- /dev/null
+++ b/varnish-slash/patches/patch-src_fellow__log__dbg.c
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- src/fellow_log_dbg.c.orig	2023-02-06 07:10:31.000000000 +0000
++++ src/fellow_log_dbg.c
+@@ -32,7 +32,9 @@
+ #elif HAVE_SYS_DKIO_H
+ #include <sys/types.h>
+ #include <sys/dkio.h>
++#if !defined(__NetBSD__)
+ #include <sys/vtoc.h>
++#endif
+ #else
+ #error No support to determine device size
+ #endif
+@@ -79,6 +81,8 @@ getsize(const char *filename)
+ 		if (ioctl(fd, BLKGETSIZE, &r))
+ 			goto err;
+ 		r *= 512;
++#elif defined(HAVE_SYS_DKIO_H) && defined(__NetBSD__)
++		assert(0 /* fixme ioctl */);
+ #elif HAVE_SYS_DKIO_H
+ 		{
+ 		struct dk_minfo dkmp;