sablink/for-gentoo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dev-db/mongodb] version bump to 2.4.6

Browse Source
This commit is contained in:
Sławomir Nizio
2013-09-07 00:18:53 +02:00
parent 4db146e0df
commit 612a85ccb5
8 changed files with 34 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-db/mongodb/Manifest
+2 -2
View File
@@ -1,2 +1,2 @@
DIST 20130605-10gen-mms-agent.zip 31780 SHA256 31580a8fd95a603334a1e903896709fe0f311a8a118fee7da1b9cf8e91aad6c3 SHA512 671b10c93b0b43ee60e4e0ca0e5553fe8503cc1690a86686215eabc1f5e2005048c6d35d786d7b0196e1382690b5696d64aed79a563d3ef5b373568cac420f4e WHIRLPOOL 6e95b20158eda465b859ce2266f7344796c4bc4dce71410e9ef045085d614c33a49f29ff1747be8111cf34d948e8310d5bb972915aa63e2a9428a1e976174e08
DIST mongodb-src-r2.4.5.tar.gz 14128847 SHA256 b576cbc2c813144b8a8774a7232b78bd0b005e2e6fa7428e7fa1e426c7a28705 SHA512 07a46770c5acc0e046750e0299e669b934f6093705f5979bc5fa8bb56e73761f9602a5bdbaaad688700e4dde32d1e5f48a6cf3763ffab4d80a47f0158d8fb89e WHIRLPOOL 407cec63e9f304be887a5f2ab90f08b15d2295f809c36b30faafb0290146d9b99b3b8b8f0226768982555a39cce7944baca3fd98503f965bfb3bfb09a7e2160d
DIST 20130821-10gen-mms-agent.zip 31918 SHA256 b48f35fe2ad058dc4ebcab01dad1229c0597e78a9011b57cd1030a05cdd16e7c SHA512 9467d229829076733a023d81e377479e1e4c71c4d2c1d163928abf7215bc87809a304768f83b531b6f585d19b18585f9d0d35fd74762cf180586be11536eb1a8 WHIRLPOOL d632c1761d1f47f2139a046d58af09641a0c8d9f3168d7ebc99dac5c6a3b5b0846cba8eac581b67d35c5e7580c6910759503b85e7ca74e5930c0e0dac3d77c97
DIST mongodb-src-r2.4.6.tar.gz 14141660 SHA256 b5f397abc92d36d84a85753d15fb5d7dab6545ce9dfd9fb7685c630e6b050acb SHA512 73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae WHIRLPOOL 4c5c9b8b7530a58f5fab62c414054939014a38cb49429ff619059b7305b29eb41c8ec3977a3b4490391afe963384d4560097a7ef536679c42c9d0ecc1677c958
dev-db/mongodb/files/mongodb-2.2-fix-scons.patch
-46
View File
@@ -1,46 +0,0 @@
--- a/SConstruct 2012-08-29 16:21:35.107094792 +0200
+++ b/SConstruct 2012-08-29 19:09:16.964893217 +0200
@@ -677,7 +677,6 @@
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
env.Append( CCFLAGS=["-fPIC",
"-fno-strict-aliasing",
- "-ggdb",
"-pthread",
"-Wall",
"-Wsign-compare",
@@ -685,14 +684,15 @@
"-Winvalid-pch"] )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
- env.Append( CCFLAGS=["-Werror", "-pipe"] )
+ env.Append( CPPDEFINES=["XP_UNIX=1"] )
if not has_option('clang'):
env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
- env.Append( LIBS=[] )
+ env.Append( LIBS=['js', 'pcre', 'pcrecpp', 'snappy'] )
#make scons colorgcc friendly
for key in ('HOME', 'TERM'):
@@ -703,6 +703,7 @@
if linux and has_option( "sharedclient" ):
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
+ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
if linux and has_option( "gcov" ):
env.Append( CXXFLAGS=" -fprofile-arcs -ftest-coverage " )
@@ -712,7 +713,7 @@
env.Append( CCFLAGS=["-O0", "-fstack-protector"] )
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
else:
- env.Append( CCFLAGS=["-O3"] )
+ env.Append( CXXFLAGS=["-O3"] )
if debugLogging:
env.Append( CPPDEFINES=["_DEBUG"] );
dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch
-215
View File
@@ -1,215 +0,0 @@
--- a/src/mongo/db/db.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/db/db.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -348,7 +348,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 );
@@ -748,11 +748,11 @@
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
+// #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;
@@ -1083,7 +1083,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;
--- a/src/mongo/db/dur.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/db/dur.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -770,7 +770,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(...) {
--- a/src/mongo/db/dur_journal.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/db/dur_journal.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -176,7 +176,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( anyFiles || str::startsWith(fileName, "j._") )
return true;
}
@@ -194,7 +194,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);
--- a/src/mongo/db/dur_recover.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/db/dur_recover.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -72,7 +72,7 @@
i != boost::filesystem::directory_iterator();
++i ) {
boost::filesystem::path filepath = *i;
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).leaf().string();
if( str::startsWith(fileName, "j._") ) {
unsigned u = str::toUnsigned( str::after(fileName, '_') );
if( m.count(u) ) {
@@ -85,7 +85,7 @@
if( i != m.begin() && m.count(i->first - 1) == 0 ) {
uasserted(13532,
str::stream() << "unexpected file in journal directory " << dir.string()
- << " : " << boost::filesystem::path(i->second).leaf() << " : can't find its preceeding file");
+ << " : " << boost::filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
}
files.push_back(i->second);
}
--- a/src/mongo/db/instance.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/work/mongodb-src-r2.2.0/src/mongo/db/instance.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -833,13 +833,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 ( 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 ) );
}
@@ -1102,7 +1102,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;
--- a/src/mongo/db/pdfile.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/db/pdfile.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -1675,7 +1675,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 {
@@ -1783,7 +1783,7 @@
uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
"backup" : "_tmp" );
MONGO_ASSERT_ON_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
- string reservedPathString = reservedPath.native_directory_string();
+ string reservedPathString = reservedPath.string();
bool res;
{
--- a/src/mongo/dbtests/framework.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/dbtests/framework.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -199,7 +199,7 @@
boost::filesystem::create_directory(p);
}
- string dbpathString = p.native_directory_string();
+ string dbpathString = p.string();
dbpath = dbpathString.c_str();
cmdLine.prealloc = false;
--- a/src/mongo/pch.h 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/pch.h 2012-10-21 18:25:50.000000000 +0300
@@ -44,7 +44,7 @@
#include "string.h"
#include "limits.h"
-#define BOOST_FILESYSTEM_VERSION 2
+#define BOOST_FILESYSTEM_VERSION 3
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr.hpp>
#include <boost/function.hpp>
--- a/src/mongo/shell/shell_utils_launcher.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/shell/shell_utils_launcher.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -184,7 +184,7 @@
}
#endif
- _argv.push_back( programPath.native_file_string() );
+ _argv.push_back( programPath.string() );
_port = -1;
--- a/src/mongo/tools/restore.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/tools/restore.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -174,7 +174,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 ) ) {
@@ -255,7 +255,7 @@
verify( ns.size() );
- string oldCollName = root.leaf(); // Name of the collection that was dumped from
+ string oldCollName = root.leaf().string(); // Name of the collection that was dumped from
oldCollName = oldCollName.substr( 0 , oldCollName.find_last_of( "." ) );
if (use_coll) {
ns += "." + _coll;
@@ -287,7 +287,7 @@
if (!boost::filesystem::exists(metadataFile.string())) {
// This is fine because dumps from before 2.1 won't have a metadata file, just print a warning.
// System collections shouldn't have metadata so don't warn if that file is missing.
- if (!startsWith(metadataFile.leaf(), "system.")) {
+ if (!startsWith(metadataFile.leaf().string(), "system.")) {
log() << metadataFile.string() << " not found. Skipping." << endl;
}
} else {
--- a/src/mongo/tools/tool.cpp 2012-08-28 08:28:11.000000000 +0300
+++ b/src/mongo/tools/tool.cpp 2012-10-21 18:25:50.000000000 +0300
@@ -118,11 +118,11 @@
// 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
+// #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];
dev-db/mongodb/files/mongodb-2.4.5-boost-size-fix.patch
-51
View File
@@ -1,51 +0,0 @@
diff -Nur mongodb-src-r2.4.4.orig/src/mongo/db/auth/privilege_set.cpp mongodb-src-r2.4.4/src/mongo/db/auth/privilege_set.cpp
--- mongodb-src-r2.4.4.orig/src/mongo/db/auth/privilege_set.cpp 2013-06-16 20:57:57.411195496 +0200
+++ mongodb-src-r2.4.4/src/mongo/db/auth/privilege_set.cpp 2013-06-30 12:37:08.567699530 +0200
@@ -79,7 +79,7 @@
resourceSearchList[1] = nsToDatabaseSubstring(desiredPrivilege.getResource());
ActionSet unmetRequirements = desiredPrivilege.getActions();
- for (int i = 0; i < boost::size(resourceSearchList); ++i) {
+ for (int i = 0; i < static_cast<int>(boost::size(resourceSearchList)); ++i) {
ResourcePrivilegeCacheEntry* entry = _lookupEntry(resourceSearchList[i]);
if (NULL == entry)
continue;
diff -Nur mongodb-src-r2.4.4.orig/src/mongo/db/cmdline_test.cpp mongodb-src-r2.4.4/src/mongo/db/cmdline_test.cpp
--- mongodb-src-r2.4.4.orig/src/mongo/db/cmdline_test.cpp 2013-06-16 20:57:57.399197914 +0200
+++ mongodb-src-r2.4.4/src/mongo/db/cmdline_test.cpp 2013-06-30 12:37:08.571700380 +0200
@@ -102,7 +102,7 @@
"--servicePassword",
"xxxxxxxxxxxxxxxx"
};
- ASSERT_EQUALS(boost::size(expected), argc);
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
testCensoringArgv(expected, argv, argc);
}
@@ -134,7 +134,7 @@
"-servicePassword",
"xxxxxxxxxxxxxxxx"
};
- ASSERT_EQUALS(boost::size(expected), argc);
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
testCensoringArgv(expected, argv, argc);
}
@@ -183,7 +183,7 @@
"--servicePassword",
"<password>"
};
- ASSERT_EQUALS(boost::size(expected), argc);
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
testCensoringVector(expected, argv, argc);
}
@@ -215,7 +215,7 @@
"-servicePassword",
"<password>"
};
- ASSERT_EQUALS(boost::size(expected), argc);
+ ASSERT_EQUALS(static_cast<int>(boost::size(expected)), argc);
testCensoringVector(expected, argv, argc);
}
dev-db/mongodb/files/mongodb.initd → dev-db/mongodb/files/mongodb.initd-r1
+2 -2
View File
@@ -1,10 +1,10 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.5 2013/01/18 11:19:27 ultrabug Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
depend() {
need net
use net
}
start() {
dev-db/mongodb/files/mongos.initd → dev-db/mongodb/files/mongos.initd-r1
+3 -3
View File
@@ -1,10 +1,10 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd,v 1.3 2013/01/18 11:19:27 ultrabug Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
depend() {
need net
use net
}
checkconfig() {
@@ -47,4 +47,4 @@ stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
eend $?
}
}
dev-db/mongodb/metadata.xml
+1 -3
View File
@@ -20,9 +20,7 @@
and powerful queries).
</longdescription>
<use>
<flag name="v8">Use V8 JavaScript engine
(<pkg>dev-lang/v8</pkg>) instead of SpiderMonkey
(<pkg>dev-lang/spidermonkey</pkg>)</flag>
<flag name="embedded-v8">Use embedded version of v8 instead of system v8</flag>
<flag name="spidermonkey">Use embedded SpiderMonkey engine
(<pkg>dev-lang/spidermonkey</pkg>) instead of v8
(<pkg>dev-lang/v8</pkg>)</flag>
dev-db/mongodb/mongodb-2.4.5.ebuild → dev-db/mongodb/mongodb-2.4.6.ebuild
+26 -8
View File
@@ -12,16 +12,18 @@ MY_P=${PN}-src-r${PV/_rc/-rc}
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="http://www.mongodb.org"
SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
mms-agent? ( http://dev.gentoo.org/~ultrabug/20130605-10gen-mms-agent.zip )"
mms-agent? ( http://dev.gentoo.org/~ultrabug/20130821-10gen-mms-agent.zip )"
LICENSE="AGPL-3 Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
IUSE="-embedded-v8 kerberos mms-agent sharedclient spidermonkey ssl static-libs"
PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
RDEPEND="
dev-lang/v8
!spidermonkey? (
!embedded-v8? ( <dev-lang/v8-3.19 )
)
>=dev-libs/boost-1.50[threads(+)]
dev-libs/libpcre[cxx]
dev-util/google-perftools
@@ -45,6 +47,11 @@ pkg_setup() {
scons_opts+=" --use-system-snappy"
scons_opts+=" --use-system-boost"
if use prefix; then
scons_opts+=" --cpppath=${EPREFIX}/usr/include"
scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
fi
if use kerberos; then
scons_opts+=" --use-sasl-client"
fi
@@ -56,7 +63,11 @@ pkg_setup() {
if use spidermonkey; then
scons_opts+=" --usesm"
else
scons_opts+=" --use-system-v8"
if use embedded-v8; then
scons_opts+=" --usev8"
else
scons_opts+=" --use-system-v8"
fi
fi
if use ssl; then
@@ -67,8 +78,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-2.4.5-fix-scons.patch"
epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
epatch "${FILESDIR}/${PN}-2.4.5-boost-size-fix.patch"
epatch "${FILESDIR}/${PN}-2.4.5-use-damn-size_t.patch"
epatch "${FILESDIR}/mongodb-2.4.5-use-damn-size_t.patch"
# bug #462606
sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
@@ -95,9 +105,9 @@ src_install() {
doman debian/mongo*.1
dodoc README docs/building.md
newinitd "${FILESDIR}/${PN}.initd" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
newconfd "${FILESDIR}/${PN}.confd" ${PN}
newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
insinto /etc/logrotate.d/
@@ -127,6 +137,14 @@ src_test() {
}
pkg_postinst() {
if use embedded-v8; then
ewarn "You chose to build ${PN} using embedded v8."
ewarn "This is not recommended by Gentoo and should be used to resolve"
ewarn "blockers with packages requiring >=v8-3.19 only !"
ewarn "See the following bug [1] and jira issue [2] for more info."
ewarn " [1] https://bugs.gentoo.org/show_bug.cgi?id=471582"
ewarn " [2] https://jira.mongodb.org/browse/SERVER-10282"
fi
if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
ewarn "You just upgraded from a previous version of mongodb !"
ewarn "Make sure you run 'mongod --upgrade' before using this version."