CVS commit: pkgsrc/databases/mongodb

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jul  1 22:40:03 UTC 2021

Modified Files:
        pkgsrc/databases/mongodb: Makefile distinfo
Added Files:
        pkgsrc/databases/mongodb/patches: patch-src_mongo_db_repl_isself.cpp
Removed Files:
        pkgsrc/databases/mongodb/patches: patch-src_mongo_db_repl_isself.c

Log Message:
mongodb: updated to 4.2.14

Issues fixed in 4.2.14:

SERVER-54710: Large number of $or clauses can create profiling entry exceeding max BSON size, causing the query to fail when it should not
SERVER-54136: Make the authenticate command respect enforceUserClusterSeparation
SERVER-53566: Investigate and reproduce “opCtx != nullptr && _opCtx == nullptr” invariant
SERVER-52564: Deadlock between step down and MongoDOperationContextSession
WT-7373: Improve slow random cursor operations on oplog

Issues fixed in 4.2.13:

SERVER-46686: Explain does not respect maxTimeMS
SERVER-46740: establishCursors() must always drain the AsyncRequestsSender::_baton
SERVER-46876: During the eviction pressure, we should quit the compact operation instead of crashing the process
SERVER-53394: Make ShardingTaskExecutorPoolReplicaSetMatching default to disabled for MongoD
WT-7028: Sweep thread shouldn’t lock during checkpoint gathering handles


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/databases/mongodb/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/mongodb/distinfo
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongodb/patches/patch-src_mongo_db_repl_isself.cpp

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

Modified files:

Index: pkgsrc/databases/mongodb/Makefile
diff -u pkgsrc/databases/mongodb/Makefile:1.65 pkgsrc/databases/mongodb/Makefile:1.66
--- pkgsrc/databases/mongodb/Makefile:1.65      Wed Apr 21 13:24:29 2021
+++ pkgsrc/databases/mongodb/Makefile   Thu Jul  1 22:40:03 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2021/04/21 13:24:29 adam Exp $
+# $NetBSD: Makefile,v 1.66 2021/07/01 22:40:03 adam Exp $
 
-DISTNAME=      mongodb-src-r4.2.12
+DISTNAME=      mongodb-src-r4.2.14
 PKGNAME=       ${DISTNAME:S/src-r//}
-PKGREVISION=   2
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
@@ -21,7 +20,6 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-psutil-[0
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-NO_CONFIGURE=  yes
 # https://github.com/mongodb/mongo/blob/master/docs/building.md
 USE_LANGUAGES= c99 c++17
 # Note that USE_LANGUAGES should contain c11, per SConstruct, but
@@ -106,11 +104,7 @@ SUBST_FILES.varbase=       debian/mongod.conf
 SUBST_SED.varbase=     -e 's,/var/lib/mongodb,${VARBASE}/mongodb,g'
 SUBST_SED.varbase+=    -e 's,/var/log/mongodb,${VARBASE}/mongodb,g'
 
-SUBST_CLASSES+=                python
-SUBST_STAGE.python=    pre-build
-SUBST_MESSAGE.python=  Replacing Python interpreter.
-SUBST_FILES.python=    src/mongo/installer/compass/install_compass.in
-SUBST_SED.python=      -e 's,@python_interpreter@,${PYTHONBIN},'
+REPLACE_PYTHON+=       src/mongo/installer/compass/install_compass
 
 NOT_PAX_MPROTECT_SAFE+=        bin/mongo bin/mongod
 
@@ -121,6 +115,8 @@ INSTALLATION_DIRS+= share/doc/mongodb sh
 CONF_FILES+=           share/examples/mongodb/mongod.conf \
                        ${PKG_SYSCONFDIR}/mongod.conf
 
+CHECK_PORTABILITY_SKIP=        src/mongo/gotools/src/github.com/mongodb/mongo-tools/vendor/go.mongodb.org/mongo-driver/etc/add-license.sh
+
 # Copy system specific files for NetBSD and DragonFly
 post-extract:
        ${CHMOD} -R g-w ${WRKSRC}
@@ -145,6 +141,10 @@ post-extract:
        ${CP} -R ${WRKSRC}/src/third_party/wiredtiger/build_freebsd \
                ${WRKSRC}/src/third_party/wiredtiger/build_dragonfly
 
+# let REPLACE_INTERPRETER kick in
+do-configure:
+       ${DO_NADA}
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \
        CC=${CC:Q} CXX=${CXX:Q} CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \
@@ -173,7 +173,7 @@ post-install:
 .include "../../devel/scons/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
+.include "../../lang/python/application.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"

Index: pkgsrc/databases/mongodb/distinfo
diff -u pkgsrc/databases/mongodb/distinfo:1.30 pkgsrc/databases/mongodb/distinfo:1.31
--- pkgsrc/databases/mongodb/distinfo:1.30      Mon Feb  1 09:38:10 2021
+++ pkgsrc/databases/mongodb/distinfo   Thu Jul  1 22:40:03 2021
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.30 2021/02/01 09:38:10 adam Exp $
+$NetBSD: distinfo,v 1.31 2021/07/01 22:40:03 adam Exp $
 
-SHA1 (mongodb-src-r4.2.12.tar.gz) = a3924e8f62bbeeb755a3c6b4a6808678f665d1dc
-RMD160 (mongodb-src-r4.2.12.tar.gz) = 7dc5e226039041242c36213a428f513e2c9321cd
-SHA512 (mongodb-src-r4.2.12.tar.gz) = 9be714b6d8f51cfd36530b103cfb5e9b31493c6294b453d32fe2176dd06e9a2145a671bd15b1f97865944c88256fbaea63542a994f2c033df75ab7280e82a576
-Size (mongodb-src-r4.2.12.tar.gz) = 61855596 bytes
+SHA1 (mongodb-src-r4.2.14.tar.gz) = 1d1beb3125d6a5cb45ddf06ef043a439d3f617d5
+RMD160 (mongodb-src-r4.2.14.tar.gz) = 80a5c7b76e4aab6aaea4508fc41cd543de38ec87
+SHA512 (mongodb-src-r4.2.14.tar.gz) = 30a5581e960958b0e9cc2241979a422a00691049896f122006e1349ce583cca7e18f32a885b2257dc656c863d2d2d3b00e2fdce6b58bf40a8c50c4f76f9c7f1c
+Size (mongodb-src-r4.2.14.tar.gz) = 62132935 bytes
 SHA1 (patch-SConstruct) = 027d8c9bd69256fe93ac40ae3e14e052ac367eb5
 SHA1 (patch-site__scons_mongo_platform.py) = 6a6daba04876f9779a26c579e6f6a66f55e1cbe6
 SHA1 (patch-site__scons_site__tools_libtool.py) = 2fb5947703f4292acc1306f92ca7938e8cbc62e0
 SHA1 (patch-src_mongo_base_initializer.h) = efaec2e3b5b8a4bfb15c65c6952924cd1469bdc7
 SHA1 (patch-src_mongo_db_query_collation_collator__interface__icu.h) = f6382a3dcdbaed26fe692aa1ea43b2640168b253
-SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
+SHA1 (patch-src_mongo_db_repl_isself.cpp) = b7931feac26dcffa7eac68f5cb348feb6b993c37
 SHA1 (patch-src_mongo_platform_random.cpp) = 0b42d1b8bf41f8a7448daca0b72bfed1ba462b99
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 0826e976048c79598ead6146f143ab3b4a2577fb
 SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = a29cbf034716ce48a23192320caf4928282b6c1a

Added files:

Index: pkgsrc/databases/mongodb/patches/patch-src_mongo_db_repl_isself.cpp
diff -u /dev/null pkgsrc/databases/mongodb/patches/patch-src_mongo_db_repl_isself.cpp:1.1
--- /dev/null   Thu Jul  1 22:40:03 2021
+++ pkgsrc/databases/mongodb/patches/patch-src_mongo_db_repl_isself.cpp Thu Jul  1 22:40:03 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_mongo_db_repl_isself.cpp,v 1.1 2021/07/01 22:40:03 adam Exp $
+
+Add NetBSD support.
+
+--- src/mongo/db/repl/isself.cpp.orig  2017-04-20 21:43:42.000000000 +0000
++++ src/mongo/db/repl/isself.cpp
+@@ -50,7 +50,7 @@
+ #include "mongo/util/scopeguard.h"
+ 
+ #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) || \
+-    defined(__OpenBSD__)
++    defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+ #define FASTPATH_UNIX 1
+ #endif
+ 
+@@ -63,7 +63,7 @@
+ #include <ifaddrs.h>
+ #include <netdb.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <netinet/in.h>
+ #endif
+