On Wed May 30, 2018 at 03:55:10PM +0200, Rafael Sadowski wrote: > Please find attached an new tarball with following changes: > > - Use MDB_WRITEMAP (hint from jca@ and sthen@. > -- All tests runs fine now > - replace OpenLDAP with Symas in COMMENT by Raf Czlonka > > After import we can patch net/knot to use databases/lmdb.
Okay knot automatically picks lmdb if it's installed. Patch below. ============================================================================ Testsuite summary for knot 2.6.6 ============================================================================ # TOTAL: 2 # # PASS: 2 # # SKIP: 0 # # XFAIL: 0 # # FAIL: 0 # # XPASS: 0 # # ERROR: 0 # ============================================================================ Index: Makefile =================================================================== RCS file: /cvs/ports/net/knot/Makefile,v retrieving revision 1.28 diff -u -p -u -p -r1.28 Makefile --- Makefile 23 Apr 2018 13:09:58 -0000 1.28 +++ Makefile 30 May 2018 14:21:26 -0000 @@ -3,6 +3,7 @@ COMMENT = authoritative DNS server DISTNAME = knot-2.6.6 +REVISION = 0 SHARED_LIBS += zscanner 1.0 # .1.0 SHARED_LIBS += knot 3.0 # .7.0 @@ -18,8 +19,8 @@ MAINTAINER = Jeremie Courreges-Anglas < PERMIT_PACKAGE_CDROM = Yes WANTLIB += c curses edit ffi gmp gnutls hogweed iconv idn2 intl -WANTLIB += m nettle p11-kit pthread tasn1 unistring urcu urcu-common -WANTLIB += z +WANTLIB += lmdb m nettle p11-kit pthread tasn1 unistring urcu +WANTLIB += urcu-common z MASTER_SITES = https://secure.nic.cz/files/knot-dns/ EXTRACT_SUFX = .tar.xz @@ -37,7 +38,8 @@ BUILD_DEPENDS = devel/bison LIB_DEPENDS = devel/gettext \ devel/libidn2 \ devel/liburcu \ - security/gnutls + security/gnutls \ + databases/lmdb CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --with-storage=${LOCALSTATEDIR}/db/knot \ Index: patches/patch-src_contrib_lmdb_mdb_c =================================================================== RCS file: patches/patch-src_contrib_lmdb_mdb_c diff -N patches/patch-src_contrib_lmdb_mdb_c --- patches/patch-src_contrib_lmdb_mdb_c 1 Jun 2017 13:42:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_contrib_lmdb_mdb_c,v 1.1 2017/06/01 13:42:01 jca Exp $ -Index: src/contrib/lmdb/mdb.c ---- src/contrib/lmdb/mdb.c.orig -+++ src/contrib/lmdb/mdb.c -@@ -4921,6 +4921,12 @@ mdb_env_open(MDB_env *env, const char *path, unsigned - if (env->me_fd!=INVALID_HANDLE_VALUE || (flags & ~(CHANGEABLE|CHANGELESS))) - return EINVAL; - -+ /* -+ * Always force MDB_WRITEMAP, the code does the right thing if -+ * asking for a read-only handle. -+ */ -+ flags |= MDB_WRITEMAP; -+ - flags |= env->me_flags; - - rc = mdb_fname_init(path, flags, &fname);
