summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Le Bouter <lle-bout@zaclys.net>2021-03-10 13:01:58 +0100
committerLéo Le Bouter <lle-bout@zaclys.net>2021-03-10 13:03:12 +0100
commite5f89570c1d72c4b674fad6b6ad5591ead02d419 (patch)
treef19610cfcdefa58f9d4de122c54663f9dd69815b
parentfdf82830d417aeb481f1503ab4dd7e7a31f1772d (diff)
gnu: mongodb: Update to 3.4.24 [security fixes].
* gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Ditto. * gnu/packages/databases.scm (mongodb): Update to 3.4.24. [source]: Drop patch. Update third_party libs folder names.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/databases.scm13
-rw-r--r--gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch55
3 files changed, 5 insertions, 64 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 667ec79048..39037d3499 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1372,7 +1372,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 8bb248fa1d..03d01b582a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -664,27 +664,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 6057ebeb08..0000000000
--- 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");
- }
-
- /**