From f8b9ce7a20ea0cdcc131f74ab12581dd6e7675e6 Mon Sep 17 00:00:00 2001 From: jca Date: Wed, 12 May 2021 23:37:31 +0000 Subject: [PATCH] Update to lmdb-0.9.29 Move MASTER_SITES to upstream's gitlab. Initial diff from Aisha Tammy, thanks! --- databases/lmdb/Makefile | 15 +++++++-------- databases/lmdb/distinfo | 4 ++-- databases/lmdb/patches/patch-mdb_c | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index 7d110399173..5ac0f897736 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -1,14 +1,11 @@ -# $OpenBSD: Makefile,v 1.9 2020/04/14 09:06:42 chrisz Exp $ +# $OpenBSD: Makefile,v 1.10 2021/05/12 23:37:31 jca Exp $ COMMENT = Symas Lightning Memory-Mapped Database -VERSION = 0.9.24 +VERSION = 0.9.29 -GH_ACCOUNT = LMDB -GH_PROJECT = lmdb -GH_TAGNAME = LMDB_${VERSION} - -DISTNAME = ${GH_PROJECT}-${VERSION} +DISTNAME = openldap-LMDB_${VERSION} +PKGNAME = lmdb-${VERSION} SHARED_LIBS += lmdb 0.0 # 0.0 @@ -23,6 +20,8 @@ PERMIT_PACKAGE = Yes WANTLIB += c pthread +MASTER_SITES = https://git.openldap.org/openldap/openldap/-/archive/LMDB_${VERSION}/ + DEBUG_PACKAGES = ${BUILD_PACKAGES} USE_GMAKE = Yes @@ -31,6 +30,6 @@ MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLAGS}" \ SHARED_VERSION_MAJOR=${LIBlmdb_VERSION:R} \ SHARED_VERSION_MINOR=${LIBlmdb_VERSION:E} -WRKDIST = ${WRKDIR}/lmdb-${GH_TAGNAME}/libraries/liblmdb +WRKDIST = ${WRKDIR}/openldap-LMDB_${VERSION}/libraries/liblmdb .include diff --git a/databases/lmdb/distinfo b/databases/lmdb/distinfo index b66ab20b0e7..58dc82d354a 100644 --- a/databases/lmdb/distinfo +++ b/databases/lmdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (lmdb-0.9.24.tar.gz) = RGAkNsUsKdTzAfVfb9gRX5RUabhoNI483a+RqyRz6iY= -SIZE (lmdb-0.9.24.tar.gz) = 143916 +SHA256 (openldap-LMDB_0.9.29.tar.gz) = 1MZoFnotcD75HbcztAabi3Tbw3RAWFW+Zia0Xip+LdM= +SIZE (openldap-LMDB_0.9.29.tar.gz) = 144545 diff --git a/databases/lmdb/patches/patch-mdb_c b/databases/lmdb/patches/patch-mdb_c index e8bf2dc8687..354a304abb9 100644 --- a/databases/lmdb/patches/patch-mdb_c +++ b/databases/lmdb/patches/patch-mdb_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-mdb_c,v 1.6 2020/04/14 09:06:42 chrisz Exp $ +$OpenBSD: patch-mdb_c,v 1.7 2021/05/12 23:37:31 jca Exp $ enforce MDB_WRITEMAP, because we have no UBC (Unified Buffer Cache). Index: mdb.c --- mdb.c.orig +++ mdb.c -@@ -4968,6 +4967,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned +@@ -4976,6 +4976,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned /* silently ignore WRITEMAP when we're only getting read access */ flags &= ~MDB_WRITEMAP; } else {