diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,9 +1,9 @@ -libboost_filesystem.so.1.66.0 -libboost_iostreams.so.1.66.0 -libboost_program_options.so.1.66.0 -libboost_system.so.1.66.0 +libboost_filesystem.so.1.72.0 +libboost_iostreams.so.1.72.0 +libboost_program_options.so.1.72.0 +libboost_system.so.1.72.0 libc.so.6 -libcrypto.so.1.0.0 +libcrypto.so.1.1 libcurl.so.4 libdl.so.2 libgcc_s.so.1 @@ -15,8 +15,9 @@ librt.so.1 libsasl2.so.3 libsnappy.so.1 -libssl.so.1.0.0 +libssl.so.1.1 libstdc++.so.6 -libwiredtiger-3.2.1.so +libwiredtiger-3.3.0.so libyaml-cpp.so.0.6 libz.so.1 +libzstd.so.1 diff --git a/files/0000-link-against-system-wiredtiger.patch b/files/0000-link-against-system-wiredtiger.patch new file mode 100644 --- /dev/null +++ b/files/0000-link-against-system-wiredtiger.patch @@ -0,0 +1,44 @@ +--- a/src/mongo/rpc/SConscript ++++ b/src/mongo/rpc/SConscript +@@ -3,6 +3,7 @@ + Import("env") + Import("wiredtiger") + Import("get_option") ++Import("use_system_version_of_library") + + env = env.Clone() + +@@ -22,9 +23,15 @@ + ) + + protoEnv = env.Clone() ++wiredtigerLib = [] + if wiredtiger: + protoEnv.InjectThirdParty(libraries=['wiredtiger']) + ++ if not use_system_version_of_library('wiredtiger'): ++ wiredtigerLib = '$BUILD_DIR/third_party/wiredtiger/wiredtiger_checksum' ++ else: ++ wiredtigerLib = '$BUILD_DIR/third_party/shim_wiredtiger' ++ + protoEnv.Library( + target=[ + 'protocol', +@@ -42,7 +49,7 @@ + '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/db/bson/dotted_path_support', + '$BUILD_DIR/mongo/db/server_options_core', +- '$BUILD_DIR/third_party/wiredtiger/wiredtiger_checksum' if wiredtiger else [], ++ wiredtigerLib, + ], + ) + +@@ -148,7 +155,7 @@ + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/client/clientdriver_minimal', +- '$BUILD_DIR/third_party/wiredtiger/wiredtiger_checksum', ++ '$BUILD_DIR/third_party/wiredtiger/wiredtiger_checksum' if not use_system_version_of_library('wiredtiger') else '$BUILD_DIR/third_party/shim_wiredtiger', + 'rpc', + ], + ) diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : mongodb -version : 4.0.12 -release : 13 +version : 4.2.8 +release : 14 source : - - https://fastdl.mongodb.org/src/mongodb-src-r4.0.12.tar.gz : 2132def2478c7d45b028a9b79db346a19f9c56f456b52c0ff243982c89c20dc9 + - https://fastdl.mongodb.org/src/mongodb-src-r4.2.8.tar.gz : e8880277e3910afd82c71ed61861d518f2040cbc062e00a26d53a3224284db8f license : SSPL-1.0 component : database summary : A high-performance, open source, schema-free document-oriented database @@ -13,31 +13,42 @@ - pkgconfig(libpcap) - pkgconfig(libpcre) - pkgconfig(libsasl2) + - pkgconfig(libzstd) - pkgconfig(wiredtiger) - pkgconfig(yaml-cpp) - libboost-devel - python-cheetah + - python-psutil - python-requests - - python-setuptools - python-typing - scons - snappy-devel +setup : | + %patch -p1 < $pkgfiles/0000-link-against-system-wiredtiger.patch build : | + # --use-system-fmt The inclusion of these two in the build results in error because mongodb uses + # --use-system-icu specific versions of the APIs. + scons install \ + --disable-warnings-as-errors \ --prefix=$installdir/usr \ + --release \ + --use-sasl-client \ --use-system-boost \ --use-system-pcre \ --use-system-snappy \ --use-system-wiredtiger \ --use-system-yaml \ --use-system-zlib \ - --use-sasl-client \ - --ssl \ - --disable-warnings-as-errors \ + --use-system-zstd \ %JOBS% install : | - install -Dm 00644 $pkgfiles/mongodb.service $installdir/%libdir%/systemd/system/mongodb.service - install -Dm 00644 $pkgfiles/mongodb.sysusers $installdir/%libdir%/sysusers.d/mongodb.conf - install -Dm 00644 $pkgfiles/mongodb.tmpfiles $installdir/%libdir%/tmpfiles.d/mongodb.conf - install -Dm 00644 $pkgfiles/mongodb.conf $installdir/usr/share/defaults/mongodb/mongodb.conf - install -Dm 00755 $pkgfiles/mongodb.sh $installdir/usr/share/mongodb/mongodb.sh + install -dm00755 $installdir/usr/share/man/{man1,man5} + install -Dm00644 $pkgfiles/mongodb.service $installdir/%libdir%/systemd/system/mongodb.service + install -Dm00644 $pkgfiles/mongodb.sysusers $installdir/%libdir%/sysusers.d/mongodb.conf + install -Dm00644 $pkgfiles/mongodb.tmpfiles $installdir/%libdir%/tmpfiles.d/mongodb.conf + install -Dm00644 $pkgfiles/mongodb.conf $installdir/usr/share/defaults/mongodb/mongodb.conf + install -Dm00755 $pkgfiles/mongodb.sh $installdir/usr/share/mongodb/mongodb.sh + install -Dm00644 debian/{mongo.1,mongod.1,mongos.1} $installdir/usr/share/man/man1 + install -Dm00644 debian/mongodb-parameters.5 $installdir/usr/share/man/man5 + rm $installdir/usr/bin/install_compass diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,10 +2,10 @@ mongodb - Pierre-Yves - pyu@riseup.net + Martin Reboredo + gc1000ll@gmail.com - SSPL + SSPL-1.0 database A high-performance, open source, schema-free document-oriented database MongoDB is a high-performance, open source, schema-free document-oriented database @@ -19,7 +19,6 @@ database - /usr/bin/install_compass /usr/bin/mongo /usr/bin/mongod /usr/bin/mongos @@ -27,16 +26,20 @@ /usr/lib64/sysusers.d/mongodb.conf /usr/lib64/tmpfiles.d/mongodb.conf /usr/share/defaults/mongodb/mongodb.conf + /usr/share/man/man1/mongo.1 + /usr/share/man/man1/mongod.1 + /usr/share/man/man1/mongos.1 + /usr/share/man/man5/mongodb-parameters.5 /usr/share/mongodb/mongodb.sh - - 2019-09-23 - 4.0.12 + + 2020-06-21 + 4.2.8 Packaging update - Pierre-Yves - pyu@riseup.net + Martin Reboredo + gc1000ll@gmail.com \ No newline at end of file