diff options
Diffstat (limited to 'dev-db/mongodb')
-rw-r--r-- | dev-db/mongodb/Manifest | 11 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch | 146 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch | 25 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch | 139 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-4.4.20.ebuild | 186 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-4.4.29.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-5.0.16-r1.ebuild | 197 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-5.0.26.ebuild | 4 |
8 files changed, 293 insertions, 416 deletions
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 341458f9abaa..b1b5ef91198b 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -4,8 +4,8 @@ AUX mongodb-4.4.1-gcc11.patch 250 BLAKE2B b92bcd6acee092f9da84005a0abc7c6b4ff124 AUX mongodb-4.4.10-boost-1.79.patch 2071 BLAKE2B b00dfba23f2928793ace34abf26989b6bebe00a6484f36eab114b8612bf509123161925f0ccad04bdafd05c3c30ffb2cdea18303c8473dd3e62e422b73a92c53 SHA512 6bad4c75d8da261ce1e36a3648f0758cd9564eefeacbc2ce7c48ccf68e1f069058daaa9d1a6aa60925330ca50d3a712fda4ffaf2d90a0c6af428993283039a83 AUX mongodb-4.4.10-boost-1.81.patch 13467 BLAKE2B 970163a8084893190ca52e31577b2900d90ee6238ed496cefcdcd51590c6bcb4ae2e620d012ba101c022954d2d5ebd03b13eb2e7f26e8ce68c772d62470adbdc SHA512 62f4802a26398ffb17ac289d9e9de4044b753ece694785d3462f406391abdcfd16ff281959b4e4fb6751cc9247da7a4c55e8fa48eb90fd681eed724fedcb03e9 AUX mongodb-4.4.10-no-force-lld.patch 1401 BLAKE2B da5798d94f01a821a0d008fab71c90fe6055faca1020259ea3d385ec3a2af28f8b90bdb9daf2bb43e60028ea47ba733a649831584a53596c2e908c0db0a0f755 SHA512 07cdd61e92cf61be0646900c55dab753009d1cc18151c429dd7fdfd22f0b8836a0d51fc184f4459530397893f8863c5d12594ceea6d1fd2e90f98aba832d651a +AUX mongodb-4.4.29-boost-1.85.patch 6375 BLAKE2B eaa71784a169732d4721772cb1063c7a21972ebe093ded7e2a75067622973202d08ca755354eec8fadd8b1590ac606916af42854501f59a229886c28dd2b8489 SHA512 700ba936904d6d53973401858d1ffcdd614388ee9e03a9dd875f56b97427f5214483cc1c7a2f3f7d03d8334c05f39e74e2d64e8317f5b230e8d47b7d9563cb46 AUX mongodb-4.4.29-no-enterprise.patch 969 BLAKE2B b6c607ed7054c74c1c1e29da53292be41bfb690a770fddf9239d9752dec5a87def42488f05295ec505c2cc5f0418358fa51658b9318604c53ae6a3a75d903f8c SHA512 6e84db876022c21c1fcff8c9f88d4ff7375ebb8b37ab0dd445d1697484a1344098bfbffd82b3da7f2f8c2f926c4f403f2ffce9d67ef46b894f3a9f0b981aba10 -AUX mongodb-4.4.8-gcc-13.patch 748 BLAKE2B d198b79704812aff95642a485c4a028d76c74d5a6b2d6cdd45bdb7b13d1795d72b4089cdf72840c5aa860095590bde8ab40543cc29ad7e31cbbfcb53f3936bd2 SHA512 c3c2560f858dcd3bbb4604f7d74a5a3efde885995e658ff521cce165be7cd8dea2975931df39a54b70acdc02a7fb480ad39e271875010a633a57af4ebd9ff095 AUX mongodb-4.4.8-no-compass.patch 1598 BLAKE2B af1944476041b3e5ea317f52adfced103f5b103484a4de4bb2a2d07ffcbc8b18a975f543e042c3563f1d46978496482ce7de653de8e4b943ef6ecf6e501d9f52 SHA512 0b8f5d085831180dec72ff81a37b4d537e550c8ea80d970b4af1ea6bc66b60ba957ff6506d2e21b9e5bc77b9812251dda33fae8a7c0cac4086141b5fb8ff4190 AUX mongodb-5.0.16-arm64-assert.patch 636 BLAKE2B 443b16404e8a13c7d1ce1a77b72960a40b8a366bae321af9047c1070142f2461a0fd5e813d2a4b3fcbe3b390e5f28f15bc7396ec13d48753a1cdf1cf3043c4b6 SHA512 24851bee5d93783df6f8a605b7d85d78d591bb2361aca4dbecef901c368a92f96661a9c860c98142224a94aa9dca90c6baa2feb58cfab58adc23e2e8b69ba91c AUX mongodb-5.0.2-boost-1.79.patch 2059 BLAKE2B 9edc95c6894e968b87b94d551a8d19017874d22f284cb00b75f4d6b090b9b0632e3dd68a4227be2ceec429635d47fc04f9aaf120544dec7d772751cf79387e37 SHA512 785367fafca3689e9441dcab64a8222156479d1ece2cde834fa44a90cfdecb9c21d6f41798b0ae0d04219d72eeced52f058e2afbf47eac184a143f3119653562 @@ -13,6 +13,7 @@ AUX mongodb-5.0.2-fix-scons.patch 1298 BLAKE2B e2f77fa965328e61c2e5dcdbfce7317a2 AUX mongodb-5.0.2-no-compass.patch 307 BLAKE2B 7386de453e7349662a1a6ae3f4735ed7519e02ff84444fd38b719d5ba5396fc9000fa83f924e385522e522de8b3330d7b4d7b1c1bcdca51d4fcce0738714b86d SHA512 07fe714a4256c13449e1e764c88d5051773aa9397228085a8d581cde91477dff2c3dc70ba801eb559af76ff19abf205d32c9510606a9bb26cebb33f68822e607 AUX mongodb-5.0.2-skip-no-exceptions.patch 552 BLAKE2B e499cc0f0885e09b2c18ddb8ac5fb85a2bfa3c9a81d1b877b20f1fc8b1908df26faf330e386d688e6ea163e81e404170454d840539146d7d313b3dc8b7753c2e SHA512 6750b5d8427616b290d285959c0c43a28409349ae7b52153d524590a8a38c26c283acc25b82410853b5c87a4c74927cf5844580778d1ef4378cd1b035844dc97 AUX mongodb-5.0.2-skip-reqs-check.patch 766 BLAKE2B 907dbab7e19cb159d5f7df36c725415612290889192bd1118fc445ee86d0bc58a03d4ff92d71d7c2c18e6c480fb542d8880980e3ed499ebbeae113a0b4c360d3 SHA512 29d4ff6de3a89c39ed0e3c54aa1e17fc3466ceb69dfbcfc62109ea2666ca98458b7b23ac82e4b5c9be77d5d82c69d5b213670b3a3367b13c3b8cab06cfacf4c2 +AUX mongodb-5.0.26-boost-1.85.patch 5997 BLAKE2B 1ce29e4589889a24c04a6b705ef83fa4ada74c25bae1f394f82225eb9a199d116630f394ab614315801f460756e8061f00c5c2d20086dbcea7d3fb887a4d3a13 SHA512 a4058ac0faf80ac5928969f85171d99718a20df4336a150e7d8e0ec98ce35632a599df2f2b36e0a1a6976da7c331770648ff91687054338b2d89e4b4a38f1c92 AUX mongodb-5.0.5-boost-1.81-extra.patch 279 BLAKE2B e851be4110cc65533ec35bdc80fccba53cdccd1e88608f72eeb8ac00fd110d2a1e977638ff69b7bd91e4d58b559f558c25f33488b0ed9e5a2a9c7d817ed87736 SHA512 bef7b01b7a543bc938a640e4fe28d3cabe17690b1051566a42327dfbc7a56401125a677823193fe1059a74f4aadb585b5b1eb560f2c137c80c35a9fef0ced63d AUX mongodb-5.0.5-no-force-lld.patch 2647 BLAKE2B 7759b2a1172e93ce92f5e528236946a2da691362864053f1fe26c61e7332bbc755daebc501d51a51a679661e29c0158277a8e984ad5500aee934e070543a9ccc SHA512 76c6e9aaf86fb62f3d9b887160971390541be5e9c99172ad281d455436f17fc7b7b74120726505d5307371964930261f5348e54e5240bd8a66296b0d210db0e2 AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d @@ -25,10 +26,6 @@ AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac212 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144 DIST mongodb-4.4.29.gh.tar.gz 51651007 BLAKE2B 9e9bd08ce87659fcf788964ec1bff80baef5bb9c2f5bd4968588511d289b9baf9fc68812f72ee89f90fb557dcc8d2ecbb3f607ca8e31c2212ec9633c0b99da37 SHA512 3c32a918c8b5587b04ee9263788c250a9bbd64f34ed2c19939e78607456215697966e596c2cfd160604b629188e4bdf3fff071db268bb3c25de3077a7c2ef335 DIST mongodb-5.0.26.gh.tar.gz 57252091 BLAKE2B a4663a4dbac90118b56646816b178680a6bd99be6abb582fdfdb662c8ddf14eb9db18ed97260a37b2d04bf11715e6cfaa34bb12c4f4b08426e3afa90908f0b3c SHA512 efd56649006bb61070a2f255e8d843e4ddab33562ec9454afe55848dcc3ce8ee90431f70c9362b14e52c4a49a162ea3075a869a6fd71f63efdd5f4358703fea4 -DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c -DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb -EBUILD mongodb-4.4.20.ebuild 5166 BLAKE2B 2cbbe01c324473eb74834b474fc13ee1e38a8e2ed3a1f471afc99d596434db41fd2697e36e87c0077da418f7a36c320221b192063e549f75c2366b1c4db0f4f8 SHA512 e3c9b4383892226232e70ee600f6b2d87c79967e04f290598657dc8618df3bd774601df6e6897d80c6d49ebc5b183cd443d82068da4eb1ede094c522292a0a7a -EBUILD mongodb-4.4.29.ebuild 5390 BLAKE2B 37c15937cd50a12631c0008adbe5d7f1c45ee2d3d7694b7dd482cbcaa8472f2448cbd3901367be4d210cc90e65f794ece12525125b97ecea60fbf756200178b2 SHA512 fbef97744213d897824d24a55f41a69e8dd50df87525be4ef382b6614d9987ab3c3733a3a897df5ece1bfaaa6eacd94aaaef3f5c15fb174f4a0d678a4e67aca2 -EBUILD mongodb-5.0.16-r1.ebuild 5580 BLAKE2B 5b03069e397d7c557dce111edf565e27a5609b0d634818825e73e2fec5939909d1abefc3b24e0e4b88757c2c9d9af6fbaafa3029f5ad91a96ed4b64bd5c1ccae SHA512 be046025e299a3b3de9592babaacbaca575fa1b67bc046b17a792dece61f6c3bfaa7aed92211f467004fb902c877ae045f7a6fa8bbc563f1281352982a9f2c6e -EBUILD mongodb-5.0.26.ebuild 5910 BLAKE2B eaaf5af00ac6c39590fcbafd526a4018d02a1f64ae06a3d4c531747e4500265e694c4e71378d9b88a1c1acf85ec2da4b0dfbf5ef67a486f12ed465556fedba2c SHA512 d36085a282627196a9f380a7bf111bb1800841e1bd2c194646dbefaab48df0452b432ef6c158b425c8d10930250120653db704a8eec2e1ce462072988a0ecdfe +EBUILD mongodb-4.4.29.ebuild 5435 BLAKE2B 4abc86c22c3ed26ab58922fa7b0b2ebbd81b9e79186a04099074d3e4025c890ca47ddde5633fe11b63da564ae9519a2fe893ef3c3e5bd67ec27eed1f91f472d3 SHA512 53c8311906ac7bbcda7598f039230fef9a89f887ded063b009c77eda8b422349df3b85fa84b964c0e2b9a81d77618f7ad534a702fdfdf963c6911e1a1d529adf +EBUILD mongodb-5.0.26.ebuild 6000 BLAKE2B 1bf2679641b9239c7410be674ac8156dc223f405d69fe3d09baf14c9360284a47631886dd1d1d26b48b5b780479d0effdac2596198880effe504e2aca6b58854 SHA512 a469a5f06dcef9aee138478172e0b3e1d5dafe154447bb1b4c4cfbbb6018d7b0e6566e31b4ab7c38a7ebe784d503297bd1f06b31248f749f846fa57a3e0a01d9 MISC metadata.xml 931 BLAKE2B 7ac7f9f4c2f048262d980577ef99c4a4200b805ea32976309bc68abaa7d0afc6818d1a24351b4850a7855f6f3e73bd0fd8241326c8a81484815342ba85c2e3ea SHA512 86fc063b5759fe7af2dd288897b8bff77e0d64a934abee3a68c0e0fb4454d67f0ced71e092257004885e375f2f17fd50577bacff802882d2dedff8306cfdf3d2 diff --git a/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch b/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch new file mode 100644 index 000000000000..92831264b4e3 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-4.4.29-boost-1.85.patch @@ -0,0 +1,146 @@ +https://bugs.gentoo.org/932251#c7 +--- a/src/mongo/db/initialize_server_global_state.cpp 2024-02-13 00:46:45.000000000 -0800 ++++ b/src/mongo/db/initialize_server_global_state.cpp 2024-06-05 01:07:27.035053336 -0700 +@@ -34,7 +34,7 @@ + #include "mongo/db/initialize_server_global_state.h" + #include "mongo/db/initialize_server_global_state_gen.h" + +-#include <boost/filesystem/operations.hpp> ++#include <boost/filesystem.hpp> + #include <fmt/format.h> + #include <iostream> + #include <memory> +@@ -346,7 +346,7 @@ + << "\" should name a file, not a directory."); + } + +- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) { ++ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) { + std::string renameTarget = absoluteLogpath + "." + terseCurrentTime(false); + boost::system::error_code ec; + boost::filesystem::rename(absoluteLogpath, renameTarget, ec); + + +--- a/src/mongo/db/startup_warnings_mongod.cpp 2024-02-13 00:46:45.000000000 -0800 ++++ b/src/mongo/db/startup_warnings_mongod.cpp 2024-06-05 01:09:36.740158960 -0700 +@@ -34,6 +34,7 @@ + #include "mongo/db/startup_warnings_mongod.h" + + #include <boost/filesystem/operations.hpp> ++#include <boost/filesystem/exception.hpp> + #include <fstream> + #ifndef _WIN32 + #include <sys/resource.h> + + +--- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:46:38.374648451 -0700 ++++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-06-05 00:47:33.178731500 -0700 +@@ -55,7 +55,7 @@ + // if called without a fully qualified path it asserts; that makes mongoperf fail. + // so make a warning. need a better solution longer term. + // massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),); +- if (!file.has_branch_path()) { ++ if (!file.has_parent_path()) { + LOGV2(22274, + "warning flushMyDirectory couldn't find parent dir for file: {file}", + "flushMyDirectory couldn't find parent dir for file", +@@ -64,7 +64,7 @@ + } + + +- boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts ++ boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts + + LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string()); + + +--- a/src/mongo/db/storage/storage_engine_metadata.cpp 2024-02-13 00:46:45.000000000 -0800 ++++ b/src/mongo/db/storage/storage_engine_metadata.cpp 2024-06-05 01:26:46.904273382 -0700 +@@ -220,7 +220,7 @@ + // if called without a fully qualified path it asserts; that makes mongoperf fail. + // so make a warning. need a better solution longer term. + // massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),); +- if (!file.has_branch_path()) { ++ if (!file.has_parent_path()) { + LOGV2(22283, + "warning flushMyDirectory couldn't find parent dir for file: {file}", + "flushMyDirectory couldn't find parent dir for file", +@@ -229,7 +229,7 @@ + } + + +- boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts ++ boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts + + LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string()); + + +--- a/src/mongo/shell/shell_utils_launcher.cpp 2024-02-13 00:46:45.000000000 -0800 ++++ b/src/mongo/shell/shell_utils_launcher.cpp 2024-06-05 01:29:45.140048809 -0700 +@@ -39,6 +39,7 @@ + #include <boost/iostreams/stream.hpp> + #include <boost/iostreams/stream_buffer.hpp> + #include <boost/iostreams/tee.hpp> ++#include <boost/filesystem.hpp> + #include <cctype> + #include <fcntl.h> + #include <fmt/format.h> +@@ -907,26 +908,26 @@ + boost::filesystem::directory_iterator i(from); + while (i != end) { + boost::filesystem::path p = *i; +- if (p.leaf() == "metrics.interim" || p.leaf() == "metrics.interim.temp") { ++ if (p.filename() == "metrics.interim" || p.filename() == "metrics.interim.temp") { + // Ignore any errors for metrics.interim* files as these may disappear during copy + boost::system::error_code ec; +- boost::filesystem::copy_file(p, to / p.leaf(), ec); ++ boost::filesystem::copy_file(p, to / p.filename(), ec); + if (ec) { + LOGV2_INFO(22814, + "Skipping copying of file from '{from}' to " + "'{to}' due to: {error}", + "Skipping copying of file due to error" + "from"_attr = p.generic_string(), +- "to"_attr = (to / p.leaf()).generic_string(), ++ "to"_attr = (to / p.filename()).generic_string(), + "error"_attr = ec.message()); + } +- } else if (p.leaf() != "mongod.lock" && p.leaf() != "WiredTiger.lock") { ++ } else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") { + if (boost::filesystem::is_directory(p)) { +- boost::filesystem::path newDir = to / p.leaf(); ++ boost::filesystem::path newDir = to / p.filename(); + boost::filesystem::create_directory(newDir); + copyDir(p, newDir); + } else { +- boost::filesystem::copy_file(p, to / p.leaf()); ++ boost::filesystem::copy_file(p, to / p.filename()); + } + } + ++i; + + +--- a/src/mongo/scripting/engine.cpp 2024-02-13 00:46:45.000000000 -0800 ++++ b/src/mongo/scripting/engine.cpp 2024-06-05 00:59:57.488909335 -0700 +@@ -34,6 +34,7 @@ + #include "mongo/scripting/engine.h" + + #include <boost/filesystem/operations.hpp> ++#include <boost/filesystem/directory.hpp> + #include <cctype> + + #include "mongo/client/dbclient_base.h" + + +--- a/src/mongo/shell/shell_utils_launcher.h 2024-02-13 00:46:45.000000000 -0800 ++++ b/src/mongo/shell/shell_utils_launcher.h 2024-06-05 01:04:44.286162623 -0700 +@@ -29,7 +29,7 @@ + + #pragma once + +-#include <boost/filesystem/convenience.hpp> ++#include <boost/filesystem/path.hpp> + #include <map> + #include <sstream> + #include <string> + diff --git a/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch b/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch deleted file mode 100644 index 00b82aca94fc..000000000000 --- a/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://cgit.openembedded.org/meta-openembedded-contrib/commit/?id=856c21b061e000640829e158b9bb9e978a974386 - -From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 29 Jan 2023 17:15:30 -0800 -Subject: [PATCH] free_mon: Include missing <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is no -longer transitively included [1]. Explicitly include it -for uintXX_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/src/mongo/db/free_mon/free_mon_options.h -+++ b/src/mongo/db/free_mon/free_mon_options.h -@@ -29,6 +29,7 @@ - - #pragma once - -+#include <cstdint> - #include <string> - #include <vector> - - diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch new file mode 100644 index 000000000000..71da50fe21eb --- /dev/null +++ b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch @@ -0,0 +1,139 @@ +https://bugs.gentoo.org/932251 +https://github.com/mongodb/mongo/commit/f8e4be7f6da71f978b2aa9991febb4c7ad89c903#diff-010644a9158d28e5745762753c7ce454444c9fb9ab4c684e9f2fdcff50c6f539 +https://bugs.gentoo.org/932251#c3 + +--- a/src/mongo/db/initialize_server_global_state.cpp ++++ b/src/mongo/db/initialize_server_global_state.cpp +@@ -34,7 +34,7 @@ + #include "mongo/db/initialize_server_global_state.h" + #include "mongo/db/initialize_server_global_state_gen.h" + +-#include <boost/filesystem/operations.hpp> ++#include <boost/filesystem.hpp> + #include <fmt/format.h> + #include <iostream> + #include <memory> +@@ -328,7 +328,7 @@ + << "\" should name a file, not a directory."); + } + +- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) { ++ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) { + std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename(); + boost::system::error_code ec; + boost::filesystem::rename(absoluteLogpath, renameTarget, ec); +--- a/src/mongo/db/startup_warnings_mongod.cpp ++++ b/src/mongo/db/startup_warnings_mongod.cpp +@@ -34,6 +34,7 @@ + #include "mongo/db/startup_warnings_mongod.h" + + #include <boost/filesystem/operations.hpp> ++#include <boost/filesystem/exception.hpp> + #include <fstream> + #ifndef _WIN32 + #include <sys/resource.h> +--- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp ++++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp +@@ -55,7 +55,7 @@ + // if called without a fully qualified path it asserts; that makes mongoperf fail. + // so make a warning. need a better solution longer term. + // massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),); +- if (!file.has_branch_path()) { ++ if (!file.has_parent_path()) { + LOGV2(22274, + "warning flushMyDirectory couldn't find parent dir for file: {file}", + "flushMyDirectory couldn't find parent dir for file", +@@ -64,7 +64,7 @@ + } + + +- boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts ++ boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts + + LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string()); + +--- a/src/mongo/db/storage/storage_engine_metadata.cpp ++++ b/src/mongo/db/storage/storage_engine_metadata.cpp +@@ -220,7 +220,7 @@ + // if called without a fully qualified path it asserts; that makes mongoperf fail. + // so make a warning. need a better solution longer term. + // massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),); +- if (!file.has_branch_path()) { ++ if (!file.has_parent_path()) { + LOGV2(22283, + "warning flushMyDirectory couldn't find parent dir for file: {file}", + "flushMyDirectory couldn't find parent dir for file", +@@ -229,7 +229,7 @@ + } + + +- boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts ++ boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts + + LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string()); + +--- a/src/mongo/scripting/engine.cpp ++++ b/src/mongo/scripting/engine.cpp +@@ -35,6 +35,7 @@ + + #include <algorithm> + #include <boost/filesystem/operations.hpp> ++#include <boost/filesystem/directory.hpp> + + #include "mongo/base/string_data.h" + #include "mongo/client/dbclient_base.h" +--- a/src/mongo/shell/shell_utils_launcher.cpp ++++ b/src/mongo/shell/shell_utils_launcher.cpp +@@ -39,6 +39,7 @@ + #include <boost/iostreams/stream.hpp> + #include <boost/iostreams/stream_buffer.hpp> + #include <boost/iostreams/tee.hpp> ++#include <boost/filesystem.hpp> + #include <fcntl.h> + #include <fmt/format.h> + #include <iostream> +@@ -947,26 +948,26 @@ + boost::filesystem::directory_iterator i(from); + while (i != end) { + boost::filesystem::path p = *i; +- if (p.leaf() == "metrics.interim" || p.leaf() == "metrics.interim.temp") { ++ if (p.filename() == "metrics.interim" || p.filename() == "metrics.interim.temp") { + // Ignore any errors for metrics.interim* files as these may disappear during copy + boost::system::error_code ec; +- boost::filesystem::copy_file(p, to / p.leaf(), ec); ++ boost::filesystem::copy_file(p, to / p.filename(), ec); + if (ec) { + LOGV2_INFO(22814, + "Skipping copying of file from '{from}' to " + "'{to}' due to: {error}", + "Skipping copying of file due to error" + "from"_attr = p.generic_string(), +- "to"_attr = (to / p.leaf()).generic_string(), ++ "to"_attr = (to / p.filename()).generic_string(), + "error"_attr = ec.message()); + } +- } else if (p.leaf() != "mongod.lock" && p.leaf() != "WiredTiger.lock") { ++ } else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") { + if (boost::filesystem::is_directory(p)) { +- boost::filesystem::path newDir = to / p.leaf(); ++ boost::filesystem::path newDir = to / p.filename(); + boost::filesystem::create_directory(newDir); + copyDir(p, newDir); + } else { +- boost::filesystem::copy_file(p, to / p.leaf()); ++ boost::filesystem::copy_file(p, to / p.filename()); + } + } + ++i; +--- a/src/mongo/shell/shell_utils_launcher.h ++++ b/src/mongo/shell/shell_utils_launcher.h +@@ -29,7 +29,7 @@ + + #pragma once + +-#include <boost/filesystem/convenience.hpp> ++#include <boost/filesystem/path.hpp> + #include <map> + #include <sstream> + #include <string> + diff --git a/dev-db/mongodb/mongodb-4.4.20.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild deleted file mode 100644 index 12cef7fbaaa0..000000000000 --- a/dev-db/mongodb/mongodb-4.4.20.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..11} ) - -SCONS_MIN_VERSION="3.3.1" -CHECKREQS_DISK_BUILD="2400M" -CHECKREQS_DISK_USR="512M" -CHECKREQS_MEMORY="1024M" - -inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs - -MY_P=${PN}-src-r${PV/_rc/-rc} - -DESCRIPTION="A high-performance, open source, schema-free document-oriented database" -HOMEPAGE="https://www.mongodb.com" -SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 SSPL-1" -SLOT="0" -KEYWORDS="amd64 ~arm64 -riscv" -IUSE="debug kerberos ssl test +tools" -RESTRICT="!test? ( test )" - -RDEPEND="acct-group/mongodb - acct-user/mongodb - >=app-arch/snappy-1.1.3:= - >=dev-cpp/yaml-cpp-0.6.2:= - dev-libs/boost:=[nls] - >=dev-libs/libpcre-8.42[cxx] - app-arch/zstd:= - dev-libs/snowball-stemmer:= - net-libs/libpcap - >=sys-libs/zlib-1.2.11:= - kerberos? ( dev-libs/cyrus-sasl[kerberos] ) - ssl? ( - >=dev-libs/openssl-1.0.1g:0= - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-debug/valgrind )" -BDEPEND=" - $(python_gen_any_dep ' - test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) - >=dev-build/scons-3.1.1[${PYTHON_USEDEP}] - dev-python/cheetah3[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" -PDEPEND="tools? ( >=app-admin/mongo-tools-100 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.1-fix-scons.patch" - "${FILESDIR}/${PN}-4.4.8-no-compass.patch" - "${FILESDIR}/${PN}-4.4.1-boost.patch" - "${FILESDIR}/${PN}-4.4.1-gcc11.patch" - "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch" - "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch" - "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" - "${FILESDIR}/${PN}-4.4.8-gcc-13.patch" -) - -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - if use test; then - python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 - fi - - python_has_version ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" && - python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - if ver_test "$REPLACING_VERSIONS" -lt 4.2; then - ewarn "To upgrade from a version earlier than the 4.2-series, you must" - ewarn "successively upgrade major releases until you have upgraded" - ewarn "to 4.2-series. Then upgrade to 4.4 series." - else - ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading." - fi - fi -} - -src_prepare() { - default - - # remove bundled libs - rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die - - # remove compass - rm -r src/mongo/installer/compass || die -} - -src_configure() { - # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source - # --use-system-icu fails tests - # --use-system-tcmalloc is strongly NOT recommended: - scons_opts=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - - --disable-warnings-as-errors - --use-system-boost - --use-system-pcre - --use-system-snappy - --use-system-stemmer - --use-system-yaml - --use-system-zlib - --use-system-zstd - ) - - use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300 - use debug && scons_opts+=( --dbg=on ) - use kerberos && scons_opts+=( --use-sasl-client ) - use ssl && scons_opts+=( --ssl ) - - # Needed to avoid forcing FORTIFY_SOURCE - # Gentoo's toolchain applies these anyway - scons_opts+=( --runtime-hardening=off ) - - # respect mongoDB upstream's basic recommendations - # see bug #536688 and #526114 - if ! use debug; then - filter-flags '-m*' - filter-flags '-O?' - fi - - default -} - -src_compile() { - PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core -} - -# FEATURES="test -usersandbox" emerge dev-db/mongodb -src_test() { - ewarn "Tests may hang with FEATURES=usersandbox" - "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}" -} - -src_install() { - dobin build/install/bin/{mongo,mongod,mongos} - - doman debian/mongo*.1 - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} - newinitd "${FILESDIR}/mongos.initd-r3" mongos - newconfd "${FILESDIR}/mongos.confd-r3" mongos - - insinto /etc - newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf - newins "${FILESDIR}/mongos.conf-r2" mongos.conf - - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - # see bug #526114 - pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} - - local x - for x in /var/{lib,log}/${PN}; do - diropts -m0750 -o mongodb -g mongodb - keepdir "${x}" - done -} - -pkg_postinst() { - ewarn "Make sure to read the release notes and follow the upgrade process:" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" -} diff --git a/dev-db/mongodb/mongodb-4.4.29.ebuild b/dev-db/mongodb/mongodb-4.4.29.ebuild index 830acd956f53..7c004e0b2b0a 100644 --- a/dev-db/mongodb/mongodb-4.4.29.ebuild +++ b/dev-db/mongodb/mongodb-4.4.29.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" "${FILESDIR}/${P}-no-enterprise.patch" + "${FILESDIR}/${PN}-4.4.29-boost-1.85.patch" ) python_check_deps() { diff --git a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild deleted file mode 100644 index 239cdc96c99c..000000000000 --- a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..11} ) - -SCONS_MIN_VERSION="3.3.1" -CHECKREQS_DISK_BUILD="2400M" -CHECKREQS_DISK_USR="512M" -CHECKREQS_MEMORY="1024M" - -inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs - -MY_P=${PN}-src-r${PV/_rc/-rc} - -DESCRIPTION="A high-performance, open source, schema-free document-oriented database" -HOMEPAGE="https://www.mongodb.com" -SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 SSPL-1" -SLOT="0" -KEYWORDS="amd64 ~arm64 -riscv" -CPU_FLAGS="cpu_flags_x86_avx" -IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}" - -# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server -# resmoke needs python packages not yet present in Gentoo -RESTRICT="test" - -RDEPEND="acct-group/mongodb - acct-user/mongodb - >=app-arch/snappy-1.1.3:= - >=dev-cpp/yaml-cpp-0.6.2:= - dev-libs/boost:=[nls] - >=dev-libs/libpcre-8.42[cxx] - app-arch/zstd:= - dev-libs/snowball-stemmer:= - net-libs/libpcap - >=sys-libs/zlib-1.2.11:= - kerberos? ( dev-libs/cyrus-sasl[kerberos] ) - ssl? ( - >=dev-libs/openssl-1.0.1g:0= - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-debug/valgrind )" -BDEPEND=" - $(python_gen_any_dep ' - >=dev-build/scons-3.1.1[${PYTHON_USEDEP}] - dev-python/cheetah3[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" -PDEPEND=" - mongosh? ( app-admin/mongosh-bin ) - tools? ( >=app-admin/mongo-tools-100 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.1-boost.patch" - "${FILESDIR}/${PN}-4.4.1-gcc11.patch" - "${FILESDIR}/${PN}-5.0.2-fix-scons.patch" - "${FILESDIR}/${PN}-5.0.2-no-compass.patch" - "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch" - "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch" - "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch" - "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch" - "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" - "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" - "${FILESDIR}/${PN}-4.4.8-gcc-13.patch" - "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch" -) - -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - python_has_version ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" && - python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - # Bug 809692 + 890294 - if use amd64 && ! use cpu_flags_x86_avx; then - ewarn "MongoDB 5.0 requires use of the AVX instruction set." - ewarn "This ebuild will use --experimental-optimization=-sandybridge which" - ewarn "will result in an experimental build of MongoDB as per upstream." - ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/" - fi - - if [[ -n ${REPLACING_VERSIONS} ]]; then - if ver_test "$REPLACING_VERSIONS" -lt 4.4; then - ewarn "To upgrade from a version earlier than the 4.4-series, you must" - ewarn "successively upgrade major releases until you have upgraded" - ewarn "to 4.4-series. Then upgrade to 5.0 series." - else - ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading." - fi - fi -} - -src_prepare() { - default - - # remove bundled libs - rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die - - # remove compass - rm -r src/mongo/installer/compass || die -} - -src_configure() { - # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source - # --use-system-icu fails tests - # --use-system-tcmalloc is strongly NOT recommended: - scons_opts=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - - --disable-warnings-as-errors - --force-jobs - --jobs="$(makeopts_jobs)" - --use-system-boost - --use-system-pcre - --use-system-snappy - --use-system-stemmer - --use-system-yaml - --use-system-zlib - --use-system-zstd - ) - - use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300 - use debug && scons_opts+=( --dbg=on ) - use kerberos && scons_opts+=( --use-sasl-client ) - use amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294 - - scons_opts+=( --ssl=$(usex ssl on off) ) - - # Needed to avoid forcing FORTIFY_SOURCE - # Gentoo's toolchain applies these anyway - scons_opts+=( --runtime-hardening=off ) - - # respect mongoDB upstream's basic recommendations - # see bug #536688 and #526114 - if ! use debug; then - filter-flags '-m*' - filter-flags '-O?' - fi - - default -} - -src_compile() { - PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die -} - -src_install() { - dobin build/install/bin/{mongo,mongod,mongos} - - doman debian/mongo*.1 - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} - newinitd "${FILESDIR}/mongos.initd-r3" mongos - newconfd "${FILESDIR}/mongos.confd-r3" mongos - - insinto /etc - newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf - newins "${FILESDIR}/mongos.conf-r2" mongos.conf - - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - # see bug #526114 - pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} - - local x - for x in /var/{lib,log}/${PN}; do - diropts -m0750 -o mongodb -g mongodb - keepdir "${x}" - done -} - -pkg_postinst() { - ewarn "Make sure to read the release notes and follow the upgrade process:" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" - ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" -} diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild index a31c0680250e..efb618e4f155 100644 --- a/dev-db/mongodb/mongodb-5.0.26.ebuild +++ b/dev-db/mongodb/mongodb-5.0.26.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 SSPL-1" SLOT="0" -KEYWORDS="~amd64 ~arm64 -riscv" +KEYWORDS="amd64 ~arm64 -riscv" CPU_FLAGS="cpu_flags_x86_avx" IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}" @@ -74,6 +74,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch" "${FILESDIR}/${PN}-4.4.29-no-enterprise.patch" + "${FILESDIR}/${PN}-5.0.26-boost-1.85.patch" ) python_check_deps() { @@ -130,6 +131,7 @@ src_configure() { MONGO_GIT_HASH="0b4f1ea980b5380a66425a90b414106a191365f4" --disable-warnings-as-errors + --force-jobs # Reapply #906897, fix #935274 --jobs="$(makeopts_jobs)" --use-system-boost --use-system-pcre |