diff options
Diffstat (limited to 'databases/mongodb60/files')
12 files changed, 0 insertions, 390 deletions
diff --git a/databases/mongodb60/files/make.test.sh b/databases/mongodb60/files/make.test.sh deleted file mode 100755 index c42bb1973e6b..000000000000 --- a/databases/mongodb60/files/make.test.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh - -set -e - -usage() { - echo "Usage: $0 <path>" - echo "<path> path to the executables" -} - -test "$#" -eq 1 || ( usage && exit 1 ) - -set -x - -PATH="$1:$PATH" - -DBDIR=$( mktemp -d -t tmp.mongodb ) - -trap 'rm -rf "$DBDIR"' EXIT - -# Trivial check if the binaries execute at all. -mongod --version -mongos --version - -# Check if an empty database can be created. -mkdir "$DBDIR/db" -tail -F "$DBDIR/log" | ( grep -qFe "Waiting for connections" && kill $(cat "$DBDIR/pid") ) & -script -eF "$DBDIR/log" \ - timeout -s TERM -k 30s 60s \ - mongod --dbpath "$DBDIR/db" --pidfilepath "$DBDIR/pid" - -echo "Test successful" diff --git a/databases/mongodb60/files/mongod.in b/databases/mongodb60/files/mongod.in deleted file mode 100644 index 20b0f5c0f43d..000000000000 --- a/databases/mongodb60/files/mongod.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# PROVIDE: mongod -# REQUIRE: NETWORK ldconfig -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# mongod_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable mongod. -# mongod_dbpath (str): Default to "/var/db/mongodb" -# Base database directory. -# mongod_flags (str): Custom additional arguments to be passed to mongod. -# Default to "--logpath ${mongod_dbpath}/mongod.log --logappend". -# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf" -# Path to config file -# - -. /etc/rc.subr - -name="mongod" -rcvar=mongod_enable - -load_rc_config $name - -: ${mongod_enable="NO"} -: ${mongod_dbpath="/var/db/mongodb"} -: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"} -: ${mongod_user="mongodb"} -: ${mongod_group="mongodb"} -: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"} - -pidfile="${mongod_dbpath}/mongod.lock" -command=%%PREFIX%%/bin/${name} -command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" -start_precmd="${name}_prestart" - -mongod_create_dbpath() -{ - mkdir ${mongod_dbpath} >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath} -} - -mongod_prestart() -{ - if [ ! -d ${mongod_dbpath} ]; then - mongod_create_dbpath || return 1 - fi - return 0 -} - -run_rc_command "$1" diff --git a/databases/mongodb60/files/patch-SConstruct b/databases/mongodb60/files/patch-SConstruct deleted file mode 100644 index ff903d7c8a83..000000000000 --- a/databases/mongodb60/files/patch-SConstruct +++ /dev/null @@ -1,42 +0,0 @@ ---- SConstruct.orig 2022-08-05 16:21:29 UTC -+++ SConstruct -@@ -1342,9 +1342,9 @@ if has_option('variables-help'): - print(env_vars.GenerateHelpText(env)) - Exit(0) - - unknown_vars = env_vars.UnknownVariables() - if unknown_vars: -- env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) -+ print("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) - - if get_option('install-action') != 'default' and get_option('ninja') != "disabled": - env.FatalError("Cannot use non-default install actions when generating Ninja.") -@@ -2427,13 +2427,12 @@ if env.TargetOSIs('posix'): - # If runtime hardening is requested, then build anything - # destined for an executable with the necessary flags for PIE. - env.AppendUnique( -- PROGCCFLAGS=['-fPIE'], -+ PROGCCFLAGS=['-fpic'], - PROGLINKFLAGS=['-pie'], - ) - - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. - env.Append( CCFLAGS=["-fasynchronous-unwind-tables", -- "-ggdb" if not env.TargetOSIs('emscripten') else "-g", - "-Wall", - "-Wsign-compare", - "-Wno-unknown-pragmas", -@@ -2600,8 +2599,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too - # setting it for both C and C++ by setting both of CFLAGS and - # CXXFLAGS. - -+ arm_march_flag = "armv8-a" -+ if get_option('use-hardware-crc32') == "on": -+ arm_march_flag += "+crc" -+ - default_targeting_flags_for_architecture = { -- "aarch64" : { "-march=" : "armv8.2-a", "-mtune=" : "generic" }, -+ "aarch64" : { "-march=" : arm_march_flag, "-mtune=" : "generic" }, - "i386" : { "-march=" : "nocona", "-mtune=" : "generic" }, - "ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" }, - "s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" }, diff --git a/databases/mongodb60/files/patch-boost179-link-fix b/databases/mongodb60/files/patch-boost179-link-fix deleted file mode 100644 index 157ebaaf0221..000000000000 --- a/databases/mongodb60/files/patch-boost179-link-fix +++ /dev/null @@ -1,21 +0,0 @@ ---- SConstruct -+++ SConstruct -@@ -3511,17 +3511,11 @@ def doConfigure(myenv): - "BOOST_LOG_NO_SHORTHAND_NAMES", - "BOOST_LOG_USE_NATIVE_SYSLOG", - "BOOST_LOG_WITHOUT_THREAD_ATTR", -+ "BOOST_LOG_DYN_LINK", - "ABSL_FORCE_ALIGNED_ACCESS", - ] - ) - -- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk': -- conf.env.AppendUnique( -- CPPDEFINES=[ -- "BOOST_LOG_DYN_LINK", -- ] -- ) -- - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): - myenv.ConfError("can't find boost headers") diff --git a/databases/mongodb60/files/patch-boost179-system-compat-fix b/databases/mongodb60/files/patch-boost179-system-compat-fix deleted file mode 100644 index bb991c72455d..000000000000 --- a/databases/mongodb60/files/patch-boost179-system-compat-fix +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/src/mongo/db/auth/security_key_test.cpp b/src/mongo/db/auth/security_key_test.cpp -index 96f95829..e64aded8 100644 ---- src/mongo/db/auth/security_key_test.cpp -+++ src/mongo/db/auth/security_key_test.cpp -@@ -30,6 +30,7 @@ - #include "mongo/platform/basic.h" - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - - #include "mongo/base/string_data.h" - #include "mongo/db/auth/authorization_manager.h" -diff --git a/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp b/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp -index 05779a48..011c49e7 100644 ---- src/mongo/db/repl/tenant_migration_shard_merge_util.cpp -+++ src/mongo/db/repl/tenant_migration_shard_merge_util.cpp -@@ -32,6 +32,7 @@ - #include "mongo/db/repl/tenant_migration_shard_merge_util.h" - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/operations.hpp> - #include <boost/filesystem/path.hpp> - #include <fmt/format.h> -diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp -index 22b76a6a..ec5bcece 100644 ---- src/mongo/db/storage/storage_repair_observer.cpp -+++ src/mongo/db/storage/storage_repair_observer.cpp -@@ -41,6 +41,7 @@ - #include <sys/types.h> - #endif - -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/path.hpp> - - #include "mongo/db/dbhelpers.h" -diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp -index 2c5a6ed5..6c98c384 100644 ---- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp -+++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp -@@ -48,6 +48,7 @@ - #include "mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h" - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/operations.hpp> - #include <boost/filesystem/path.hpp> - #include <boost/system/error_code.hpp> -diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -index 9917d95e..c4073444 100644 ---- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -+++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -@@ -34,6 +34,7 @@ - #include "mongo/db/storage/kv/kv_engine_test_harness.h" - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/path.hpp> - #include <memory> - -diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -index de31ec10..c29fbd33 100644 ---- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -+++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -@@ -36,6 +36,7 @@ - #include <limits> - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <boost/filesystem/path.hpp> - - #include "mongo/base/simple_string_data_comparator.h" -diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp -index 6cd6dc6e..318d6a8d 100644 ---- src/mongo/shell/shell_utils_extended.cpp -+++ src/mongo/shell/shell_utils_extended.cpp -@@ -37,6 +37,7 @@ - #endif - - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <fmt/format.h> - #include <fstream> - -diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp -index 37e3d2ea..9027110d 100644 ---- src/mongo/util/processinfo_linux.cpp -+++ src/mongo/util/processinfo_linux.cpp -@@ -36,6 +36,7 @@ - #include <iostream> - #include <malloc.h> - #include <pcrecpp.h> -+#include <fstream> - #include <sched.h> - #include <stdio.h> - #include <sys/mman.h> -diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp -index d7157d0e..3aca6357 100644 ---- src/mongo/util/stacktrace_threads.cpp -+++ src/mongo/util/stacktrace_threads.cpp -@@ -36,6 +36,7 @@ - #include <array> - #include <atomic> - #include <boost/filesystem.hpp> -+#include <boost/filesystem/fstream.hpp> - #include <cstdint> - #include <cstdlib> - #include <dirent.h> diff --git a/databases/mongodb60/files/patch-buildscripts_scons.py b/databases/mongodb60/files/patch-buildscripts_scons.py deleted file mode 100644 index 20d0429965af..000000000000 --- a/databases/mongodb60/files/patch-buildscripts_scons.py +++ /dev/null @@ -1,25 +0,0 @@ ---- buildscripts/scons.py.orig 2021-08-23 09:10:10 UTC -+++ buildscripts/scons.py -@@ -18,14 +18,14 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scon - - sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path - --# pylint: disable=C0413 --from mongo.pip_requirements import verify_requirements, MissingRequirements -- --try: -- verify_requirements('etc/pip/compile-requirements.txt') --except MissingRequirements as ex: -- print(ex) -- sys.exit(1) -+## pylint: disable=C0413 -+#from mongo.pip_requirements import verify_requirements, MissingRequirements -+# -+#try: -+# verify_requirements('etc/pip/compile-requirements.txt') -+#except MissingRequirements as ex: -+# print(ex) -+# sys.exit(1) - - try: - import SCons.Script diff --git a/databases/mongodb60/files/patch-rpm_mongod.conf b/databases/mongodb60/files/patch-rpm_mongod.conf deleted file mode 100644 index b742b1604402..000000000000 --- a/databases/mongodb60/files/patch-rpm_mongod.conf +++ /dev/null @@ -1,16 +0,0 @@ ---- rpm/mongod.conf.orig 2023-04-28 08:22:02 UTC -+++ rpm/mongod.conf -@@ -7,11 +7,11 @@ systemLog: - systemLog: - destination: file - logAppend: true -- path: /var/log/mongodb/mongod.log -+ path: /var/db/mongodb/mongod.log - - # Where and how to store data. - storage: -- dbPath: /var/lib/mongo -+ dbPath: /var/db/mongodb - journal: - enabled: true - # engine: diff --git a/databases/mongodb60/files/patch-src_mongo_db_fts_stemmer.h b/databases/mongodb60/files/patch-src_mongo_db_fts_stemmer.h deleted file mode 100644 index 9b235ec0c7e0..000000000000 --- a/databases/mongodb60/files/patch-src_mongo_db_fts_stemmer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mongo/db/fts/stemmer.h.orig 2022-09-26 08:31:59 UTC -+++ src/mongo/db/fts/stemmer.h -@@ -32,7 +32,7 @@ - - #include "mongo/base/string_data.h" - #include "mongo/db/fts/fts_language.h" --#include "third_party/libstemmer_c/include/libstemmer.h" -+#include "libstemmer.h" - - namespace mongo { - diff --git a/databases/mongodb60/files/patch-src_mongo_platform_process__id.cpp b/databases/mongodb60/files/patch-src_mongo_platform_process__id.cpp deleted file mode 100644 index 11f61a36ca08..000000000000 --- a/databases/mongodb60/files/patch-src_mongo_platform_process__id.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- src/mongo/platform/process_id.cpp.orig 2021-03-26 23:29:14 UTC -+++ src/mongo/platform/process_id.cpp -@@ -35,6 +35,10 @@ - #include <pthread.h> - #endif - -+#if defined(__FreeBSD__) -+#include <pthread_np.h> -+#endif -+ - #if defined(__linux__) - #include <sys/syscall.h> - #include <sys/types.h> -@@ -72,6 +76,10 @@ inline NativeProcessId getCurrentNativeThreadId() { - uint64_t tid; - invariant(::pthread_threadid_np(NULL, &tid) == 0); - return tid; -+} -+#elif __FreeBSD__ -+inline NativeProcessId getCurrentNativeThreadId() { -+ return pthread_getthreadid_np(); - } - #else - inline NativeProcessId getCurrentNativeThreadId() { diff --git a/databases/mongodb60/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb60/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp deleted file mode 100644 index a45dcb0f2340..000000000000 --- a/databases/mongodb60/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp.orig 2023-06-30 20:32:00 UTC -+++ src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp -@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME - // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC), - // while some other don't like 'value + 1' (Borland), and some don't like - // either --#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) -+#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243) - private: - BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1))); - BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1))); diff --git a/databases/mongodb60/files/patch-src_third__party_boost_boost_thread_future.hpp b/databases/mongodb60/files/patch-src_third__party_boost_boost_thread_future.hpp deleted file mode 100644 index cf4ad80ef93d..000000000000 --- a/databases/mongodb60/files/patch-src_third__party_boost_boost_thread_future.hpp +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/boostorg/thread/issues/402 - -In file included from src/third_party/boost/libs/thread/src/pthread/thread.cpp:19: -src/third_party/boost/boost/thread/future.hpp:4672:19: error: no member named 'that' in 'run_it<FutureExecutorContinuationSharedState>'; did you mean 'that_'? - 4672 | that_=x.that; - | ^~~~ - ---- src/third_party/boost/boost/thread/future.hpp.orig 2024-12-12 08:36:29 UTC -+++ src/third_party/boost/boost/thread/future.hpp -@@ -4669,7 +4669,7 @@ namespace detail - } - run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT { - if (this != &x) { -- that_=x.that; -+ that_=x.that_; - x.that_.reset(); - } - return *this; diff --git a/databases/mongodb60/files/patch-src_third__party_mozjs_gen-config.sh b/databases/mongodb60/files/patch-src_third__party_mozjs_gen-config.sh deleted file mode 100644 index 58daab4bc056..000000000000 --- a/databases/mongodb60/files/patch-src_third__party_mozjs_gen-config.sh +++ /dev/null @@ -1,30 +0,0 @@ ---- src/third_party/mozjs/gen-config.sh.orig 2022-08-05 16:21:29 UTC -+++ src/third_party/mozjs/gen-config.sh -@@ -29,6 +29,9 @@ case "$_Path" in - } - - case "$_Path" in -+ "platform/aarch64/freebsd") -+ _CONFIG_OPTS="--host=aarch64-freebsd" -+ ;; - "platform/aarch64/linux") - _CONFIG_OPTS="--host=aarch64-linux" - ;; -@@ -108,7 +111,7 @@ CFLAGS="$CFLAGS -D__STDC_FORMAT_MACROS" \ - --disable-js-shell \ - --disable-tests "$_CONFIG_OPTS" - --make recurse_export -+gmake recurse_export - - cd ../../../.. - -@@ -159,7 +162,7 @@ find "$_Path/build" -name '*.cpp' | - find "$_Path/build" -name '*.cpp' | - while read unified_file ; do - echo "Processing $unified_file" -- sed $SEDOPTION \ -+ gsed $SEDOPTION \ - -e 's|#include ".*/js/src/|#include "|' \ - -e 's|#error ".*/js/src/|#error "|' \ - "$unified_file" |