diff options
Diffstat (limited to 'community/mongodb')
3 files changed, 0 insertions, 326 deletions
diff --git a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch deleted file mode 100644 index 40dd48b42..000000000 --- a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 10 Apr 2012 19:30:35 -0500 -Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath - when using --shutdown SERVER-5186 SERVER-5187" - -https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923 - -Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358 ---- - db/cmdline.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/db/cmdline.cpp b/db/cmdline.cpp -index fd759a7..346a9ae 100644 ---- a/db/cmdline.cpp -+++ b/db/cmdline.cpp -@@ -239,7 +239,7 @@ namespace mongo { - cmdLine.noUnixSocket = true; - } - -- if (params.count("fork")) { -+ if (params.count("fork") && !params.count("shutdown")) { - if ( ! params.count( "logpath" ) ) { - cout << "--fork has to be used with --logpath" << endl; - ::exit(-1); -@@ -304,7 +304,7 @@ namespace mongo { - } - - #endif -- if (params.count("logpath")) { -+ if (params.count("logpath") && !params.count("shutdown")) { - if ( logpath.size() == 0 ) - logpath = params["logpath"].as<string>(); - uassert( 10033 , "logpath has to be non-zero" , logpath.size() ); --- -1.7.10 - diff --git a/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch deleted file mode 100644 index aff066450..000000000 --- a/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 10 Apr 2012 19:38:58 -0500 -Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in - --shutdown SERVER-5358" - -Backported to fix https://jira.mongodb.org/browse/SERVER-5358 - -https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b ---- - db/db.cpp | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/db/db.cpp b/db/db.cpp -index b1d1db8..0a21f4d 100644 ---- a/db/db.cpp -+++ b/db/db.cpp -@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) { - procPath = (str::stream() << "/proc/" << pid); - if (!boost::filesystem::exists(procPath)) - failed = true; -- -- string exePath = procPath + "/exe"; -- if (boost::filesystem::exists(exePath)){ -- char buf[256]; -- int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1); -- buf[ret] = '\0'; // readlink doesn't terminate string -- if (ret == -1) { -- int e = errno; -- cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e); -- failed = true; -- } -- else if (!endsWith(buf, "mongod")){ -- cerr << "Process " << pid << " is running " << buf << " not mongod" << endl; -- ::exit(-1); -- } -- } - } - catch (const std::exception& e){ - cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl; --- -1.7.10 - diff --git a/community/mongodb/boost-1.50.patch b/community/mongodb/boost-1.50.patch deleted file mode 100644 index 4ccb898ec..000000000 --- a/community/mongodb/boost-1.50.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp ---- mongodb-src-r2.0.6/db/db.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/db.cpp 2012-07-10 22:27:16.496886220 +0200 -@@ -326,7 +326,7 @@ - boost::filesystem::path path( dbpath ); - for ( boost::filesystem::directory_iterator i( path ); - i != boost::filesystem::directory_iterator(); ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( boost::filesystem::is_directory( *i ) && - fileName.length() && fileName[ 0 ] == '$' ) - boost::filesystem::remove_all( *i ); -@@ -655,11 +655,6 @@ - dbExecCommand = argv[0]; - - srand(curTimeMicros()); --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif - - { - unsigned x = 0x12345678; -@@ -976,7 +971,7 @@ - if (params.count("shutdown")){ - bool failed = false; - -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) - failed = true; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp ---- mongodb-src-r2.0.6/db/dur.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur.cpp 2012-07-10 21:56:28.866778732 +0200 -@@ -692,7 +692,7 @@ - - bool samePartition = true; - try { -- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); -+ const string dbpathDir = boost::filesystem::path(dbpath).string(); - samePartition = onSamePartition(getJournalDir().string(), dbpathDir); - } - catch(...) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp ---- mongodb-src-r2.0.6/db/dur_journal.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp 2012-07-10 22:04:18.583472723 +0200 -@@ -169,7 +169,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) - return true; - } -@@ -185,7 +185,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - try { - removeOldJournalFile(*i); -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp ---- mongodb-src-r2.0.6/db/dur_recover.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp 2012-07-10 22:02:18.226799055 +0200 -@@ -71,7 +71,7 @@ - i != filesystem::directory_iterator(); - ++i ) { - filesystem::path filepath = *i; -- string fileName = filesystem::path(*i).leaf(); -+ string fileName = filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - unsigned u = str::toUnsigned( str::after(fileName, '_') ); - if( m.count(u) ) { -@@ -84,7 +84,7 @@ - if( i != m.begin() && m.count(i->first - 1) == 0 ) { - uasserted(13532, - str::stream() << "unexpected file in journal directory " << dir.string() -- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file"); -+ << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); - } - files.push_back(i->second); - } -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp ---- mongodb-src-r2.0.6/db/instance.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/instance.cpp 2012-07-10 22:08:55.213488817 +0200 -@@ -645,13 +645,13 @@ - i != boost::filesystem::directory_iterator(); ++i ) { - if ( directoryperdb ) { - boost::filesystem::path p = *i; -- string dbName = p.leaf(); -+ string dbName = p.leaf().string(); - p /= ( dbName + ".ns" ); - if ( MMF::exists( p ) ) - names.push_back( dbName ); - } - else { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) - names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); - } -@@ -893,7 +893,7 @@ - } - - void acquirePathLock(bool doingRepair) { -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - - bool oldFile = false; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp ---- mongodb-src-r2.0.6/db/pdfile.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp 2012-07-10 22:11:44.103498643 +0200 -@@ -1987,7 +1987,7 @@ - virtual bool apply( const Path &p ) { - if ( !boost::filesystem::exists( p ) ) - return false; -- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); -+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); - return true; - } - virtual const char * op() const { -@@ -2093,7 +2093,7 @@ - uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? - "backup" : "$tmp" ); - BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); -- string reservedPathString = reservedPath.native_directory_string(); -+ string reservedPathString = reservedPath.string(); - - bool res; - { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp ---- mongodb-src-r2.0.6/dbtests/framework.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp 2012-07-10 22:29:20.610226773 +0200 -@@ -281,7 +281,7 @@ - boost::filesystem::create_directory(p); - } - -- string dbpathString = p.native_directory_string(); -+ string dbpathString = p.string(); - dbpath = dbpathString.c_str(); - - cmdLine.prealloc = false; -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h ---- mongodb-src-r2.0.6/pch.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/pch.h 2012-07-10 21:35:57.133373738 +0200 -@@ -79,7 +79,7 @@ - //#include <boost/any.hpp> - #include "boost/thread/once.hpp" - //#include <boost/archive/iterators/transform_width.hpp> --#define BOOST_FILESYSTEM_VERSION 2 -+#define BOOST_FILESYSTEM_VERSION 3 - #include <boost/filesystem/convenience.hpp> - #include <boost/filesystem/exception.hpp> - #include <boost/filesystem/operations.hpp> -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp ---- mongodb-src-r2.0.6/shell/shell_utils.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp 2012-07-10 22:38:58.443593723 +0200 -@@ -388,7 +388,7 @@ - #endif - } - -- argv_.push_back( programPath.native_file_string() ); -+ argv_.push_back( programPath.string() ); - - port_ = -1; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp ---- mongodb-src-r2.0.6/tools/restore.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/tools/restore.cpp 2012-07-10 22:45:00.046948094 +0200 -@@ -131,7 +131,7 @@ - log(2) << "drillDown: " << root.string() << endl; - - // skip hidden files and directories -- if (root.leaf()[0] == '.' && root.leaf() != ".") -+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") - return; - - if ( is_directory( root ) ) { -@@ -210,7 +210,7 @@ - ns += "." + _coll; - } - else { -- string l = root.leaf(); -+ string l = root.leaf().string(); - l = l.substr( 0 , l.find_last_of( "." ) ); - ns += "." + l; - } -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp ---- mongodb-src-r2.0.6/tools/tool.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/tools/tool.cpp 2012-07-10 22:23:53.356874403 +0200 -@@ -113,12 +113,6 @@ - // we want durability to be disabled. - cmdLine.dur = false; - --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif -- - _name = argv[0]; - - /* using the same style as db.cpp */ -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp ---- mongodb-src-r2.0.6/util/background.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/background.cpp 2012-07-10 21:47:40.420081320 +0200 -@@ -89,7 +89,7 @@ - if ( msTimeOut ) { - // add msTimeOut millisecond to current time - boost::xtime xt; -- boost::xtime_get( &xt, boost::TIME_UTC ); -+ boost::xtime_get( &xt, boost::TIME_UTC_ ); - - unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano - if ( xt.nsec + ns < 1000000000 ) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h ---- mongodb-src-r2.0.6/util/concurrency/mutex.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h 2012-07-10 21:45:51.333408307 +0200 -@@ -29,7 +29,7 @@ - - inline boost::xtime incxtimemillis( long long s ) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += (int)( s / 1000 ); - xt.nsec += (int)(( s % 1000 ) * 1000000); - if ( xt.nsec >= 1000000000 ) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h ---- mongodb-src-r2.0.6/util/queue.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/queue.h 2012-07-10 22:14:00.243506560 +0200 -@@ -82,7 +82,7 @@ - Timer timer; - - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += maxSecondsToWait; - - scoped_lock l( _lock ); |