From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Dec 2017 20:48:53 +0000 Subject: gentoo resync : 23.12.2017 --- dev-db/mongodb/Manifest | 3 - dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch | 35 --- ...4-Replace-string-with-explicit-std-string.patch | 302 --------------------- .../files/mongodb-3.4.6-no-boost-check.patch | 11 - 4 files changed, 351 deletions(-) delete mode 100644 dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch delete mode 100644 dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch delete mode 100644 dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch (limited to 'dev-db/mongodb') diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index dd0ff5496933..2b836f89aaee 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,7 +1,6 @@ AUX mongodb-2.4-fix-v8-pythonpath.patch 439 BLAKE2B c21bad3d269eee2c93ff2192166054e9ddcb2c415aaa1763c95e63c56d1af05bdc1b629136f23468fc6f08a4990474e00ca9dbb37a6ac236dea7bc0b1b03e9a1 SHA512 8d8a73eaf605cac50fe429c7141500bbc0e4f308c35b36b4ec48b4123f3241b6f5dc2670725bc7caba5769949b254874e9c36871142635c552a4c2d05a339d2c AUX mongodb-2.6.10-fix-boost-1.57.patch 482 BLAKE2B 933b6ab35e1a82238bf0f59140693368f897ef7f0a39b5a0620b089bd4c9c8ddf0489fbb646ca4987eb83fddf06c694a4f491512011fe01c6a55ba0637602c90 SHA512 23ce6b7c7b1d297ed45789e0b6486e699e2353bd4d3c7c0249b6df4efeb06695224e68f198f5a3c424e60fb20cb3f3d0b5d34f3ccc3ebcb9f964683acc5a4a5c AUX mongodb-2.6.2-fix-scons.patch 1448 BLAKE2B f96ea6b01ace8b8f92a4d8622c6f0f432a63ae2297630e905ed6469e2a1136c838e437a65ef920067bb996ba79c9421736d18529255f7921c5311ba4756684c9 SHA512 acda6ee27bf2b9a75bb2a1484fa8754e4dc700e5bd835e9f48b528a89e46a6236c38b68d42d58be6bd504d6287f673e6d71d07807e42c93fd0bd4d492387b8a6 -AUX mongodb-3.0.0-fix-scons.patch 1455 BLAKE2B 3473107735b375bd3da870ceec5dc6eded5b21bddf6b28cec009aba97c082239c04a8c68c57179841138b4a3ff08820bbeb2c345a3766077065e6fe9d5a2c0b9 SHA512 2dcf2679a520028babda9dd05a593dcb8c935b7232477cb31bb6f3c4240de333f8b463134a27776bd1fe1ac346fe7a44a559d65c47885712b20620ef70654a92 AUX mongodb-3.0.14-fix-scons.patch 1419 BLAKE2B da2aaf46a04a1fb345b8e44ca950d8e1b0de8e1699d47bf146e879f6461b8329a5900265a97710df5a8195283d21007dc9a1bd2b3ecebb113f718d0fd0ed74ba SHA512 2cf591ee25d33adf98ca6baeb086fb8677720809bc3e2b9398bba6ae84548b2aa3dfd57216e185fc6aa0aa185c9a906fe2a1b97bc81942560f02903b24f7bd25 AUX mongodb-3.0.14-fix-std-string.patch 2341 BLAKE2B ae22f1c03e9230ee8dac8bacefcbd3dd193d8776dd2e86a761d5b0fe3bba823c3c1c8f9a0d2b91ff4aea0860c01289d7bc4b12fb91c02db72d0e4a755f40172f SHA512 1c1d46f4d058685371914ac70c8ad36fba387e9a140ddfd5650cf0411a73776d7b8ef6108a778eaeaa5ba22eba0e16b2301d257a47250a67e7e013d7bb402e47 AUX mongodb-3.2.0-fix-scons.patch 1738 BLAKE2B 0e85c39637900a67c7a04396963624e9e53cc5d482eb177e7845e10817ce51bc0bec32f91c7ba31bc953d26f9b28f05dbf3ee2423e058c4ea49ac101ece95434 SHA512 04f95586b46960405b7b1906ea3c3c75d37d6831a458f619347ac028c77db5744131cb7bf39cdf62bf564500b1f6785e25b9a0c0526f126bf2072269385afe45 @@ -9,8 +8,6 @@ AUX mongodb-3.2.10-boost-1.62.patch 702 BLAKE2B fb3822a1a212aae30f6fbb33a4a87f5f AUX mongodb-3.2.16-Replace-string-with-explicit-std-string.patch 12636 BLAKE2B 21f04acd87242a11577a20cadde11a9cc994172532b933efba6e3f96ae6bb1aaa64ab271aaf7d286f84e77ae13a688682d19e815820d5ee3c64d8a605226adea SHA512 43a610b0c37c74576ef3e3df3734c4d9d904271dd3853003ff439f61099666a356ed5d4f046573a753c652dfe1e1c1607b1abe041482b740fe828f543272646c AUX mongodb-3.2.4-boost-1.60.patch 3352 BLAKE2B c008120ace4dc5507fd0de68caf12a79465f61345a68be8a98a0dc84fe457bc7f04d0f99b9eab6644df34ac79efad1e7b77134cd7a29c65485568bce9e2b59cc SHA512 260c3edc3a04f3fae9f18fb73b3ae027709aa019751627d1a24b2ee40a72f91ef9de64606aff32c0890861fc56ae3c80341ba87cd16fffdd009b4fa5089c70db AUX mongodb-3.4.0-fix-scons.patch 1411 BLAKE2B 6e5975b70ec7f281ea2cd101b16ee2849762fa1dd8427522eb3b01cd1738e60ece013bf23d07c180c58af024aebd141ca7fdf80bc240701f48556da46d3787ab SHA512 2e29c91a22663259d2f5413fbb2652702bceb122899e50a8969fb82d74a64a78649e79b005e20e6640740c089b1cee19080890eb8d9344c2ce355a977146b770 -AUX mongodb-3.4.4-Replace-string-with-explicit-std-string.patch 14244 BLAKE2B 83697815275b7018d5362664c0a207d369a5154de2d12fb7e99a6043ec52414b9d6de65bffdb8f1496581c3967f454b342e379f0575bdc84c379a095c0fedc10 SHA512 2f01729c2121fdad368c1bc157e4648ff933673107f3d1fb7de1a65e2bfc3a41c678eff345a5060bf26d45636947337cf2b5136a69ca06c012574a91a57d959a -AUX mongodb-3.4.6-no-boost-check.patch 617 BLAKE2B ddcbcc0ff97a6df41305da7f8615ccdc75de70b582139a045717255ef5fd98610fc8a9bb7fbbb5e054555fa3e5c6ecbbdfd939baf5e2f1badb04f3182cd2d370 SHA512 a7047a0099ff5d0cab7efe60b6980df51b360a6b9750b8c6b4f6b841d9c98f0cc16f8d322de675ec9e97126d03081d4e574abd9b87c6a6c8b34481d9f57c7eb5 AUX mongodb-3.4.6-sysmacros-include.patch 1419 BLAKE2B f07ab093f13ea2b9675538dc99e2e58f85019edffad05bbbf3032f85f8ef881020cc9bf25bc62ca13344e7b8b7dd3b04954c76974c512a41ea5a7a2045de2b34 SHA512 ab269ec003b74848f981021f5eb09e38216d75dd9d1b8a155068b2a335d9ec9d1f5f575028ae9b4b0d8745d15e464cb05b70aabc6c28c984115574c6747afc05 AUX mongodb-3.4.7-no-boost-check.patch 641 BLAKE2B 0dc3a426b28cd80d7b3361ff9c6747aff64dd27c1bc01a9717c2dd1c160b66f53feb72fd2ead385c220ebe92a8c7b8fa6b04fb3fa8437dba17d5f8346665f6b8 SHA512 812eaaadb6f265cfc904e8f3a7ae8276e42e3968529914179efab5e44f1951ab46ac3bbcfb259f924b20a8ca61d2ebcf72b7103ea9d5f25594ff8e9e3e85836b AUX mongodb.conf 246 BLAKE2B 6187573d7ac6da911030b215ef98173f4317d3f056ae9a2dfe7ce22d4d329355f49d373c253949048ad7a20d54750f0df95ade83c50bba0af5242b41cb8d40a9 SHA512 05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c diff --git a/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch deleted file mode 100644 index b7378d8ac416..000000000000 --- a/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- SConstruct.orig 2015-02-05 16:33:41.000000000 +0000 -+++ SConstruct 2015-02-18 08:21:23.120134258 +0000 -@@ -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.4.4-Replace-string-with-explicit-std-string.patch b/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch deleted file mode 100644 index da33d47df7ff..000000000000 --- a/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch +++ /dev/null @@ -1,302 +0,0 @@ -From 9df9837299ab952d4d30db2427beef667e608f79 Mon Sep 17 00:00:00 2001 -From: Steven Green -Date: Mon, 17 Jul 2017 13:05:44 +0100 -Subject: [PATCH] SERVER-30166 Replace string with explicit std::string. - Enables compulation when using --use-system-pcre which presusably used to do - 'using std::string' in an earlier version of pcre - - https://github.com/mongodb/mongo/pull/1166 - ---- - src/mongo/db/dbwebserver.cpp | 1 + - src/mongo/db/matcher/expression_leaf.cpp | 4 ++-- - src/mongo/db/repl/master_slave.cpp | 40 ++++++++++++++++---------------- - src/mongo/shell/bench.cpp | 14 +++++------ - src/mongo/util/net/miniwebserver.cpp | 1 + - 5 files changed, 31 insertions(+), 29 deletions(-) - -diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp -index b202e0500b9..02556135240 100644 ---- a/src/mongo/db/dbwebserver.cpp -+++ b/src/mongo/db/dbwebserver.cpp -@@ -67,6 +67,7 @@ namespace mongo { - using std::map; - using std::stringstream; - using std::vector; -+using std::string; - - using namespace html; - -diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp -index d562bff141e..b96a36d543f 100644 ---- a/src/mongo/db/matcher/expression_leaf.cpp -+++ b/src/mongo/db/matcher/expression_leaf.cpp -@@ -202,7 +202,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con - } - - void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const { -- string opString = ""; -+ std::string opString = ""; - switch (matchType()) { - case LT: - opString = "$lt"; -@@ -884,7 +884,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const - } - - void BitTestMatchExpression::serialize(BSONObjBuilder* out) const { -- string opString = ""; -+ std::string opString = ""; - - switch (matchType()) { - case BITS_ALL_SET: -diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp -index 05faad12599..042350465c6 100644 ---- a/src/mongo/db/repl/master_slave.cpp -+++ b/src/mongo/db/repl/master_slave.cpp -@@ -168,7 +168,7 @@ BSONObj ReplSource::jsobj() { - - BSONObjBuilder dbsNextPassBuilder; - int n = 0; -- for (set::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { -+ for (set::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) { - n++; - dbsNextPassBuilder.appendBool(*i, 1); - } -@@ -177,7 +177,7 @@ BSONObj ReplSource::jsobj() { - - BSONObjBuilder incompleteCloneDbsBuilder; - n = 0; -- for (set::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { -+ for (set::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) { - n++; - incompleteCloneDbsBuilder.appendBool(*i, 1); - } -@@ -188,7 +188,7 @@ BSONObj ReplSource::jsobj() { - } - - 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); -@@ -378,10 +378,10 @@ class HandshakeCmd : public Command { - } - - 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); -@@ -398,7 +398,7 @@ class HandshakeCmd : public Command { - } handshakeCmd; - - bool replHandshake(DBClientConnection* conn, const OID& myRID) { -- string myname = getHostName(); -+ std::string myname = getHostName(); - - BSONObjBuilder cmd; - cmd.append("handshake", myRID); -@@ -450,7 +450,7 @@ void ReplSource::forceResync(OperationContext* txn, const char* requester) { - 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) { -@@ -481,7 +481,7 @@ Status ReplSource::_updateIfDoneWithInitialSync() { - return Status::OK(); - } - --void ReplSource::resyncDrop(OperationContext* txn, const string& dbName) { -+void ReplSource::resyncDrop(OperationContext* txn, const std::string& dbName) { - log() << "resync: dropping database " << dbName; - invariant(txn->lockState()->isW()); - -@@ -531,13 +531,13 @@ void ReplSource::resync(OperationContext* txn, const std::string& dbName) { - - 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; - } -@@ -627,7 +627,7 @@ bool ReplSource::handleDuplicateDbName(OperationContext* txn, - - // The database is present on the master and no conflicting databases - // are present on the master. Drop any local conflicts. -- for (set::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { -+ for (set::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) { - ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime); - incompleteCloneDbs.erase(*i); - addDbNextPass.erase(*i); -@@ -826,10 +826,10 @@ void ReplSource::_sync_pullOpLog_applyOperation(OperationContext* txn, - } - - 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()) { -@@ -877,7 +877,7 @@ class ReplApplyBatchSize - */ - int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - int okResultCode = restartSyncAfterSleep; -- 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; -@@ -897,7 +897,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - 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) { -@@ -921,7 +921,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - 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 } } -@@ -940,7 +940,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - - // show any deferred database creates from a previous pass - { -- set::iterator i = addDbNextPass.begin(); -+ set::iterator i = addDbNextPass.begin(); - if (i != addDbNextPass.end()) { - BSONObjBuilder b; - b.append("ns", *i + '.'); -@@ -984,7 +984,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) { - BSONObj op = oplogReader.nextSafe(); - 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) { -@@ -1152,7 +1152,7 @@ int ReplSource::sync(OperationContext* txn, int& nApplied) { - - // 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); -@@ -1297,7 +1297,7 @@ static void replMain(OperationContext* txn) { - 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 --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp -index 040002f5c6e..338477ebe56 100644 ---- a/src/mongo/shell/bench.cpp -+++ b/src/mongo/shell/bench.cpp -@@ -674,7 +674,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - 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); - } -@@ -918,7 +918,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - - 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()); - } -@@ -984,7 +984,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - - 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()); - } -@@ -1031,7 +1031,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) { - - 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()); - } -@@ -1133,7 +1133,7 @@ void BenchRunWorker::run() { - try { - std::unique_ptr 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); - } -@@ -1165,7 +1165,7 @@ void BenchRunner::start() { - std::unique_ptr 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, -@@ -1201,7 +1201,7 @@ void BenchRunner::stop() { - { - std::unique_ptr 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( -diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp -index 5f4165d42f4..7a7d0714934 100644 ---- a/src/mongo/util/net/miniwebserver.cpp -+++ b/src/mongo/util/net/miniwebserver.cpp -@@ -47,6 +47,7 @@ namespace mongo { - using std::shared_ptr; - using std::stringstream; - using std::vector; -+using std::string; - - MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx) - : Listener(name, ip, port, ctx, false, false) {} diff --git a/dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch b/dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch deleted file mode 100644 index 2abde5ef08e0..000000000000 --- a/dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct.orig 2017-06-27 19:02:43.000000000 +0000 -+++ SConstruct 2017-07-07 11:33:13.252639289 +0000 -@@ -2798,8 +2798,6 @@ - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): - myenv.ConfError("can't find boost headers") -- if not conf.CheckBoostMinVersion(): -- myenv.ConfError("system's version of boost is too old. version 1.49 or better required") - - # Note that on Windows with using-system-boost builds, the following - # FindSysLibDep calls do nothing useful (but nothing problematic either) -- cgit v1.2.3