Update databases/mongodb to 3.0.6.

- Improvements to WiredTiger Stability.
- Fixed issue with the interaction between SSL and Auditing.
- Fixed issue with aggregation $sort on sharded systems.

5 files changed, 35 insertions, 35 deletions

diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index 32dc69bf1e9..f8be6fa6458 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/08/11 14:29:45 fhajny Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/26 05:03:00 fhajny Exp $
 
-DISTNAME=	mongodb-src-r3.0.5
+DISTNAME=	mongodb-src-r3.0.6
 PKGNAME=	${DISTNAME:S/src-r//:S/-rc/rc/}
 CATEGORIES=	databases
 MASTER_SITES=	http://fastdl.mongodb.org/src/
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index 045e5040a5d..9edee8b291d 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2015/08/11 14:29:45 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2015/08/26 05:03:00 fhajny Exp $
 
-SHA1 (mongodb-src-r3.0.5.tar.gz) = 7ffef18eec16a41208322c3612a92c0e2652d5f7
-RMD160 (mongodb-src-r3.0.5.tar.gz) = 770714f107555f724968ab01c20dfc99568e8f23
-Size (mongodb-src-r3.0.5.tar.gz) = 26332788 bytes
+SHA1 (mongodb-src-r3.0.6.tar.gz) = b80acf2cd63b3bce27d860581ce17a3aad2b8ea8
+RMD160 (mongodb-src-r3.0.6.tar.gz) = 3e3dc920c0790826b54d02e5a82faace48da9e9f
+Size (mongodb-src-r3.0.6.tar.gz) = 26241944 bytes
 SHA1 (patch-SConstruct) = 71f06ac82474f81a6b1b6660cd9e23cd5a63d55f
 SHA1 (patch-debian_mongod.conf) = 35f3d7e7da4f573458bef0fe742c1790adec8200
 SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5
-SHA1 (patch-src_mongo_db_repl_isself.c) = 93001bf0616c0fd64ac5e7ea03113885671540b0
-SHA1 (patch-src_mongo_platform_random.cpp) = ab275e90347a9d2e767f031df4e56a204647ddfe
-SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = d505c22aeeee09b482bf3d3a6bd0cdc45c9ec0bc
+SHA1 (patch-src_mongo_db_repl_isself.c) = c27e7ac0f19158eff9d5bf59d5d07835ab222bc4
+SHA1 (patch-src_mongo_platform_random.cpp) = 4e962e0ffdcbd80956bacebfcb052cb25508d4ca
+SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = 2d18e46cb63313e6fb09714e0662c98347f4f74e
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = d242db05708c999bd19f2751bdc881db50ea81f0
 SHA1 (patch-src_third__party_s2_base_port.h) = 8e715efbfcacaba51d957c21aa32ccfd3cc4f736
 SHA1 (patch-src_third__party_v8-3.25_SConscript) = a8da59130c36b2be3b89498ba0b23b1c7c9ab9e6
diff --git a/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c b/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c
index ea044e63e58..6b075743ad6 100644
--- a/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c
+++ b/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_mongo_db_repl_isself.c,v 1.1 2015/05/02 08:10:33 ryoon Exp $
+$NetBSD: patch-src_mongo_db_repl_isself.c,v 1.2 2015/08/26 05:03:00 fhajny Exp $
 
 * Add NetBSD support.
 
---- src/mongo/db/repl/isself.cpp.orig	2015-04-08 20:28:08.000000000 +0000
+--- src/mongo/db/repl/isself.cpp.orig	2015-08-24 00:39:52.000000000 +0000
 +++ src/mongo/db/repl/isself.cpp
-@@ -47,7 +47,7 @@
- #include "mongo/util/scopeguard.h"
+@@ -48,7 +48,7 @@
  #include "mongo/util/log.h"
  
--#if defined(__linux__) || defined(__APPLE__) || defined(__freebsd__) || defined(__sunos__) || defined(__openbsd__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__freebsd__) || defined(__sunos__) || defined(__openbsd__) || defined(__netbsd__)
+ #if defined(__linux__) || defined(__APPLE__) || defined(__freebsd__) || defined(__sunos__) || \
+-    defined(__openbsd__)
++    defined(__openbsd__) || defined(__netbsd__)
  #define FASTPATH_UNIX 1
  #endif
  
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
  #include <ifaddrs.h>
  #include <netdb.h>
  
diff --git a/databases/mongodb/patches/patch-src_mongo_platform_random.cpp b/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
index a56e228628c..35fa7cccdbb 100644
--- a/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
+++ b/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_mongo_platform_random.cpp,v 1.1 2015/05/02 08:10:33 ryoon Exp $
+$NetBSD: patch-src_mongo_platform_random.cpp,v 1.2 2015/08/26 05:03:00 fhajny Exp $
 
 Add NetBSD support.
---- src/mongo/platform/random.cpp.orig	2015-04-08 20:28:08.000000000 +0000
+--- src/mongo/platform/random.cpp.orig	2015-08-24 00:39:52.000000000 +0000
 +++ src/mongo/platform/random.cpp
-@@ -117,7 +117,7 @@ namespace mongo {
-         return new WinSecureRandom();
-     }
+@@ -116,7 +116,7 @@ SecureRandom* SecureRandom::create() {
+     return new WinSecureRandom();
+ }
  
 -#elif defined(__linux__) || defined(__sunos__) || defined(__APPLE__) || defined(__freebsd__)
 +#elif defined(__linux__) || defined(__sunos__) || defined(__APPLE__) || defined(__freebsd__) || defined(__netbsd__)
  
-     class InputStreamSecureRandom : public SecureRandom {
-     public:
+ class InputStreamSecureRandom : public SecureRandom {
+ public:
diff --git a/databases/mongodb/patches/patch-src_mongo_shell_linenoise__utf8.h b/databases/mongodb/patches/patch-src_mongo_shell_linenoise__utf8.h
index 969db2b50ba..8e48d2a97cd 100644
--- a/databases/mongodb/patches/patch-src_mongo_shell_linenoise__utf8.h
+++ b/databases/mongodb/patches/patch-src_mongo_shell_linenoise__utf8.h
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_mongo_shell_linenoise__utf8.h,v 1.1 2015/05/02 08:10:33 ryoon Exp $
+$NetBSD: patch-src_mongo_shell_linenoise__utf8.h,v 1.2 2015/08/26 05:03:00 fhajny Exp $
 
 Use Boost swap instead of std. Fixes build on SunOS.
---- src/mongo/shell/linenoise_utf8.h.orig	2015-04-08 20:28:08.000000000 +0000
+--- src/mongo/shell/linenoise_utf8.h.orig	2015-08-24 00:39:52.000000000 +0000
 +++ src/mongo/shell/linenoise_utf8.h
 @@ -27,6 +27,7 @@
   *    then also delete it in the license file.
@@ -11,16 +11,16 @@ Use Boost swap instead of std. Fixes build on SunOS.
  #include <boost/smart_ptr/scoped_array.hpp>
  #include <algorithm>
  #include <string.h>
-@@ -155,9 +156,9 @@ struct UtfStringMixin {
-     size_t chars() const { return _chars; }
+@@ -173,9 +174,9 @@ struct UtfStringMixin {
+     }
  
-     void swap( UtfStringMixin& other ) {
--        std::swap( _len, other._len );
--        std::swap( _cap, other._cap );
--        std::swap( _chars, other._chars );
-+        boost::swap( _len, other._len );
-+        boost::swap( _cap, other._cap );
-+        boost::swap( _chars, other._chars );
-         _str.swap( other._str );
+     void swap(UtfStringMixin& other) {
+-        std::swap(_len, other._len);
+-        std::swap(_cap, other._cap);
+-        std::swap(_chars, other._chars);
++        boost::swap(_len, other._len);
++        boost::swap(_cap, other._cap);
++        boost::swap(_chars, other._chars);
+         _str.swap(other._str);
      }