Commit 6e2841fb authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated mongodb to r4.4.6

parent b17e7ca8
...@@ -31,22 +31,20 @@ all: mongodb-service ...@@ -31,22 +31,20 @@ all: mongodb-service
mkdir -p /root/.cargo mkdir -p /root/.cargo
mount --bind .cargo /root/.cargo mount --bind .cargo /root/.cargo
tar xf mongodb-src-r4.2.8.tar.gz tar xf mongodb-src-r4.4.6.tar.gz
patch -Np1 -d mongodb-src-r4.2.8 < mongodb-src-r4.2.8-no_debug.patch patch -Np1 -d mongodb-src-r4.4.6 < mongodb-src-r4.4.6-no_debug.patch
patch -Np1 -d mongodb-src-r4.2.8 < mongodb-src-r4.2.8-cstdlib.patch
patch -Np1 -d mongodb-src-r4.2.8 < mongodb-src-r4.2.8-pin_cryptography.patch
mkdir mongo-home mkdir mongo-home
cd mongodb-src-r4.2.8 && HOME=$(CURDIR)/mongo-home pip3 install -r buildscripts/requirements.txt cd mongodb-src-r4.4.6 && HOME=$(CURDIR)/mongo-home pip3 install -r buildscripts/requirements.txt
cd mongodb-src-r4.2.8 && scons all --release --opt=on --disable-warnings-as-errors MONGO_VERSION=4.2.8 -j 1 cd mongodb-src-r4.4.6 && scons all --release --opt=on --disable-warnings-as-errors MONGO_VERSION=4.4.6 -j 1
cd mongodb-src-r4.2.8 && scons --prefix=/usr install --disable-warnings-as-errors MONGO_VERSION=4.2.8 cd mongodb-src-r4.4.6 && scons --prefix=/usr install --disable-warnings-as-errors MONGO_VERSION=4.4.6
cd mongodb-src-r4.2.8 && HOME=$(CURDIR)/mongo-home pip3 uninstall -y -r buildscripts/requirements.txt cd mongodb-src-r4.4.6 && HOME=$(CURDIR)/mongo-home pip3 uninstall -y -r buildscripts/requirements.txt
@echo "$$MONGODB_SERVICE" > /lib/systemd/system/mongodb.service @echo "$$MONGODB_SERVICE" > /lib/systemd/system/mongodb.service
systemctl enable mongodb.service systemctl enable mongodb.service
install -v -Dm755 mongod.conf /etc install -v -Dm755 mongod.conf /etc
install -v -m755 -o mongodb -g mongodb -d /var/lib/mongodb install -v -m755 -o mongodb -g mongodb -d /var/lib/mongodb
@echo "d /run/mongodb 755 mongodb mongodb -" > /usr/lib/tmpfiles.d/mongodb.conf @echo "d /run/mongodb 755 mongodb mongodb -" > /usr/lib/tmpfiles.d/mongodb.conf
rm -rf mongo-home rm -rf mongo-home
rm -rf mongodb-src-r4.2.8 rm -rf mongodb-src-r4.4.6
umount /root/.cargo umount /root/.cargo
rm -rf /root/.cargo rm -rf /root/.cargo
......
diff -uNr mongodb-src-r4.2.8/src/mongo/stdx/thread.h mongodb-src-r4.2.8-cstdlib/src/mongo/stdx/thread.h
--- mongodb-src-r4.2.8/src/mongo/stdx/thread.h 2020-06-09 11:21:32.000000000 +0930
+++ mongodb-src-r4.2.8-cstdlib/src/mongo/stdx/thread.h 2021-08-22 16:40:12.608816653 +0930
@@ -33,6 +33,7 @@
#include <csignal>
#include <cstddef>
#include <cstdint>
+#include <cstdlib>
#include <ctime>
#include <exception>
#include <thread>
diff -uNr mongodb-src-r4.2.8/etc/pip/components/external_auth.req mongodb-src-r4.2.8-pin_cryptography/etc/pip/components/external_auth.req
--- mongodb-src-r4.2.8/etc/pip/components/external_auth.req 2020-06-09 11:21:32.000000000 +0930
+++ mongodb-src-r4.2.8-pin_cryptography/etc/pip/components/external_auth.req 2022-11-06 09:59:33.273724687 +1030
@@ -1,6 +1,7 @@
# These are the dependencies of ldaptor
passlib == 1.7.1
pyOpenSSL == 19.0.0
+cryptography == 36.0.2
pyparsing == 2.4.0
service_identity == 18.1.0
twisted == 19.2.1
diff -uNr mongodb-src-r4.2.8/SConstruct mongodb-src-r4.2.8-no_debug/SConstruct diff -uNr mongodb-src-r4.4.6/SConstruct mongodb-src-r4.4.6-no_debug/SConstruct
--- mongodb-src-r4.2.8/SConstruct 2020-06-09 11:21:32.000000000 +0930 --- mongodb-src-r4.4.6/SConstruct 2021-05-03 17:11:41.000000000 +0930
+++ mongodb-src-r4.2.8-no_debug/SConstruct 2021-08-22 07:54:42.738092129 +0930 +++ mongodb-src-r4.4.6-no_debug/SConstruct 2024-03-22 19:43:39.536133532 +1030
@@ -1867,7 +1867,6 @@ @@ -2092,7 +2092,6 @@
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
env.Append( CCFLAGS=["-fno-omit-frame-pointer", env.Append( CCFLAGS=["-fno-omit-frame-pointer",
"-fno-strict-aliasing", "-fno-strict-aliasing",
"-fasynchronous-unwind-tables",
- "-ggdb" if not env.TargetOSIs('emscripten') else "-g", - "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
"-pthread", "-pthread",
"-Wall", "-Wall",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment