c5b7678b4a
Here is the list of the changes compared to the removed mongodb 3.3.4 version: - Remove patch (not applicable anymore) - Add patch (sent upstream) to fix openssl build with gcc 7 and -fpermissive - Remove 32 bits x86 platforms, removed since version 3.4: https://docs.mongodb.com/manual/installation/#supported-platforms - Change license: since October 2018, license is SSPL: - https://www.mongodb.com/community/licensing - https://jira.mongodb.org/browse/SERVER-38767 - gcc must be at least 5.3 so add a dependency on gcc >= 6 - Add a dependency on host-python-xxx modules: https://github.com/mongodb/mongo/blob/r4.0.6/docs/building.md - Use system versions of boost, pcre, snappy, sqlite, yaml-cpp and zlib instead of embedded mongodb ones - Add hash for license files Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Tested-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From 362be06fc16a5ad0f9e9aa90cc763c5242e8e35c Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 9 Feb 2019 12:41:45 +0100
|
|
Subject: [PATCH] ssl_manager.cpp: fix build with gcc 7 and -fpermissive
|
|
|
|
Change prototype of DERToken::parse function from
|
|
parse(ConstDataRange cdr, size_t* outLength);
|
|
to parse(ConstDataRange cdr, uint64_t* outLength);
|
|
|
|
Otherwise, we got the following error:
|
|
|
|
src/mongo/util/net/ssl_manager.cpp: In static member function 'static mongo::StatusWith<mongo::{anonymous}::DERToken> mongo::{anonymous}::DERToken::parse(mongo::ConstDataRange, size_t*)':
|
|
src/mongo/util/net/ssl_manager.cpp:575:79: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive]
|
|
if (mongoUnsignedAddOverflow64(tagAndLengthByteCount, derLength, outLength) ||
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/mongodb/mongo/pull/1296]
|
|
---
|
|
src/mongo/util/net/ssl_manager.cpp | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
|
|
index b93ebe84a4..3511eb5d99 100644
|
|
--- a/src/mongo/util/net/ssl_manager.cpp
|
|
+++ b/src/mongo/util/net/ssl_manager.cpp
|
|
@@ -782,7 +782,7 @@ public:
|
|
*
|
|
* Returns a DERToken which consists of the (tag, length, value) tuple.
|
|
*/
|
|
- static StatusWith<DERToken> parse(ConstDataRange cdr, size_t* outLength);
|
|
+ static StatusWith<DERToken> parse(ConstDataRange cdr, uint64_t* outLength);
|
|
|
|
private:
|
|
DERType _type{DERType::EndOfContent};
|
|
@@ -799,7 +799,7 @@ struct DataType::Handler<DERToken> {
|
|
size_t length,
|
|
size_t* advanced,
|
|
std::ptrdiff_t debug_offset) {
|
|
- size_t outLength;
|
|
+ uint64_t outLength;
|
|
|
|
auto swPair = DERToken::parse(ConstDataRange(ptr, length), &outLength);
|
|
|
|
@@ -844,7 +844,7 @@ StatusWith<std::string> readDERString(ConstDataRangeCursor& cdc) {
|
|
}
|
|
|
|
|
|
-StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, size_t* outLength) {
|
|
+StatusWith<DERToken> DERToken::parse(ConstDataRange cdr, uint64_t* outLength) {
|
|
const size_t kTagLength = 1;
|
|
const size_t kTagLengthAndInitialLengthByteLength = kTagLength + 1;
|
|
|
|
--
|
|
2.14.1
|
|
|