mongodb: update to 3.4.17
This commit is contained in:
John Zimmermann
Helmut Pozimski
parent
681c6578b6
commit
ef631e72df
4 changed files with 5 additions and 145 deletions
|
|
@ -1,11 +0,0 @@
|
|||
diff -uprb mongodb-src-r3.2.0.orig/SConstruct mongodb-src-r3.2.0/SConstruct
|
||||
--- SConstruct 2015-12-02 21:01:34.000000000 +0200
|
||||
+++ SConstruct 2015-12-22 11:18:23.613216445 +0200
|
||||
@@ -2245,6 +2245,7 @@ def doConfigure(myenv):
|
||||
# permit more than four parameters.
|
||||
"BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD",
|
||||
"BOOST_SYSTEM_NO_DEPRECATED",
|
||||
+ "BOOST_OPTIONAL_USE_SINGLETON_DEFINITION_OF_NONE",
|
||||
]
|
||||
)
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_mongo_db_fts_unicode_string.cpp,v 1.1 2016/10/10 13:15:40 ryoon Exp $
|
||||
|
||||
* Fix build with boost 1.62.0
|
||||
|
||||
--- src/mongo/db/fts/unicode/string.cpp.orig 2016-09-26 12:10:04.000000000 +0000
|
||||
+++ 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
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
--- src/mongo/shell/bench.cpp.orig 2017-07-06 09:07:04.718310572 +0000
|
||||
+++ src/mongo/shell/bench.cpp 2017-07-06 09:12:39.849290597 +0000
|
||||
@@ -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);
|
||||
}
|
||||
@@ -918,7 +918,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());
|
||||
}
|
||||
@@ -984,7 +984,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());
|
||||
}
|
||||
@@ -1031,7 +1031,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());
|
||||
}
|
||||
@@ -1133,7 +1133,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);
|
||||
}
|
||||
@@ -1165,7 +1165,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,
|
||||
@@ -1201,7 +1201,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(
|
||||
--- src/mongo/db/dbwebserver.cpp.orig 2017-06-27 19:02:43.000000000 +0000
|
||||
+++ src/mongo/db/dbwebserver.cpp 2017-07-06 09:27:54.070236105 +0000
|
||||
@@ -65,6 +65,7 @@
|
||||
namespace mongo {
|
||||
|
||||
using std::map;
|
||||
+using std::string;
|
||||
using std::stringstream;
|
||||
using std::vector;
|
||||
|
||||
--- src/mongo/db/matcher/expression_leaf.cpp.orig 2017-06-27 19:02:43.000000000 +0000
|
||||
+++ src/mongo/db/matcher/expression_leaf.cpp 2017-07-06 09:31:40.097222633 +0000
|
||||
@@ -202,7 +202,7 @@
|
||||
}
|
||||
|
||||
void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const {
|
||||
- string opString = "";
|
||||
+ std::string opString = "";
|
||||
switch (matchType()) {
|
||||
case LT:
|
||||
opString = "$lt";
|
||||
@@ -884,7 +884,7 @@
|
||||
}
|
||||
|
||||
void BitTestMatchExpression::serialize(BSONObjBuilder* out) const {
|
||||
- string opString = "";
|
||||
+ std::string opString = "";
|
||||
|
||||
switch (matchType()) {
|
||||
case BITS_ALL_SET:
|
||||
--- src/mongo/db/repl/master_slave.cpp.orig 2017-06-27 19:02:43.000000000 +0000
|
||||
+++ src/mongo/db/repl/master_slave.cpp 2017-07-06 09:36:53.549203950 +0000
|
||||
@@ -78,6 +78,7 @@
|
||||
using std::max;
|
||||
using std::min;
|
||||
using std::set;
|
||||
+using std::string;
|
||||
using std::stringstream;
|
||||
using std::unique_ptr;
|
||||
using std::vector;
|
||||
--- src/mongo/util/net/miniwebserver.cpp.orig 2017-06-27 19:02:43.000000000 +0000
|
||||
+++ src/mongo/util/net/miniwebserver.cpp 2017-07-06 09:42:57.518182256 +0000
|
||||
@@ -45,6 +45,7 @@
|
||||
namespace mongo {
|
||||
|
||||
using std::shared_ptr;
|
||||
+using std::string;
|
||||
using std::stringstream;
|
||||
using std::vector;
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'mongodb'
|
||||
pkgname=mongodb
|
||||
version=3.4.9
|
||||
revision=5
|
||||
version=3.4.17
|
||||
revision=1
|
||||
wrksrc="mongodb-src-r${version}"
|
||||
hostmakedepends="scons"
|
||||
makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel
|
||||
|
|
@ -13,9 +13,9 @@ mongodb_homedir="/var/lib/mongodb"
|
|||
short_desc="High-performance, schema-free document-oriented database"
|
||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||
homepage="http://www.mongodb.org"
|
||||
license="AGPL-3"
|
||||
license="AGPL-3.0-only"
|
||||
distfiles="https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"
|
||||
checksum=2fd0f47a5f9175e71d3d381e81a1b6a2500c9c414dd6ae0940ad6194a0e85549
|
||||
checksum=6044e4c811a87bffd512a96fd2a4e4af9513af12f407bf7cd7c6281ccfb46484
|
||||
only_for_archs="aarch64 x86_64 aarch64-musl x86_64-musl"
|
||||
|
||||
make_dirs="
|
||||
|
|
@ -77,4 +77,5 @@ do_install() {
|
|||
vinstall ${FILESDIR}/mongodb.conf 644 etc/mongodb
|
||||
|
||||
vsv mongodb
|
||||
vlicense GNU-AGPL-3.0.txt
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue