testing/mongodb: upgrade to 3.0.6

1 files changed, 31 insertions, 24 deletions

diff --git a/testing/mongodb/20-fix-libc-version.patch b/testing/mongodb/20-fix-libc-version.patch
index bf1aba081a..3b213cc3d5 100644
--- a/testing/mongodb/20-fix-libc-version.patch
+++ b/testing/mongodb/20-fix-libc-version.patch
@@ -1,5 +1,34 @@
---- orig/mongodb-src-r3.0.2/src/mongo/util/processinfo_linux2.cpp
-+++ mongodb-src-r3.0.2/src/mongo/util/processinfo_linux2.cpp
+diff --git a/src/mongo/util/processinfo_linux2.cpp b/src/mongo/util/processinfo_linux2.cpp
+index d1ed23a..0c1011e 100644
+--- a/src/mongo/util/processinfo_linux2.cpp
++++ b/src/mongo/util/processinfo_linux2.cpp
+@@ -335,6 +335,7 @@ public:
+         paths.push_back("/etc/debian_release");
+         paths.push_back("/etc/slackware-version");
+         paths.push_back("/etc/centos-release");
++        paths.push_back("/etc/alpine-release");
+         paths.push_back("/etc/os-release");
+ 
+         for (i = paths.begin(); i != paths.end(); ++i) {
+@@ -421,10 +422,10 @@ double ProcessInfo::getSystemMemoryPressurePercentage() {
+ 
+ void ProcessInfo::getExtraInfo(BSONObjBuilder& info) {
+     // [dm] i don't think mallinfo works. (64 bit.)  ??
+-    struct mallinfo malloc_info =
+-        mallinfo();  // structure has same name as function that returns it. (see malloc.h)
+-    info.append("heap_usage_bytes",
+-                malloc_info.uordblks /*main arena*/ + malloc_info.hblkhd /*mmap blocks*/);
++    //struct mallinfo malloc_info =
++    //    mallinfo();  // structure has same name as function that returns it. (see malloc.h)
++    // TODO: Fix for TC_malloc instance().getStats()
++       info.append("heap_usage_bytes", 0);     
+     // docs claim hblkhd is included in uordblks but it isn't
+ 
+     LinuxProc p(_pid);
+diff --git a/src/mongo/util/processinfo_linux2.cpp b/src/mongo/util/processinfo_linux2.cpp
+index 0c1011e..755a2cc 100644
+--- a/src/mongo/util/processinfo_linux2.cpp
++++ b/src/mongo/util/processinfo_linux2.cpp
 @@ -34,7 +34,11 @@
  #include <stdio.h>
  #include <unistd.h>
@@ -13,25 +42,3 @@
  #include <sys/utsname.h>
  
  #include "processinfo.h"
-@@ -314,6 +318,7 @@
-             paths.push_back( "/etc/slackware-version" );
-             paths.push_back( "/etc/centos-release" );
-             paths.push_back( "/etc/os-release" );
-+            paths.push_back( "/etc/alpine-release" );
-         
-             for ( i = paths.begin(); i != paths.end(); ++i ) {
-                 // for each path
-@@ -398,8 +403,11 @@
- 
-     void ProcessInfo::getExtraInfo( BSONObjBuilder& info ) {
-         // [dm] i don't think mallinfo works. (64 bit.)  ??
--        struct mallinfo malloc_info = mallinfo(); // structure has same name as function that returns it. (see malloc.h)
--        info.append("heap_usage_bytes", malloc_info.uordblks/*main arena*/ + malloc_info.hblkhd/*mmap blocks*/);
-+        //struct mallinfo malloc_info = mallinfo(); // structure has same name as function that returns it. (see malloc.h)
-+        // info.append("heap_usage_bytes", malloc_info.uordblks/*main arena*/ + malloc_info.hblkhd/*mmap blocks*/);
-+
-+	// TODO: Fix for TC_malloc instance().getStats()
-+	info.append("heap_usage_bytes", 0);	
-         //docs claim hblkhd is included in uordblks but it isn't
- 
-         LinuxProc p(_pid);