[arch-commits] Commit in mongodb/trunk (3 files)

[Bartłomiej Piotrowski]

    Date: Friday, October 21, 2016 @ 21:21:26
  Author: bpiotrowski
Revision: 192891

upgpkg: mongodb 3.2.10-2

rebuild against boost 1.62.0

Added:
  mongodb/trunk/mongodb-3.2.10-boost-1.62.0.patch
  mongodb/trunk/mongodb-3.2.10-network_interface_asio_integration_test.patch
Modified:
  mongodb/trunk/PKGBUILD

--------------------------------------------------------------+
 PKGBUILD                                                     |   12 +++--
 mongodb-3.2.10-boost-1.62.0.patch                            |   15 ++++++
 mongodb-3.2.10-network_interface_asio_integration_test.patch |   23 ++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-21 20:08:15 UTC (rev 192890)
+++ PKGBUILD	2016-10-21 21:21:26 UTC (rev 192891)
@@ -7,7 +7,7 @@
 
 pkgname=mongodb
 pkgver=3.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -22,11 +22,15 @@
 install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'boost160.patch'
-        'mongodb.conf' 'mongodb.service')
+        'mongodb.conf' 'mongodb.service'
+        'mongodb-3.2.10-boost-1.62.0.patch'
+        'mongodb-3.2.10-network_interface_asio_integration_test.patch')
 sha512sums=('b9592c7cb0184ae10e1e7092b3fa0fc52b10acef1d7beffb2c2409867e237042d7765cc7191972ded10c278756cde1ff7b23b57fb7efd8363e18f2ce994985e9'
             '385c82875174caae433a3b381eb10f98a6fed0c8943788ddefff1de80a898e480bdbbf094a7783285cf2ae11ce3fc6878e57d58183d05be2f0837b206aaa4da6'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
-            '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9')
+            '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
+            'd6f014d2778decde268b9e856d812bc61f7c45986aad751e44fdece39aa8a96505b77e0b917ea38880501497e01d4b051a6f3205c82af653425b5247cd813417'
+            '4d044d5bae420c14cc4530728236486a2ea9abe0224ed4f114d5f9e23637bfdbdd0bdfe14ecc6c1f9d6e6a13f278c6f212034077d88aaac60d8220e6c738e209')
 
 _scons_args=(
   --use-system-boost
@@ -52,6 +56,8 @@
 prepare() {
   cd mongodb-src-r${pkgver}
   patch -Np1 -i ../boost160.patch
+  patch -Np1 -i ../mongodb-3.2.10-boost-1.62.0.patch
+  patch -Np1 -i ../mongodb-3.2.10-network_interface_asio_integration_test.patch
 
   sed -e 's|-std=c++11|-std=gnu++11|g' -i SConstruct  # tests use hex floats, not supported in plain C++
 }

Added: mongodb-3.2.10-boost-1.62.0.patch
===================================================================
--- mongodb-3.2.10-boost-1.62.0.patch	                        (rev 0)
+++ mongodb-3.2.10-boost-1.62.0.patch	2016-10-21 21:21:26 UTC (rev 192891)
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mongo_db_fts_unicode_string.cpp,v 1.1 2016/10/10 13:15:40 ryoon Exp $
+
+* Fix build with boost 1.62.0
+
+--- a/src/mongo/db/fts/unicode/string.cpp.orig	2016-09-26 12:10:04.000000000 +0000
++++ b/src/mongo/db/fts/unicode/string.cpp
+@@ -274,7 +274,7 @@ bool String::substrMatch(const std::stri
+ 
+     // Case sensitive and diacritic sensitive.
+     return boost::algorithm::boyer_moore_search(
+-               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != haystack.end();
++               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != std::make_pair(haystack.end(), haystack.end());
+ }
+ 
+ }  // namespace unicode

Added: mongodb-3.2.10-network_interface_asio_integration_test.patch
===================================================================
--- mongodb-3.2.10-network_interface_asio_integration_test.patch	                        (rev 0)
+++ mongodb-3.2.10-network_interface_asio_integration_test.patch	2016-10-21 21:21:26 UTC (rev 192891)
@@ -0,0 +1,23 @@
+From ea20ce71ee1151abc5bbe5ea60713a86d34a751a Mon Sep 17 00:00:00 2001
+From: Waley Chen <waleycz at gmail.com>
+Date: Fri, 6 May 2016 17:53:10 -0400
+Subject: [PATCH] SERVER-23951 network_interface_asio_integration_test //
+ ExceededTimeLimit
+
+---
+ src/mongo/executor/network_interface_asio_integration_test.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mongo/executor/network_interface_asio_integration_test.cpp b/src/mongo/executor/network_interface_asio_integration_test.cpp
+index cb85f27..617ae36 100644
+--- a/src/mongo/executor/network_interface_asio_integration_test.cpp
++++ b/src/mongo/executor/network_interface_asio_integration_test.cpp
+@@ -170,7 +170,7 @@ class StressTestOp {
+     using Fixture = NetworkInterfaceASIOIntegrationTest;
+     using Pool = ThreadPoolInterface;
+ 
+-    Deferred<Status> run(Fixture* fixture, Pool* pool, Milliseconds timeout = Milliseconds(5000)) {
++    Deferred<Status> run(Fixture* fixture, Pool* pool, Milliseconds timeout = Milliseconds(60000)) {
+         auto cb = makeCallbackHandle();
+         auto self = *this;
+         auto out =