mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-05 02:12:16 +00:00
9d4964c709
* add 'Upstream-Status: Pending' where it was missing and fix malformatted one in 1296.patch * fixes: ERROR: lib32-mongodb-4.4.24-r0 do_patch: QA Issue: Malformed Upstream-Status in patch meta-oe/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/1296.patch Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : Upstream-Status: submitted https://github.com/mongodb/mongo/pull/1296 [patch-status] ERROR: lib32-mongodb-4.4.24-r0 do_patch: QA Issue: Missing Upstream-Status in patch meta-oe/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch Please add according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status . [patch-status] ... Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
58 lines
2.3 KiB
Diff
58 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) ||
|
|
|
|
Upstream-Status: Submitted [https://github.com/mongodb/mongo/pull/1296]
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
|
|
---
|
|
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 455a1662a5..e8497bc0d1 100644
|
|
--- a/src/mongo/util/net/ssl_manager.cpp
|
|
+++ b/src/mongo/util/net/ssl_manager.cpp
|
|
@@ -810,7 +810,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};
|
|
@@ -827,7 +827,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);
|
|
|
|
@@ -889,7 +889,7 @@ StatusWith<DERInteger> readDERInt(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.24.0
|
|
|