CVS commit: pkgsrc/databases/mongodb3

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Feb  1 20:05:54 UTC 2020

Modified Files:
        pkgsrc/databases/mongodb3: Makefile distinfo
Added Files:
        pkgsrc/databases/mongodb3/patches:
            patch-src_mongo_db_query_collation_collator__interface__icu.h
            patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp
            patch-src_third__party_wiredtiger_src_os__posix_os__fs.c
Removed Files:
        pkgsrc/databases/mongodb3/patches:
            patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h
            patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h

Log Message:
mongodb3: updated to 3.4.24

3.4.24:
Issues fixed:
SERVER-37772: Platform Support: Add Community & Enterprise RHEL 8 x64
SERVER-37135: TLSVersionCounts needs to track and report TLS 1.3
SERVER-36315: After stepdown the CSRS dist lock manager keeps trying to unlock locks
SERVER-37846: writeConcern can be satisfied with an arbiter if the write was committed
SERVER-38945: SSL performance regression
SERVER-40355: rs.config that contains an _id greater than the number of nodes will crash
SERVER-43151: Error in aggregation assertion at value.cpp:1368
SERVER-44050: Arrays along ‘hashed’ index key path are not correctly rejected
WT-4956: Handle the case where 4 billion updates are made to a page without eviction


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mongodb3/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mongodb3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongodb3/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h \
    pkgsrc/databases/mongodb3/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp \
    pkgsrc/databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mongodb3/patches/patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h \
    pkgsrc/databases/mongodb3/patches/patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h

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

Modified files:

Index: pkgsrc/databases/mongodb3/Makefile
diff -u pkgsrc/databases/mongodb3/Makefile:1.7 pkgsrc/databases/mongodb3/Makefile:1.8
--- pkgsrc/databases/mongodb3/Makefile:1.7      Sat Jan 18 21:48:56 2020
+++ pkgsrc/databases/mongodb3/Makefile  Sat Feb  1 20:05:54 2020
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2020/01/18 21:48:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2020/02/01 20:05:54 adam Exp $
 
 # This package is intentionally old to avoid:
 #   Server Side Public License
 #   c++17 (and c++14 if 3.4.4 does not already need it)
-DISTNAME=      mongodb-src-r3.4.23
+DISTNAME=      mongodb-src-r3.4.24
 PKGNAME=       ${DISTNAME:S/src-r//}
-PKGREVISION=   2
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
@@ -24,19 +23,19 @@ USE_LANGUAGES=      c c++
 GCC_REQD+=     5.3.0
 
 SCONS_ARGS=    ${_MAKE_JOBS}
+SCONS_ARGS+=   --dbg=off # on: argument parsing problem
 SCONS_ARGS+=   --disable-warnings-as-errors
 SCONS_ARGS+=   --release
-SCONS_ARGS+=   --runtime-hardening=off # does not produce executables
+SCONS_ARGS+=   --runtime-hardening=off # on: does not produce executables
 SCONS_ARGS+=   --use-system-boost
-#SCONS_ARGS+=  --use-system-icu
+SCONS_ARGS+=   --use-system-icu
 SCONS_ARGS+=   --use-system-pcre
 SCONS_ARGS+=   --use-system-snappy
 SCONS_ARGS+=   --use-system-tcmalloc
 SCONS_ARGS+=   --use-system-yaml
 SCONS_ARGS+=   --use-system-zlib
-SCONS_ARGS+=   --js-engine=mozjs
 
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet supported as of 3.4.21
+PYTHON_VERSIONS_ACCEPTED=      27 # not yet supported as of 3.4.23
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -145,13 +144,12 @@ post-install:
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/py-boost/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/scons/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
-#.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/mongodb3/distinfo
diff -u pkgsrc/databases/mongodb3/distinfo:1.4 pkgsrc/databases/mongodb3/distinfo:1.5
--- pkgsrc/databases/mongodb3/distinfo:1.4      Tue Sep 17 08:20:27 2019
+++ pkgsrc/databases/mongodb3/distinfo  Sat Feb  1 20:05:54 2020
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.4 2019/09/17 08:20:27 adam Exp $
+$NetBSD: distinfo,v 1.5 2020/02/01 20:05:54 adam Exp $
 
-SHA1 (mongodb-src-r3.4.23.tar.gz) = a73c8706f45865fc79c57911dac414a7f379e592
-RMD160 (mongodb-src-r3.4.23.tar.gz) = 7348ef75a0b120967166747edceaf2da725752f6
-SHA512 (mongodb-src-r3.4.23.tar.gz) = 01931d3701a9ed3109132cf3106a6f959f3a393e71284537959095f853cdad5c8b17eebddd4dc1d6a8cb4f5af8393b0bda62034318aa78fd5f656589449f7eb4
-Size (mongodb-src-r3.4.23.tar.gz) = 40176687 bytes
+SHA1 (mongodb-src-r3.4.24.tar.gz) = 86909b211998f0cbc8104df774aecb3d00a01763
+RMD160 (mongodb-src-r3.4.24.tar.gz) = f7e4bfe1e2bd046f1a6c0f2695762076ffee5ae5
+SHA512 (mongodb-src-r3.4.24.tar.gz) = c19d5215f514ad0c1bd33f17f9d79198e07657260c0a8399c9a84bbf274ec4f6e61a94b36bb132e93a46e96ee8b4d994a1bed70b2d26f906ffe8e78343394226
+Size (mongodb-src-r3.4.24.tar.gz) = 40232175 bytes
 SHA1 (patch-SConstruct) = b6c2893d82d9b954c889d867ec909a05728af83d
 SHA1 (patch-src_mongo_base_initializer.h) = f82d58895251f7be08a09012ed7db64e3863a1fe
 SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312
+SHA1 (patch-src_mongo_db_query_collation_collator__interface__icu.h) = 43c94a970fb91d45441a206b5d774e9e7ea55ad5
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
 SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
 SHA1 (patch-src_mongo_db_repl_oplog__fetcher.cpp) = e12dbfbd4e70ee210cdd4eb0582661666e8eb06a
@@ -20,9 +21,9 @@ SHA1 (patch-src_mongo_util_processinfo__
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 39f6fba82e2870ee4a5d99785033621225a72a16
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = d3a85d3a3b33691466c65cdf51c56f221429aea9
+SHA1 (patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp) = 49a74ef12f20c4b243d328a2cd8317aa1a668b18
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
 SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
 SHA1 (patch-src_third__party_wiredtiger_SConscript) = 71fd2326a4e95fec674326225bce5ccf5793aa5a
-SHA1 (patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h) = 0b00da401f832d985107dfa5dcc6447db4beec6d
-SHA1 (patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h) = edd3c4e5784e52ad0078bcb7ef1e0902bc354285
+SHA1 (patch-src_third__party_wiredtiger_src_os__posix_os__fs.c) = aefd45bcbb854fd9877fcd0e96f1351d2ee6c3c2

Added files:

Index: pkgsrc/databases/mongodb3/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h:1.1
--- /dev/null   Sat Feb  1 20:05:54 2020
+++ pkgsrc/databases/mongodb3/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h     Sat Feb  1 20:05:54 2020
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_mongo_db_query_collation_collator__interface__icu.h,v 1.1 2020/02/01 20:05:54 adam Exp $
+
+Fix for newer ICU.
+
+--- src/mongo/db/query/collation/collator_interface_icu.h.orig 2020-01-08 16:30:41.000000000 +0000
++++ src/mongo/db/query/collation/collator_interface_icu.h
+@@ -32,9 +32,7 @@
+ 
+ #include <memory>
+ 
+-namespace icu {
+-class Collator;
+-}  // namespace icu
++#include <unicode/coll.h>
+ 
+ namespace mongo {
+ 
+@@ -44,7 +42,7 @@ namespace mongo {
+  */
+ class CollatorInterfaceICU final : public CollatorInterface {
+ public:
+-    CollatorInterfaceICU(CollationSpec spec, std::unique_ptr<icu::Collator> collator);
++    CollatorInterfaceICU(CollationSpec spec, std::unique_ptr<U_ICU_NAMESPACE::Collator> collator);
+ 
+     std::unique_ptr<CollatorInterface> clone() const final;
+ 
+@@ -55,7 +53,7 @@ public:
+ private:
+     // The ICU implementation of the collator to which we delegate interesting work. Const methods
+     // on the ICU collator are expected to be thread-safe.
+-    const std::unique_ptr<icu::Collator> _collator;
++    const std::unique_ptr<U_ICU_NAMESPACE::Collator> _collator;
+ };
+ 
+ }  // namespace mongo
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp:1.1
--- /dev/null   Sat Feb  1 20:05:54 2020
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp      Sat Feb  1 20:05:54 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2020/02/01 20:05:54 adam Exp $
+
+Fix build with recent NetBSD 9.99.
+
+--- src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp.orig  2020-01-26 17:31:51.341577994 +0000
++++ src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp
+@@ -28,6 +28,10 @@
+ #include "asio/detail/push_options.hpp"
+ 
+ #if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500
+ # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
+     EV_SET(ev, ident, filt, flags, fflags, data, \
+       reinterpret_cast<intptr_t>(static_cast<void*>(udata)))
Index: pkgsrc/databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c
diff -u /dev/null pkgsrc/databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c:1.1
--- /dev/null   Sat Feb  1 20:05:54 2020
+++ pkgsrc/databases/mongodb3/patches/patch-src_third__party_wiredtiger_src_os__posix_os__fs.c  Sat Feb  1 20:05:54 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_third__party_wiredtiger_src_os__posix_os__fs.c,v 1.1 2020/02/01 20:05:54 adam Exp $
+
+On NetBSD, fdatasync() fails with "Bad file descriptor".
+
+--- src/third_party/wiredtiger/src/os_posix/os_fs.c.orig       2020-01-08 16:30:41.000000000 +0000
++++ src/third_party/wiredtiger/src/os_posix/os_fs.c
+@@ -100,7 +100,7 @@ __posix_sync(
+                   ret, "%s: %s: fcntl(F_FULLFSYNC)", name, func);
+       }
+ #endif
+-#if defined(HAVE_FDATASYNC)
++#if defined(HAVE_FDATASYNC) && !defined(__NetBSD__)
+       /* See comment in __posix_sync(): sync cannot be retried or fail. */
+       WT_SYSCALL(fdatasync(fd), ret);
+       if (ret == 0)