CVS commit: pkgsrc/databases/mongodb

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jan 22 17:36:32 UTC 2023

Modified Files:
        pkgsrc/databases/mongodb: distinfo
Added Files:
        pkgsrc/databases/mongodb/patches:
            patch-src_mongo_db_storage_storage__repair__observer.cpp
            patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp
            patch-src_mongo_shell_shell__utils__extended.cpp

Log Message:
mongodb: Fix build with Boost 1.81.0


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/mongodb/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_storage__repair__observer.cpp \
    pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp \
    pkgsrc/databases/mongodb/patches/patch-src_mongo_shell_shell__utils__extended.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/distinfo
diff -u pkgsrc/databases/mongodb/distinfo:1.35 pkgsrc/databases/mongodb/distinfo:1.36
--- pkgsrc/databases/mongodb/distinfo:1.35      Mon Dec 27 09:36:10 2021
+++ pkgsrc/databases/mongodb/distinfo   Sun Jan 22 17:36:31 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2021/12/27 09:36:10 nia Exp $
+$NetBSD: distinfo,v 1.36 2023/01/22 17:36:31 ryoon Exp $
 
 BLAKE2s (mongodb-src-r4.2.15.tar.gz) = 917d4e65f16a7ba228bf335965c2608f73645fe24e764e8f49f19ae052f47d48
 SHA512 (mongodb-src-r4.2.15.tar.gz) = ee46a2dfb7ae23ad38da49bf126a2bc7932bded8f01d34516ad575d2aed5d6233c5ad620b2a4424a98afb9e80e26acf40c66982cdd0637c13f0f7aaae8b746a0
@@ -9,9 +9,12 @@ SHA1 (patch-site__scons_site__tools_libt
 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.cpp) = b7931feac26dcffa7eac68f5cb348feb6b993c37
+SHA1 (patch-src_mongo_db_storage_storage__repair__observer.cpp) = a45223c828f249cdb6f2e6f12b42f7ef4671379b
+SHA1 (patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp) = 5d76b8bc20b8142d325613b5d1781a0599903ebe
 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
+SHA1 (patch-src_mongo_shell_shell__utils__extended.cpp) = d639465e37855591b5ca7b23fea798f0eaab94a4
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = 4c8e0d2e834686403a557de489ad518071851911
 SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 9f3161c0693b3905299e0e022b9eb68d466d30c4
 SHA1 (patch-src_mongo_util_time__support.cpp) = d576d8d39b10c496e492c8f0faf7e81f09ca875c

Added files:

Index: pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_storage__repair__observer.cpp
diff -u /dev/null pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_storage__repair__observer.cpp:1.1
--- /dev/null   Sun Jan 22 17:36:32 2023
+++ pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_storage__repair__observer.cpp   Sun Jan 22 17:36:31 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_mongo_db_storage_storage__repair__observer.cpp,v 1.1 2023/01/22 17:36:31 ryoon Exp $
+
+--- src/mongo/db/storage/storage_repair_observer.cpp.orig      2021-06-30 17:39:08.000000000 +0000
++++ src/mongo/db/storage/storage_repair_observer.cpp
+@@ -34,6 +34,7 @@
+ #include <algorithm>
+ #include <cerrno>
+ #include <cstring>
++#include <fstream>
+ 
+ #ifdef __linux__
+ #include <fcntl.h>
+@@ -120,7 +121,7 @@ bool StorageRepairObserver::isDataInvali
+ }
+ 
+ void StorageRepairObserver::_touchRepairIncompleteFile() {
+-    boost::filesystem::ofstream fileStream(_repairIncompleteFilePath);
++    std::ofstream fileStream(_repairIncompleteFilePath);
+     fileStream << "This file indicates that a repair operation is in progress or incomplete.";
+     if (fileStream.fail()) {
+         severe() << "Failed to write to file " << _repairIncompleteFilePath.string() << ": "
Index: pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp
diff -u /dev/null pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp:1.1
--- /dev/null   Sun Jan 22 17:36:32 2023
+++ pkgsrc/databases/mongodb/patches/patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp Sun Jan 22 17:36:31 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_mongo_db_storage_wiredtiger_wiredtiger__util.cpp,v 1.1 2023/01/22 17:36:31 ryoon Exp $
+
+--- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp.orig   2021-06-30 17:39:08.000000000 +0000
++++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+@@ -34,6 +34,7 @@
+ #include "mongo/db/storage/wiredtiger/wiredtiger_util.h"
+ 
+ #include <limits>
++#include <fstream>
+ 
+ #include <boost/filesystem.hpp>
+ #include <boost/filesystem/path.hpp>
+@@ -80,7 +81,7 @@ void createTableChecksFile() {
+     auto path = boost::filesystem::path(storageGlobalParams.dbpath) /
+         boost::filesystem::path(kTableChecksFileName);
+ 
+-    boost::filesystem::ofstream fileStream(path);
++    std::ofstream fileStream(path.c_str());
+     fileStream << "This file indicates that a WiredTiger table check operation is in progress or "
+                   "incomplete."
+                << std::endl;
Index: pkgsrc/databases/mongodb/patches/patch-src_mongo_shell_shell__utils__extended.cpp
diff -u /dev/null pkgsrc/databases/mongodb/patches/patch-src_mongo_shell_shell__utils__extended.cpp:1.1
--- /dev/null   Sun Jan 22 17:36:32 2023
+++ pkgsrc/databases/mongodb/patches/patch-src_mongo_shell_shell__utils__extended.cpp   Sun Jan 22 17:36:31 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mongo_shell_shell__utils__extended.cpp,v 1.1 2023/01/22 17:36:31 ryoon Exp $
+
+* boost::filesystem::ofstream deprected, use std::ofstream instead.
+
+--- src/mongo/shell/shell_utils_extended.cpp.orig      2021-06-30 17:39:08.000000000 +0000
++++ src/mongo/shell/shell_utils_extended.cpp
+@@ -318,7 +318,7 @@ BSONObj writeFile(const BSONObj& args, v
+             mode |= std::ios::binary;
+     }
+ 
+-    boost::filesystem::ofstream ofs{normalizedFilePath, mode};
++    std::ofstream ofs{normalizedFilePath, mode};
+     uassert(40346,
+             str::stream() << "failed to open file " << normalizedFilePath.string()
+                           << " for writing",