community/mongodb: upgrade to 4.0.0

4 files changed, 38 insertions, 36 deletions

diff --git a/community/mongodb/APKBUILD b/community/mongodb/APKBUILD
index 24acb50fe8..8991064513 100644
--- a/community/mongodb/APKBUILD
+++ b/community/mongodb/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Marc Vertes <mvertes@free.fr>
 # Contributor: Filipp Andronov <filipp.andronov@gmail.com>
 pkgname=mongodb
-pkgver=3.6.5
+pkgver=4.0.0
 pkgrel=0
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 url='http://www.mongodb.org'
@@ -13,16 +13,16 @@ pkggroups="mongodb"
 depends=
 makedepends="scons py-setuptools py2-cheetah py2-typing py2-yaml paxmark
 	libressl-dev pcre-dev snappy-dev boost-dev asio-dev libpcap-dev
-	snowball-dev zlib-dev cyrus-sasl-dev yaml-cpp-dev"
+	snowball-dev zlib-dev cyrus-sasl-dev yaml-cpp-dev curl-dev"
 install="$pkgname.pre-install"
 source="http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz
 	fix-backtrace.patch
 	fix-default-stacksize.patch
 	fix-elf-native-class.patch
+	fix-libressl.patch
 	fix-processinfo_linux.patch
 	fix-resolv.patch
 	fix-strerror_r.patch
-	libressl.patch
 	wiredtiger.patch
 
 	mongodb.confd
@@ -84,14 +84,14 @@ package() {
 	install -Dm644 "$srcdir/mongos.confd" "$pkgdir/etc/conf.d/mongos"
 }
 
-sha512sums="6ecb3140ee4a7929fabe62d698f23e87cb5030cf31abefe7f82374f407fb87dc05f712089998f96bc40e23698836a86e7f3590892bde9d2d6f2c4bcc15cc3ebf  mongodb-src-r3.6.5.tar.gz
+sha512sums="11d00cdde606cfea268471cffccedb6d003e421aeffda2303aff4d4126c386aaec50a1de733d7a1d5fb6605403cf9f2218dae50374c7b5e8625fa80317804589  mongodb-src-r4.0.0.tar.gz
 05c4331d028eb396e6cf52d96cdaa2af7199a03522e1a8211df2d36cb053ec093a51e9abf83c4dc00c09a0b1fa119a79bcc719fbc81a48f50ca1527c26613cf0  fix-backtrace.patch
 1492137b0e3456d90a79617c1cd5ead5c71b1cfaae9ee41c75d56cd25f404ec73a690f95ce0d8c064c0a14206daca8070aa769b7cdfa904a338a425b52c293fa  fix-default-stacksize.patch
 56db8f43afc94713ac65b174189e2dd903b5e1eff0b65f1bdac159e52ad4de6606c449865d73bd47bffad6a8fc339777e2b11395596e9a476867d94a219c7925  fix-elf-native-class.patch
-026d20fa1a0f1e27150b833664300250386d7e0d73c0778f81f70242e93e8a16e5607716693bbcdd1efb328fa84c7284e2c6c7e1ac92259b97a9d402975cf709  fix-processinfo_linux.patch
+9ade791a577a6291ea5031056f9aa1470fafb865e33f988e2d79e1493756a493f0d181f66e410d4b6763ca48909ff837f7b13bf887cc85889b14ce8e553f1d5d  fix-libressl.patch
+4b72d659eb6cf8c5b303bd91fe28d4cebeefda97be5b93df12a3e265283b4057ff299e14763a0b9f4b6eaae8da1725af35038b3aba578c66dd950f1703c28d42  fix-processinfo_linux.patch
 aac12cffc452f1dc365c65944a015476c2011b0975144879d28938c690fe6e77b6bd672e040b4c04c02cb002224e24d6f13adb083324f424ef4cdb79a3a71f6b  fix-resolv.patch
-94078abfa74583afef6b5c1f0b334b257cfe87b0db7c13309a9c63d915913d5237c776dbb52f6a23e9409ec390d29e2f7225e9b8c8c5efcbc35b015c613f600c  fix-strerror_r.patch
-45721f490f55f015ebdef497530048a36e78d64692be4a06c7f76963b60877e920350b6845385c33a7f6c6d428f60a1c73b083626d4f9567fa19f57ea32f6a3c  libressl.patch
+92cf2c55c68b975408ed2f7fde65da6b238b617dfaa0737a1c51ce19344dba11dd96c0a99f7671c1b7464f5114b3e820a32a25b1600d1c8217262b60fe0364ea  fix-strerror_r.patch
 ecbe6cb579b33dd4888096712f150772db06fd38219ca2a7679b1dc1ee73b0c3f5ee498af12ecd0265b5231a9fe6b7c12b2c1d606ed04caa6aa00c3ad3fe925a  wiredtiger.patch
 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3  mongodb.confd
 74009794d566dd9d70ec93ffd95c830ee4696165574ecf87398165637fb40799b38d182ef54c50fd0772d589be94ade7f7a49247f3d31c1f012cb4e44cc9f5df  mongodb.initd
diff --git a/community/mongodb/libressl.patch b/community/mongodb/fix-libressl.patch
index e6cecebb45..983238b856 100644
--- a/community/mongodb/libressl.patch
+++ b/community/mongodb/fix-libressl.patch
@@ -1,5 +1,16 @@
---- ./src/mongo/crypto/sha_block_openssl.cpp.orig
-+++ ./src/mongo/crypto/sha_block_openssl.cpp
+--- mongodb-src-r4.0.0/src/mongo/util/net/ssl_manager_openssl.cpp.orig
++++ mongodb-src-r4.0.0/src/mongo/util/net/ssl_manager_openssl.cpp
+@@ -169,7 +169,7 @@
+ #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
+ // clang-format on
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ // Copies of OpenSSL after 1.1.0 define new functions for interaction with
+ // X509 structure. We must polyfill used definitions to interact with older
+ // OpenSSL versions.
+--- mongodb-src-r4.0.0/src/mongo/crypto/sha_block_openssl.cpp.orig
++++ mongodb-src-r4.0.0/src/mongo/crypto/sha_block_openssl.cpp
 @@ -44,7 +44,7 @@
  #include <openssl/hmac.h>
  #include <openssl/sha.h>
@@ -9,14 +20,3 @@
  namespace {
  // Copies of OpenSSL after 1.1.0 define new EVP digest routines. We must
  // polyfill used definitions to interact with older OpenSSL versions.
---- ./src/mongo/util/net/ssl_manager.cpp.orig
-+++ ./src/mongo/util/net/ssl_manager.cpp
-@@ -237,7 +237,7 @@
- #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
- // clang-format on
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- // Copies of OpenSSL after 1.1.0 define new functions for interaction with
- // X509 structure. We must polyfill used definitions to interact with older
- // OpenSSL versions.
diff --git a/community/mongodb/fix-processinfo_linux.patch b/community/mongodb/fix-processinfo_linux.patch
index 0c07fa4c81..a5411371a3 100644
--- a/community/mongodb/fix-processinfo_linux.patch
+++ b/community/mongodb/fix-processinfo_linux.patch
@@ -1,30 +1,32 @@
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -40,11 +40,11 @@
- #include <sys/mman.h>
+--- mongodb-src-r4.0.0/src/mongo/util/processinfo_linux.cpp.orig
++++ mongodb-src-r4.0.0/src/mongo/util/processinfo_linux.cpp
+@@ -42,13 +42,7 @@
+ #include <sys/time.h>
  #include <sys/utsname.h>
  #include <unistd.h>
--#ifdef __UCLIBC__
-+//#ifdef __UCLIBC__
+-#ifdef __BIONIC__
+-#include <android/api-level.h>
+-#elif __UCLIBC__
  #include <features.h>
 -#else
 -#include <gnu/libc-version.h>
 -#endif
-+//#else
-+//#include <gnu/libc-version.h>
-+//#endif
  
  #include <boost/filesystem.hpp>
  #include <boost/none.hpp>
-@@ -487,13 +487,9 @@
+@@ -495,17 +489,9 @@
  
      BSONObjBuilder bExtra;
      bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version"));
--#ifdef __UCLIBC__
+-#ifdef __BIONIC__
      stringstream ss;
--    ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__;
-+    ss << "musl-1.1.16";
+-    ss << "bionic (android api " << __ANDROID_API__ << ")";
++    ss << "musl-1.1.19";
      bExtra.append("libcVersion", ss.str());
+-#elif __UCLIBC__
+-    stringstream ss;
+-    ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__;
+-    bExtra.append("libcVersion", ss.str());
 -#else
 -    bExtra.append("libcVersion", gnu_get_libc_version());
 -#endif
diff --git a/community/mongodb/fix-strerror_r.patch b/community/mongodb/fix-strerror_r.patch
index 3dd19b3821..172c7fefac 100644
--- a/community/mongodb/fix-strerror_r.patch
+++ b/community/mongodb/fix-strerror_r.patch
@@ -1,10 +1,10 @@
---- mongodb-src-r3.6.1/src/mongo/util/errno_util.cpp.orig
-+++ mongodb-src-r3.6.1/src/mongo/util/errno_util.cpp
+--- mongodb-src-r4.0.0/src/mongo/util/errno_util.cpp.orig
++++ mongodb-src-r4.0.0/src/mongo/util/errno_util.cpp
 @@ -58,9 +58,7 @@
      char buf[kBuflen];
      char* msg{nullptr};
  
--#if defined(__GNUC__) && defined(_GNU_SOURCE)
+-#if defined(__GNUC__) && defined(_GNU_SOURCE) && (__ANDROID_API__ > 22)
 -    msg = strerror_r(errNumber, buf, kBuflen);
 -#elif defined(_WIN32)
 +#if defined(_WIN32)