diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /dev-db/mongodb/files | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'dev-db/mongodb/files')
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch | 36 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch | 83 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 49 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch | 283 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch | 84 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb.confd-r2 | 12 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb.initd-r2 | 26 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongos.confd-r2 | 12 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongos.initd-r2 | 26 |
9 files changed, 0 insertions, 611 deletions
diff --git a/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch deleted file mode 100644 index 1db5d7695c72..000000000000 --- a/dev-db/mongodb/files/mongodb-3.0.14-fix-scons.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/SConstruct b/SConstruct ---- a/SConstruct -+++ b/SConstruct -@@ -1008,7 +1008,6 @@ - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. - env.Append( CCFLAGS=["-fPIC", - "-fno-strict-aliasing", -- "-ggdb", - "-pthread", - "-Wall", - "-Wsign-compare", -@@ -1016,13 +1015,13 @@ - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux or darwin: -- env.Append( CCFLAGS=["-pipe"] ) - if not has_option("disable-warnings-as-errors"): - env.Append( CCFLAGS=["-Werror"] ) - - env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) -- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) - env.Append( LINKFLAGS=["-fPIC", "-pthread"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) - - # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program - # startup. -@@ -1039,7 +1038,7 @@ - if not darwin: - env.Append( LINKFLAGS=["-rdynamic"] ) - -- env.Append( LIBS=[] ) -+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] ) - - #make scons colorgcc friendly - for key in ('HOME', 'TERM'): diff --git a/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch b/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch deleted file mode 100644 index 9de319bda9dd..000000000000 --- a/dev-db/mongodb/files/mongodb-3.0.14-fix-std-string.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- a/src/mongo/shell/bench.cpp 2017-09-20 19:12:20.893056990 +0200 -+++ b/src/mongo/shell/bench.cpp 2017-09-20 19:14:08.165060566 +0200 -@@ -52,6 +52,9 @@ - #include "mongo/util/time_support.h" - #include "mongo/util/version.h" - -+#include <string> -+using namespace std; -+ - // --------------------------------- - // ---- benchmarking system -------- - // --------------------------------- ---- a/src/mongo/db/dbwebserver.cpp 2017-09-20 19:24:50.042081961 +0200 -+++ b/src/mongo/db/dbwebserver.cpp 2017-09-20 19:26:20.240084968 +0200 -@@ -58,6 +58,8 @@ - #include "mongo/util/ramlog.h" - #include "mongo/util/version.h" - -+#include <string> -+using namespace std; - - namespace mongo { - ---- a/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:27:59.009088260 +0200 -+++ b/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:28:31.082089329 +0200 -@@ -39,6 +39,9 @@ - #include "mongo/db/jsobj.h" - #include "mongo/db/matcher/path.h" - -+#include <string> -+using namespace std; -+ - namespace mongo { - - Status LeafMatchExpression::initPath(const StringData& path) { ---- a/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:30:04.569092445 +0200 -+++ b/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:31:19.145094931 +0200 -@@ -70,6 +70,9 @@ - #include "mongo/util/exit.h" - #include "mongo/util/log.h" - -+#include <string> -+using namespace std; -+ - using boost::scoped_ptr; - using std::auto_ptr; - using std::cout; ---- a/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:32:55.368098138 +0200 -+++ b/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:33:57.128100197 +0200 -@@ -39,6 +39,9 @@ - #include "mongo/util/hex.h" - #include "mongo/util/log.h" - -+#include <string> -+using namespace std; -+ - namespace mongo { - - using boost::shared_ptr; ---- a/src/mongo/s/config.cpp 2017-09-20 19:42:45.614117812 +0200 -+++ b/src/mongo/s/config.cpp 2017-09-20 19:43:28.278119234 +0200 -@@ -60,6 +60,9 @@ - #include "mongo/util/net/message.h" - #include "mongo/util/stringutils.h" - -+#include <string> -+using namespace std; -+ - namespace mongo { - - using boost::scoped_ptr; ---- a/src/mongo/s/grid.cpp 2017-09-20 19:51:07.684134547 +0200 -+++ b/src/mongo/s/grid.cpp 2017-09-20 19:51:43.436135739 +0200 -@@ -55,6 +55,9 @@ - #include "mongo/util/startup_test.h" - #include "mongo/util/stringutils.h" - -+#include <string> -+using namespace std; -+ - namespace mongo { - - using std::endl; diff --git a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch deleted file mode 100644 index 8b29bd4a2a4f..000000000000 --- a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ab6f929ee4584f3f1a040e55a63f493603f228d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Fri, 1 Jan 2016 10:27:35 +0100 -Subject: [PATCH] Fix build for Gentoo - ---- - SConstruct | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 64c8387..fa9ab8b 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1371,7 +1371,6 @@ if env.TargetOSIs('posix'): - env.Append( CCFLAGS=["-fno-omit-frame-pointer", - "-fPIC", - "-fno-strict-aliasing", -- "-ggdb", - "-pthread", - "-Wall", - "-Wsign-compare", -@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'): - if not has_option("disable-warnings-as-errors"): - env.Append( CCFLAGS=["-Werror"] ) - -- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) - env.Append( LINKFLAGS=["-fPIC", "-pthread"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) - - # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program - # startup. -@@ -1398,10 +1398,10 @@ if env.TargetOSIs('posix'): - env.Append( SHLINKFLAGS=["-Wl,-z,now"] ) - env.Append( LINKFLAGS=["-rdynamic"] ) - -- env.Append( LIBS=[] ) -+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] ) - -- #make scons colorgcc friendly -- for key in ('HOME', 'TERM'): -+ #make scons colorgcc, distcc, ccache friendly -+ for key in ('HOME', 'PATH', 'TERM'): - try: - env['ENV'][key] = os.environ[key] - except KeyError: --- -2.6.4 - diff --git a/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch b/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch deleted file mode 100644 index 6067850ad0b2..000000000000 --- a/dev-db/mongodb/files/mongodb-3.2.16-Replace-string-with-explicit-std-string.patch +++ /dev/null @@ -1,283 +0,0 @@ -diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/dbwebserver.cpp mongodb-src-r3.2.16/src/mongo/db/dbwebserver.cpp ---- mongodb-src-r3.2.16_orig/src/mongo/db/dbwebserver.cpp 2017-07-14 22:36:01.000000000 +0200 -+++ mongodb-src-r3.2.16/src/mongo/db/dbwebserver.cpp 2017-08-01 15:43:55.860712772 +0200 -@@ -69,6 +69,7 @@ - using std::map; - using std::stringstream; - using std::vector; -+using std::string; - - using namespace html; - -diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/matcher/expression_leaf.cpp mongodb-src-r3.2.16/src/mongo/db/matcher/expression_leaf.cpp ---- mongodb-src-r3.2.16_orig/src/mongo/db/matcher/expression_leaf.cpp 2017-07-14 22:36:01.000000000 +0200 -+++ mongodb-src-r3.2.16/src/mongo/db/matcher/expression_leaf.cpp 2017-08-01 15:46:17.070708001 +0200 -@@ -200,7 +200,7 @@ - } - - void ComparisonMatchExpression::toBSON(BSONObjBuilder* out) const { -- string opString = ""; -+ std::string opString = ""; - switch (matchType()) { - case LT: - opString = "$lt"; -@@ -880,7 +880,7 @@ - } - - void BitTestMatchExpression::toBSON(BSONObjBuilder* out) const { -- string opString = ""; -+ std::string opString = ""; - - switch (matchType()) { - case BITS_ALL_SET: -diff -Nru mongodb-src-r3.2.16_orig/src/mongo/db/repl/master_slave.cpp mongodb-src-r3.2.16/src/mongo/db/repl/master_slave.cpp ---- mongodb-src-r3.2.16_orig/src/mongo/db/repl/master_slave.cpp 2017-07-14 22:36:01.000000000 +0200 -+++ mongodb-src-r3.2.16/src/mongo/db/repl/master_slave.cpp 2017-08-01 15:54:45.140690837 +0200 -@@ -161,7 +161,7 @@ - - BSONObjBuilder dbsNextPassBuilder; - int n = 0; -- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { -+ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { - n++; - dbsNextPassBuilder.appendBool(*i, 1); - } -@@ -170,7 +170,7 @@ - - BSONObjBuilder incompleteCloneDbsBuilder; - n = 0; -- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { -+ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { - n++; - incompleteCloneDbsBuilder.appendBool(*i, 1); - } -@@ -181,7 +181,7 @@ - } - - void ReplSource::ensureMe(OperationContext* txn) { -- string myname = getHostName(); -+ std::string myname = getHostName(); - - // local.me is an identifier for a server for getLastError w:2+ - bool exists = Helpers::getSingleton(txn, "local.me", _me); -@@ -373,10 +373,10 @@ - } - - virtual bool run(OperationContext* txn, -- const string& ns, -+ const std::string& ns, - BSONObj& cmdObj, - int options, -- string& errmsg, -+ std::string& errmsg, - BSONObjBuilder& result) { - HandshakeArgs handshake; - Status status = handshake.initialize(cmdObj); -@@ -393,7 +393,7 @@ - } handshakeCmd; - - bool replHandshake(DBClientConnection* conn, const OID& myRID) { -- string myname = getHostName(); -+ std::string myname = getHostName(); - - BSONObjBuilder cmd; - cmd.append("handshake", myRID); -@@ -445,7 +445,7 @@ - BSONElement e = i.next(); - if (e.eoo()) - break; -- string name = e.embeddedObject().getField("name").valuestr(); -+ std::string name = e.embeddedObject().getField("name").valuestr(); - if (!e.embeddedObject().getBoolField("empty")) { - if (name != "local") { - if (only.empty() || only == name) { -@@ -459,7 +459,7 @@ - save(txn); - } - --void ReplSource::resyncDrop(OperationContext* txn, const string& db) { -+void ReplSource::resyncDrop(OperationContext* txn, const std::string& db) { - log() << "resync: dropping database " << db; - OldClientContext ctx(txn, db); - dropDatabase(txn, ctx.db()); -@@ -502,13 +502,13 @@ - - static DatabaseIgnorer ___databaseIgnorer; - --void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) { -+void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) { - if (futureOplogTime > _ignores[db]) { - _ignores[db] = futureOplogTime; - } - } - --bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) { -+bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) { - if (_ignores[db].isNull()) { - return false; - } -@@ -598,7 +598,7 @@ - - // The database is present on the master and no conflicting databases - // are present on the master. Drop any local conflicts. -- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { -+ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { - ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime); - incompleteCloneDbs.erase(*i); - addDbNextPass.erase(*i); -@@ -793,10 +793,10 @@ - } - - void ReplSource::syncToTailOfRemoteLog() { -- string _ns = ns(); -+ std::string _ns = ns(); - BSONObjBuilder b; - if (!only.empty()) { -- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only)); -+ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only)); - } - BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1))); - if (!last.isEmpty()) { -@@ -844,7 +844,7 @@ - */ - int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - int okResultCode = 1; -- string ns = string("local.oplog.$") + sourceName(); -+ std::string ns = std::string("local.oplog.$") + sourceName(); - LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n'; - - bool tailing = true; -@@ -864,7 +864,7 @@ - BSONElement e = i.next(); - if (e.eoo()) - break; -- string name = e.embeddedObject().getField("name").valuestr(); -+ std::string name = e.embeddedObject().getField("name").valuestr(); - if (!e.embeddedObject().getBoolField("empty")) { - if (name != "local") { - if (only.empty() || only == name) { -@@ -888,7 +888,7 @@ - if (!only.empty()) { - // note we may here skip a LOT of data table scanning, a lot of work for the master. - // maybe append "\\." here? -- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only)); -+ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only)); - } - BSONObj queryObj = query.done(); - // e.g. queryObj = { ts: { $gte: syncedTo } } -@@ -907,7 +907,7 @@ - - // show any deferred database creates from a previous pass - { -- set<string>::iterator i = addDbNextPass.begin(); -+ set<std::string>::iterator i = addDbNextPass.begin(); - if (i != addDbNextPass.end()) { - BSONObjBuilder b; - b.append("ns", *i + '.'); -@@ -938,7 +938,7 @@ - BSONObj op = oplogReader.next(); - BSONElement ts = op.getField("ts"); - if (ts.type() != Date && ts.type() != bsonTimestamp) { -- string err = op.getStringField("$err"); -+ std::string err = op.getStringField("$err"); - if (!err.empty()) { - // 13051 is "tailable cursor requested on non capped collection" - if (op.getIntField("code") == 13051) { -@@ -1106,7 +1106,7 @@ - - // FIXME Handle cases where this db isn't on default port, or default port is spec'd in - // hostName. -- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) && -+ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) && - serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) { - log() << "can't sync from self (localhost). sources configuration may be wrong." << endl; - sleepsecs(5); -@@ -1251,7 +1251,7 @@ - if (s) { - stringstream ss; - ss << "sleep " << s << " sec before next pass"; -- string msg = ss.str(); -+ std::string msg = ss.str(); - if (!serverGlobalParams.quiet) - log() << msg << endl; - ReplInfo r(msg.c_str()); -diff -Nru mongodb-src-r3.2.16_orig/src/mongo/shell/bench.cpp mongodb-src-r3.2.16/src/mongo/shell/bench.cpp ---- mongodb-src-r3.2.16_orig/src/mongo/shell/bench.cpp 2017-07-14 22:36:01.000000000 +0200 -+++ mongodb-src-r3.2.16/src/mongo/shell/bench.cpp 2017-08-01 16:20:20.864638957 +0200 -@@ -674,7 +674,7 @@ - invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess); - - if (_config->username != "") { -- string errmsg; -+ std::string errmsg; - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg); - } -@@ -920,7 +920,7 @@ - - if (!result["err"].eoo() && result["err"].type() == String && - (_config->throwGLE || op.throwGLE)) -- throw DBException((string) "From benchRun GLE" + -+ throw DBException((std::string) "From benchRun GLE" + - causedBy(result["err"].String()), - result["code"].eoo() ? 0 : result["code"].Int()); - } -@@ -987,7 +987,7 @@ - - if (!result["err"].eoo() && result["err"].type() == String && - (_config->throwGLE || op.throwGLE)) -- throw DBException((string) "From benchRun GLE" + -+ throw DBException((std::string) "From benchRun GLE" + - causedBy(result["err"].String()), - result["code"].eoo() ? 0 : result["code"].Int()); - } -@@ -1035,7 +1035,7 @@ - - if (!result["err"].eoo() && result["err"].type() == String && - (_config->throwGLE || op.throwGLE)) -- throw DBException((string) "From benchRun GLE " + -+ throw DBException((std::string) "From benchRun GLE " + - causedBy(result["err"].String()), - result["code"].eoo() ? 0 : result["code"].Int()); - } -@@ -1136,7 +1136,7 @@ - try { - std::unique_ptr<DBClientBase> conn(_config->createConnection()); - if (!_config->username.empty()) { -- string errmsg; -+ std::string errmsg; - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg); - } -@@ -1168,7 +1168,7 @@ - std::unique_ptr<DBClientBase> conn(_config->createConnection()); - // Must authenticate to admin db in order to run serverStatus command - if (_config->username != "") { -- string errmsg; -+ std::string errmsg; - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(16704, - str::stream() -@@ -1204,7 +1204,7 @@ - { - std::unique_ptr<DBClientBase> conn(_config->createConnection()); - if (_config->username != "") { -- string errmsg; -+ std::string errmsg; - // this can only fail if admin access was revoked since start of run - if (!conn->auth("admin", _config->username, _config->password, errmsg)) { - uasserted(16705, -diff -Nru mongodb-src-r3.2.16_orig/src/mongo/util/net/miniwebserver.cpp mongodb-src-r3.2.16/src/mongo/util/net/miniwebserver.cpp ---- mongodb-src-r3.2.16_orig/src/mongo/util/net/miniwebserver.cpp 2017-07-14 22:36:01.000000000 +0200 -+++ mongodb-src-r3.2.16/src/mongo/util/net/miniwebserver.cpp 2017-08-01 16:01:01.832678112 +0200 -@@ -45,8 +45,9 @@ - using std::endl; - using std::stringstream; - using std::vector; -+using std::string; - --MiniWebServer::MiniWebServer(const string& name, const string& ip, int port) -+MiniWebServer::MiniWebServer(const std::string& name, const std::string& ip, int port) - : Listener(name, ip, port, false) {} - - string MiniWebServer::parseURL(const char* buf) { diff --git a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch b/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch deleted file mode 100644 index 41c9bd2ba85c..000000000000 --- a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch +++ /dev/null @@ -1,84 +0,0 @@ -Fix issues caused by boost::none changes.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=578846
-Adapted from: https://github.com/mongodb/mongo/commit/92c3f80f384d2825efeabd0d26aa534c0deb6988
-
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp -+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp -@@ -47,7 +47,7 @@ - if (_referenceDoc.isEmpty()) { - FTDCBSONUtil::extractMetricsFromDocument(sample, sample, &_metrics); - _reset(sample, date); -- return {boost::none_t()}; -+ return {boost::none}; - } - - _metrics.resize(0); -@@ -107,7 +107,7 @@ - } - - // The buffer is not full, inform the caller -- return {boost::none_t()}; -+ return {boost::none}; - } - - StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() { ---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp -+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp -@@ -122,7 +122,7 @@ - TestTie() : _compressor(&_config) {} - - ~TestTie() { -- validate(boost::none_t()); -+ validate(boost::none); - } - - StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>> ---- mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp -+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp -@@ -205,7 +205,7 @@ - - Status FTDCFileWriter::close() { - if (_archiveStream.is_open()) { -- Status s = flush(boost::none_t(), Date_t()); -+ Status s = flush(boost::none, Date_t()); - - _archiveStream.close(); - ---- mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp -+++ mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp -@@ -175,7 +175,7 @@ - return true;
- }
-
-- unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
-+ unsigned long const res=WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
- if(res==detail::win32::timeout)
- {
- for(;;)
-@@ -328,7 +328,7 @@ - {
- return true;
- }
-- unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
-+ unsigned long const wait_res=WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
- if(wait_res==detail::win32::timeout)
- {
- for(;;)
-@@ -421,7 +421,7 @@ - return;
- }
-
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite));
-+ BOOST_VERIFY(!WaitForSingleObject(unlock_sem,detail::win32::infinite));
- }
- }
-
-@@ -502,7 +502,7 @@ - {
- if(!last_reader)
- {
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite));
-+ BOOST_VERIFY(!WaitForSingleObject(upgrade_sem,detail::win32::infinite));
- }
- break;
- }
diff --git a/dev-db/mongodb/files/mongodb.confd-r2 b/dev-db/mongodb/files/mongodb.confd-r2 deleted file mode 100644 index dddb67e9301d..000000000000 --- a/dev-db/mongodb/files/mongodb.confd-r2 +++ /dev/null @@ -1,12 +0,0 @@ -# !! IMPORTANT !! -# -# This file is ONLY used to override some of the init script configuration. -# -# You should NOT use this file to configure your mongodb instance, -# see the /etc/mongodb.conf file instead. -# -# Available init script modifiers : -# - config_file : the configuration file to use (default : /etc/mongodb.conf) -# - user : the user used to run your mongodb instance (default : mongodb) -# - group : the group used to run your mongodb instance (default : mongodb) -# - run_dir : the run directory for your PID files (default : /run/mongodb) diff --git a/dev-db/mongodb/files/mongodb.initd-r2 b/dev-db/mongodb/files/mongodb.initd-r2 deleted file mode 100644 index 27b9f2a43872..000000000000 --- a/dev-db/mongodb/files/mongodb.initd-r2 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -config_file=${config_file:-/etc/${SVCNAME}.conf} -run_dir=${run_dir:-/run/mongodb} - -command="/usr/bin/mongod" -command_args="--config ${config_file}" -command_background="true" -pidfile=${run_dir}/${SVCNAME}.pid -user=${user:-mongodb} -group=${group:-mongodb} -start_stop_daemon_args="--user ${user} --group ${group}" - -depend() { - use net -} - -start_pre() { - checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}" - if [ ! -f ${config_file} ]; then - eerror "Missing configuration file ${config_file}" - return 1 - fi -} diff --git a/dev-db/mongodb/files/mongos.confd-r2 b/dev-db/mongodb/files/mongos.confd-r2 deleted file mode 100644 index 0dc2a189ff67..000000000000 --- a/dev-db/mongodb/files/mongos.confd-r2 +++ /dev/null @@ -1,12 +0,0 @@ -# !! IMPORTANT !! -# -# This file is ONLY used to override some of the init script configuration. -# -# You should NOT use this file to configure your mongos instance, -# see the /etc/mongos.conf file instead. -# -# Available init script modifiers : -# - config_file : the configuration file to use (default : /etc/mongos.conf) -# - user : the user used to run your mongodb instance (default : mongodb) -# - group : the group used to run your mongodb instance (default : mongodb) -# - run_dir : the run directory for your PID files (default : /run/mongodb) diff --git a/dev-db/mongodb/files/mongos.initd-r2 b/dev-db/mongodb/files/mongos.initd-r2 deleted file mode 100644 index 2e7db669a5e0..000000000000 --- a/dev-db/mongodb/files/mongos.initd-r2 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -config_file=${config_file:-/etc/${SVCNAME}.conf} -run_dir=${run_dir:-/run/mongodb} - -command="/usr/bin/mongos" -command_args="--config ${config_file}" -command_background="true" -pidfile=${run_dir}/${SVCNAME}.pid -user=${user:-mongodb} -group=${group:-mongodb} -start_stop_daemon_args="--user ${user} --group ${group}" - -depend() { - use net -} - -start_pre() { - checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}" - if [ ! -f ${config_file} ]; then - eerror "Missing configuration file ${config_file}" - return 1 - fi -} |