From 8e68eba50696e940fd3060e0dd7f2922a72d6766 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 15 2016 08:25:25 +0000 Subject: import rh-mongodb32-mongodb-3.2.10-1.el7 --- diff --git a/.gitignore b/.gitignore index 0747243..72fd004 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mongodb-src-r3.2.6.tar.gz +SOURCES/mongodb-src-r3.2.10.tar.gz diff --git a/.rh-mongodb32-mongodb.metadata b/.rh-mongodb32-mongodb.metadata index 96f4e51..a5c1317 100644 --- a/.rh-mongodb32-mongodb.metadata +++ b/.rh-mongodb32-mongodb.metadata @@ -1 +1 @@ -9619cedfdc3219232639e519a9128cdf4fa7c40c SOURCES/mongodb-src-r3.2.6.tar.gz +1b60e390d7b89aa20f159114fb7c94ecaea132f6 SOURCES/mongodb-src-r3.2.10.tar.gz diff --git a/SOURCES/system-libs.patch b/SOURCES/system-libs.patch index c73984d..9e5dd15 100644 --- a/SOURCES/system-libs.patch +++ b/SOURCES/system-libs.patch @@ -1,8 +1,8 @@ diff --git a/SConstruct b/SConstruct -index a1b5e0e..3752443 100644 +index bdafd06..9350c29 100644 --- a/SConstruct +++ b/SConstruct -@@ -349,6 +349,11 @@ add_option('use-system-asio', +@@ -363,6 +363,11 @@ add_option('use-system-asio', nargs=0, ) @@ -14,7 +14,7 @@ index a1b5e0e..3752443 100644 add_option('use-system-intel_decimal128', help='use system version of intel decimal128', nargs=0, -@@ -2227,11 +2232,17 @@ def doConfigure(myenv): +@@ -2394,11 +2399,17 @@ def doConfigure(myenv): if use_system_version_of_library("intel_decimal128"): conf.FindSysLibDep("intel_decimal128", ["bid"]) @@ -33,11 +33,11 @@ index a1b5e0e..3752443 100644 CPPDEFINES=[ ("BOOST_THREAD_VERSION", "4"), diff --git a/src/mongo/executor/connection_pool_asio.h b/src/mongo/executor/connection_pool_asio.h -index 6700819..d00670b 100644 +index 2924331..54e5d53 100644 --- a/src/mongo/executor/connection_pool_asio.h +++ b/src/mongo/executor/connection_pool_asio.h @@ -35,6 +35,8 @@ - #include "mongo/executor/async_stream_interface.h" + #include "mongo/executor/network_interface_asio.h" #include "mongo/stdx/mutex.h" +#include @@ -46,10 +46,10 @@ index 6700819..d00670b 100644 namespace executor { namespace connection_pool_asio { diff --git a/src/third_party/SConscript b/src/third_party/SConscript -index 8301c8f..e5f0ef4 100644 +index 5ff1ace..dd3b73f 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript -@@ -36,13 +36,18 @@ if not use_system_version_of_library('zlib'): +@@ -41,13 +41,18 @@ if not use_system_version_of_library('zlib'): # TODO: figure out if we want to offer system versions of mozjs. Mozilla # hasn't offered a source tarball since 24, but in theory they could. # @@ -70,7 +70,7 @@ index 8301c8f..e5f0ef4 100644 if not use_system_version_of_library('stemmer'): thirdPartyIncludePathList.append( -@@ -193,13 +198,20 @@ zlibEnv.Library( +@@ -198,13 +203,20 @@ zlibEnv.Library( ]) if usemozjs: @@ -98,7 +98,7 @@ index 8301c8f..e5f0ef4 100644 mozjsEnv.Library( target="shim_mozjs", -@@ -311,10 +323,7 @@ if wiredtiger: +@@ -316,10 +328,7 @@ if wiredtiger: ]) if use_system_version_of_library("asio"): diff --git a/SPECS/mongodb.spec b/SPECS/mongodb.spec index a87cf5f..2fe14ab 100644 --- a/SPECS/mongodb.spec +++ b/SPECS/mongodb.spec @@ -30,8 +30,8 @@ %endif Name: %{?scl_prefix}mongodb -Version: 3.2.6 -Release: 2%{?dist} +Version: 3.2.10 +Release: 1%{?dist} Summary: High-performance, schema-free document-oriented database Group: Applications/Databases License: AGPLv3 and zlib and ASL 2.0 @@ -505,6 +505,14 @@ fi %changelog +* Wed Oct 19 2016 Marek Skalický - 3.2.10-1 +- Update to latest upstream minor version (3.2.10) + Resolves: RHBZ#1386229 + +* Fri Sep 16 2016 Marek Skalický - 3.2.9-1 +- Update to latest upstream minor version (3.2.9) + Resolves: RHBZ#1376475 + * Tue May 10 2016 Marek Skalicky - 3.2.6-2 - Disable executable stack (since MongoDB 3.2.5) Resolves: #1333660