[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Michał Górny]

commit:     cad1e743614674af89fc9fced03594bcab6f20a3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 09:36:29 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 09:37:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad1e743

dev-db/mongodb: [QA] Make SCons respect PATH, #570436

 dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 33 +++++++++++++++++-----
 1 file changed, 26 insertions(+), 7 deletions(-)

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
index 1eb79d1..8b29bd4 100644
--- a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
@@ -1,6 +1,17 @@
---- a/SConstruct	2015-12-02 20:01:34.000000000 +0100
-+++ b/SConstruct	2015-12-27 17:06:45.563739544 +0100
-@@ -1371,7 +1371,6 @@
+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",
@@ -8,7 +19,7 @@
                           "-pthread",
                           "-Wall",
                           "-Wsign-compare",
-@@ -1382,8 +1381,9 @@
+@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'):
          if not has_option("disable-warnings-as-errors"):
              env.Append( CCFLAGS=["-Werror"] )
  
@@ -19,12 +30,20 @@
  
      # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
      # startup.
-@@ -1398,7 +1398,7 @@
+@@ -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 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
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[David Seifert]

commit:     29d6de2cff08f854ed7cd296c3b2100565cffe46
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Nov 29 17:27:56 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 13:12:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d6de2c

dev-db/mongodb: remove unused patches

 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 -
 3 files changed, 348 deletions(-)

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 b7378d8ac41..00000000000
--- 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 da33d47df7f..00000000000
--- 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 <steven@greenius.co.uk>
-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<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);
-     }
-@@ -177,7 +177,7 @@ BSONObj ReplSource::jsobj() {
- 
-     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);
-     }
-@@ -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<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);
-@@ -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<string>::iterator i = addDbNextPass.begin();
-+        set<std::string>::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<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);
-             }
-@@ -1165,7 +1165,7 @@ void BenchRunner::start() {
-         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,
-@@ -1201,7 +1201,7 @@ void BenchRunner::stop() {
-     {
-         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(
-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 2abde5ef08e..00000000000
--- 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)

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Alexys Jacob]

commit:     704aa55d7aa23c683bad8e2811df110e0ec7ad7f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan  6 09:04:28 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 10:08:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704aa55d

dev-db/mongodb: remove unused files

Closes: https://github.com/gentoo/gentoo/pull/6768

 dev-db/mongodb/files/mongodb.conf    |  8 --------
 dev-db/mongodb/files/mongodb.conf-r2 | 33 ---------------------------------
 2 files changed, 41 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb.conf b/dev-db/mongodb/files/mongodb.conf
deleted file mode 100644
index c5272b7f2df..00000000000
--- a/dev-db/mongodb/files/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true

diff --git a/dev-db/mongodb/files/mongodb.conf-r2 b/dev-db/mongodb/files/mongodb.conf-r2
deleted file mode 100644
index 8e8a64408cd..00000000000
--- a/dev-db/mongodb/files/mongodb.conf-r2
+++ /dev/null
@@ -1,33 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file uses the YAML format as described in the documentation:
-#   http://docs.mongodb.org/manual/reference/configuration-options/
-
-storage:
-    dbPath: "/var/lib/mongodb"
-
-systemLog:
-    destination: file
-    path: "/var/log/mongodb/mongodb.log"
-    quiet: true
-    logAppend: true
-
-net:
-    port: 27017
-    bindIp: 127.0.0.1
-#    ssl:
-#        mode: disabled
-
-#security:
-    #keyFile:
-    #clusterAuthMode:
-
-#replication:
-    #replSetName:
-
-# Specifies one of the MongoDB parameters described here:
-#   http://docs.mongodb.org/manual/reference/parameters/
-#
-# You can specify multiple setParameter fields such as:
-#   setParameter: {enableTestCommands: 1}
-#setParameter:

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Aaron Bauman]

commit:     aa98e596a87ca9ff7fd46d39e748b06956c9f777
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Mar  2 11:53:46 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 03:11:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa98e596

dev-db/mongodb: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11210
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch b/dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch
deleted file mode 100644
index 30a3bdff45f..00000000000
--- a/dev-db/mongodb/files/mongodb-3.2.10-boost-1.62.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Derived from http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/databases/mongodb/patches/patch-src_mongo_db_fts_unicode_string.cpp v1.1
-
-* Fix build with boost 1.62.0
-
---- a/src/mongo/db/fts/unicode/string.cpp	2016-09-26 12:10:04.000000000 +0000
-+++ b/src/mongo/db/fts/unicode/string.cpp
-@@ -274,7 +274,7 @@ bool String::substrMatch(const std::stri
- 
-     // Case sensitive and diacritic sensitive.
-     return boost::algorithm::boyer_moore_search(
--               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != haystack.end();
-+               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != std::make_pair(haystack.end(), haystack.end());
- }
- 
- }  // namespace unicode

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Alexys Jacob]

commit:     4388d0fb829dbbfaa3515ff9b597d65b75a4c494
Author:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 15:11:52 2019 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 15:11:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4388d0fb

dev-db/mongodb: add retry policy to mongodb initd

Package-Manager: Portage-2.3.78, Repoman-2.3.18
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 dev-db/mongodb/files/mongodb.initd-r3 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-db/mongodb/files/mongodb.initd-r3 b/dev-db/mongodb/files/mongodb.initd-r3
index 778ef748240..9235772b391 100644
--- a/dev-db/mongodb/files/mongodb.initd-r3
+++ b/dev-db/mongodb/files/mongodb.initd-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 : ${config_file:="/etc/${RC_SVCNAME}.conf"}
@@ -12,6 +12,7 @@ command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
 command_user="${user}:${group}"
 required_files="${config_file}"
+retry="SIGTERM/30"
 
 depend() {
 	use net

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Aaron Bauman]

commit:     53d85bba45fe2295ef7c49f5ca86eee860849908
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jan  1 21:13:13 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 23:08:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d85bba

dev-db/mongodb: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14206
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch b/dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch
deleted file mode 100644
index 6afa0d75caf..00000000000
--- a/dev-db/mongodb/files/mongodb-4.2.0-fix-scons-third-party.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/third_party/SConscript	2019-09-22 14:31:48.847382840 +0200
-+++ b/src/third_party/SConscript	2019-09-22 14:32:56.858997243 +0200
-@@ -188,7 +188,7 @@
-     libraries = thisEnv.Flatten([libraries])
-     parts = thisEnv.Flatten([parts])
-     for lib in libraries:
--        mods = thirdPartyEnvironmentModifications[lib]
-+        mods = thirdPartyEnvironmentModifications.get(lib, {})
-         if not parts:
-             thisEnv.PrependUnique(**mods)
-         else:

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Conrad Kostecki]

commit:     4b79e258a918930fa470fc73dc685bee42f41163
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 20 08:19:40 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 22:43:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b79e258

dev-db/mongodb: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19551
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../mongodb/files/mongodb-4.0.0-no-compass.patch   | 57 ----------------------
 1 file changed, 57 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch b/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch
deleted file mode 100644
index 35e9c172e9e..00000000000
--- a/dev-db/mongodb/files/mongodb-4.0.0-no-compass.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index c8f925b7..0e4f99ad 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -671,44 +671,6 @@ for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
- for target in env["DIST_BINARIES"]:
-     installBinary(env, "db/modules/" + target)
- 
--# Set the download url to the right place
--compass_type = 'compass-community'
--if 'enterprise' in env['MONGO_MODULES']:
--    compass_type = 'compass'
--
--compass_script = "install_compass"
--if env.TargetOSIs('windows'):
--    # On windows the .in needs to be explicitly added to the file.
--    compass_script = "Install-Compass.ps1.in"
--
--compass_python_interpreter = '/usr/bin/env python2'
--if env.TargetOSIs('darwin'):
--    compass_python_interpreter = '/usr/bin/env python'
--
--compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
--                                  SUBST_DICT=[
--                                      ('@compass_type@', compass_type),
--                                      ('@python_interpreter@', compass_python_interpreter),
--                                  ])
--distBinaries.append(compass_installer)
--
--if not hygienic:
--    compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
--else:
--    compass_script_installer = env.AutoInstall(
--        'bin',
--        source=[
--            compass_installer,
--        ],
--        INSTALL_ALIAS=[
--            'tools',
--        ],
--    )
--
--if env.TargetOSIs('posix'):
--    env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
--    env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
--
- # "dist" target is valid only when --use-new-tools is specified
- # Attempts to build release artifacts without tools must fail
- if has_option("use-new-tools"):
-@@ -726,7 +688,6 @@ if has_option("use-new-tools"):
-                 '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
-                 '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
-                 '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
--                '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
-                 '${TEMPFILE(SOURCES[1:])}'
-             ],
-         ),

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Conrad Kostecki]

commit:     e7fba2177f693f81b4216b7acd81bbb4f4593e1f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 21 17:00:01 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 18:25:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fba217

dev-db/mongodb: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22356
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../mongodb/files/mongodb-4.2.10-no-compass.patch  | 54 ----------------------
 1 file changed, 54 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-4.2.10-no-compass.patch b/dev-db/mongodb/files/mongodb-4.2.10-no-compass.patch
deleted file mode 100644
index e60cd827f49..00000000000
--- a/dev-db/mongodb/files/mongodb-4.2.10-no-compass.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index 6c78164c..b4b7c579 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -805,41 +805,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
- for target in env["DIST_BINARIES"]:
-     installBinary(env, "db/modules/" + target)
- 
--compass_type = 'compass'
--
--compass_script = "install_compass"
--if env.TargetOSIs('windows'):
--    # On windows the .in needs to be explicitly added to the file.
--    compass_script = "Install-Compass.ps1.in"
--
--compass_python_interpreter = '/usr/bin/env python2'
--if env.TargetOSIs('darwin'):
--    compass_python_interpreter = '/usr/bin/env python'
--
--compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
--                                  SUBST_DICT=[
--                                      ('@compass_type@', compass_type),
--                                      ('@python_interpreter@', compass_python_interpreter),
--                                  ])
--distBinaries.append(compass_installer)
--
--if not hygienic:
--    compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
--else:
--    compass_script_installer = env.AutoInstall(
--        'bin',
--        source=[
--            compass_installer,
--        ],
--        INSTALL_ALIAS=[
--            'tools',
--        ],
--    )
--
--if env.TargetOSIs('posix'):
--    env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
--    env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
--
- # "dist" target is valid only when --use-new-tools is specified
- # Attempts to build release artifacts without tools must fail
- if has_option("use-new-tools"):
-@@ -857,7 +822,6 @@ if has_option("use-new-tools"):
-                 '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
-                 '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
-                 '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
--                '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
-                 '${TEMPFILE(SOURCES[1:])}'
-             ],
-         ),

[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/

[Conrad Kostecki]

commit:     c3207585e9853903dcd30537bf888356675c7609
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct 26 10:07:52 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 21:40:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3207585

dev-db/mongodb: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22708
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../mongodb/files/mongodb-4.4.1-no-compass.patch   | 56 ----------------------
 .../mongodb/files/mongodb-4.4.1-unwind-gcc10.patch | 12 -----
 2 files changed, 68 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-4.4.1-no-compass.patch b/dev-db/mongodb/files/mongodb-4.4.1-no-compass.patch
deleted file mode 100644
index 15a7f9534bc..00000000000
--- a/dev-db/mongodb/files/mongodb-4.4.1-no-compass.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index 8acf5469..737c31d4 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -834,43 +834,6 @@ for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
- for target in env["DIST_BINARIES"]:
-     installBinary(env, "db/modules/" + target)
- 
--compass_type = 'compass'
--
--compass_script = "install_compass.in"
--if env.TargetOSIs('windows'):
--    compass_script = "Install-Compass.ps1.in"
--
--compass_python_interpreter = '/usr/bin/env python2'
--if env.TargetOSIs('darwin'):
--    compass_python_interpreter = '/usr/bin/env python'
--
--compass_installer = env.Substfile(
--  target="$BUILD_DIR/mongo/installer/compass/" + compass_script[:-3],
--  source='installer/compass/' + compass_script,
--  SUBST_DICT=[
--    ('@compass_type@', compass_type),
--    ('@python_interpreter@', compass_python_interpreter),
--  ],
--)
--
--distBinaries.append(compass_installer)
--
--if not hygienic:
--    compass_script_installer = env.Install("$DESTDIR/bin", compass_installer)
--else:
--    compass_script_installer = env.AutoInstall(
--        target='$PREFIX_BINDIR',
--        source=[
--            compass_installer,
--        ],
--        AIB_COMPONENT='dist',
--        AIB_ROLE='runtime',
--    )
--
--if env.TargetOSIs('posix'):
--    env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
--    env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
--
- if not hygienic:
-     server_archive = env.Command(
-         target='#/${SERVER_ARCHIVE}',
-@@ -884,7 +847,6 @@ if not hygienic:
-                 '--transform $BUILD_DIR/mongo/stripped/db/modules/enterprise=$SERVER_DIST_BASENAME/bin',
-                 '--transform $BUILD_DIR/mongo/stripped=$SERVER_DIST_BASENAME/bin',
-                 '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
--                '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
-                 '${TEMPFILE(SOURCES[1:])}'
-             ],
-         ),

diff --git a/dev-db/mongodb/files/mongodb-4.4.1-unwind-gcc10.patch b/dev-db/mongodb/files/mongodb-4.4.1-unwind-gcc10.patch
deleted file mode 100644
index a80f7e6474f..00000000000
--- a/dev-db/mongodb/files/mongodb-4.4.1-unwind-gcc10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/third_party/unwind/SConscript b/src/third_party/unwind/SConscript
-index ed947c8e..7308956f 100644
---- a/src/third_party/unwind/SConscript
-+++ b/src/third_party/unwind/SConscript
-@@ -90,6 +90,7 @@ if env['TARGET_ARCH'] == 'aarch64':
- 
- env.Append(
-     CCFLAGS=[
-+        '-fcommon',
-         '-fexceptions',
-         '-Wno-unused-result',
-         '-Wno-unused-value',