01/02: Revert "Revert "gnu: mongodb: Update to 3.4.24 [security fixes].""

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 2f9132e2e0b1e01398a01a32972e87f45ec2f7a6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Mar 11 23:23:00 2021 +0200

    Revert "Revert "gnu: mongodb: Update to 3.4.24 [security fixes].""
    
    This reverts commit feff80cec3c97a3df2c20d300be12d67f79d4f22.
    
    I was mistaken, there are still branches of mongodb which are still
    licensed under the AGPL3
---
 gnu/local.mk                                       |  1 -
 gnu/packages/databases.scm                         | 13 ++---
 ...ngodb-support-unknown-linux-distributions.patch | 55 ----------------------
 3 files changed, 5 insertions(+), 64 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index a39c5d8..c263792 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1396,7 +1396,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/mpc123-initialize-ao.patch              \
   %D%/packages/patches/module-init-tools-moduledir.patch       \
   %D%/packages/patches/monero-use-system-miniupnpc.patch                       
\
-  %D%/packages/patches/mongodb-support-unknown-linux-distributions.patch       
\
   %D%/packages/patches/mono-mdoc-timestamping.patch            \
   %D%/packages/patches/mozjs17-aarch64-support.patch           \
   %D%/packages/patches/mozjs24-aarch64-support.patch           \
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 29270ce..aa64507 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -667,27 +667,24 @@ replacement for the code@{python-memcached} library.")
 (define-public mongodb
   (package
     (name "mongodb")
-    (version "3.4.10")
+    (version "3.4.24")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mongodb/mongo/archive/r";
                                   version ".tar.gz"))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0676lvkljj7a5hdhv78dbykqnqrj9lbn9799mi84b8vbnzsq961r"))
+               (base32 "0y1669sqj8wyf0y0njhxs4qhn1qzjhrs2h2qllya5samxrlrjhkg"))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   (for-each (lambda (dir)
                               (delete-file-recursively
                                 (string-append "src/third_party/" dir)))
-                            '("pcre-8.41" "scons-2.5.0" "snappy-1.1.3"
+                            '("pcre-8.42" "scons-2.5.0" "snappy-1.1.3"
                               "valgrind-3.11.0" "wiredtiger"
-                              "yaml-cpp-0.5.3" "zlib-1.2.8"))
-                  #t))
-              (patches
-               (list
-                (search-patch 
"mongodb-support-unknown-linux-distributions.patch")))))
+                              "yaml-cpp-0.6.2" "zlib-1.2.11"))
+                  #t))))
     (build-system scons-build-system)
     (inputs
      `(("openssl" ,openssl-1.0)
diff --git 
a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch 
b/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch
deleted file mode 100644
index 6057ebe..0000000
--- a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e724bb7018a482640c4f194f88b554af2c59d76e Mon Sep 17 00:00:00 2001
-From: Mark Benvenuto <mark.benvenuto@mongodb.com>
-Date: Wed, 20 Sep 2017 11:50:02 -0400
-Subject: [PATCH] SERVER-30857 Support unknown Linux distributions
-
----
- src/mongo/rpc/metadata/client_metadata.cpp | 6 ------
- src/mongo/util/processinfo_linux.cpp       | 9 ++++++---
- 2 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/src/mongo/rpc/metadata/client_metadata.cpp 
b/src/mongo/rpc/metadata/client_metadata.cpp
-index 845a315dd74..a959a4e31e9 100644
---- a/src/mongo/rpc/metadata/client_metadata.cpp
-+++ b/src/mongo/rpc/metadata/client_metadata.cpp
-@@ -302,9 +302,6 @@ void ClientMetadata::serializePrivate(StringData 
driverName,
-                                       StringData osArchitecture,
-                                       StringData osVersion,
-                                       BSONObjBuilder* builder) {
--    invariant(!driverName.empty() && !driverVersion.empty() && 
!osType.empty() && !osName.empty() &&
--              !osArchitecture.empty() && !osVersion.empty());
--
-     BSONObjBuilder 
metaObjBuilder(builder->subobjStart(kMetadataDocumentName));
- 
-     {
-@@ -347,9 +344,6 @@ Status ClientMetadata::serializePrivate(StringData 
driverName,
-                                         StringData osVersion,
-                                         StringData appName,
-                                         BSONObjBuilder* builder) {
--    invariant(!driverName.empty() && !driverVersion.empty() && 
!osType.empty() && !osName.empty() &&
--              !osArchitecture.empty() && !osVersion.empty());
--
-     if (appName.size() > kMaxApplicationNameByteLength) {
-         return Status(ErrorCodes::ClientMetadataAppNameTooLarge,
-                       str::stream() << "The '" << kApplication << "." << kName
-diff --git a/src/mongo/util/processinfo_linux.cpp 
b/src/mongo/util/processinfo_linux.cpp
-index c3debf377bd..c2813b026b0 100644
---- a/src/mongo/util/processinfo_linux.cpp
-+++ b/src/mongo/util/processinfo_linux.cpp
-@@ -376,10 +376,13 @@ class LinuxSysHelper {
-             if ((nl = name.find('\n', nl)) != string::npos)
-                 // stop at first newline
-                 name.erase(nl);
--            // no standard format for name and version.  use kernel version
--            version = "Kernel ";
--            version += 
LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease");
-+        } else {
-+            name = "unknown";
-         }
-+
-+        // There is no standard format for name and version so use the kernel 
version.
-+        version = "Kernel ";
-+        version += 
LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease");
-     }
- 
-     /**