diff options
Diffstat (limited to 'dev-db/mongodb')
| -rw-r--r-- | dev-db/mongodb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch | 33 | ||||
| -rw-r--r-- | dev-db/mongodb/mongodb-2.4.12.ebuild | 5 |
3 files changed, 41 insertions, 3 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index bbb20cce11e9..dcb8f7a82656 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.106 2015/02/23 11:41:17 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.107 2015/02/23 14:37:49 ultrabug Exp $ + + 23 Feb 2015; Ultrabug <ultrabug@gentoo.org> mongodb-2.4.12.ebuild, + +files/mongodb-2.4-fix-sasl.patch: + fix 2.4.x SASL support thx to Mike Limansky, fix #501744 23 Feb 2015; Ultrabug <ultrabug@gentoo.org> files/mongodb.conf-r2: fix default config for non ssl enabled installations thx to Tomas Mozes, fix diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch b/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch new file mode 100644 index 000000000000..553967e8dedd --- /dev/null +++ b/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch @@ -0,0 +1,33 @@ +--- a/src/mongo/client/sasl_client_session.cpp 2014-10-15 00:40:29.000000000 +0400 ++++ b/src/mongo/client/sasl_client_session.cpp 2015-02-07 18:56:02.287762467 +0300 +@@ -29,17 +29,26 @@ + * doesn't initialize the library for us. + */ + +- void* saslOurMalloc(unsigned long sz) { ++// Version 2.1.26 is the first version to use size_t in the allocator signatures ++#if (SASL_VERSION_FULL >= ((2 << 16) | (1 << 8) | 26)) ++ typedef size_t SaslAllocSize; ++#else ++ typedef unsigned long SaslAllocSize; ++#endif ++ ++ typedef int(*SaslCallbackFn)(); ++ ++ void* saslOurMalloc(SaslAllocSize sz) { + return ourmalloc(sz); + } + +- void* saslOurCalloc(unsigned long count, unsigned long size) { ++ void* saslOurCalloc(SaslAllocSize count, SaslAllocSize size) { + void* ptr = calloc(count, size); +- if (!ptr) printStackAndExit(0); ++ if (!ptr) abort(); + return ptr; + } + +- void* saslOurRealloc(void* ptr, unsigned long sz) { ++ void* saslOurRealloc(void* ptr, SaslAllocSize sz) { + return ourrealloc(ptr, sz); + } + diff --git a/dev-db/mongodb/mongodb-2.4.12.ebuild b/dev-db/mongodb/mongodb-2.4.12.ebuild index 7477a47c7617..88dfc3aeb40c 100644 --- a/dev-db/mongodb/mongodb-2.4.12.ebuild +++ b/dev-db/mongodb/mongodb-2.4.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.12.ebuild,v 1.1 2014/10/17 11:57:29 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.12.ebuild,v 1.2 2015/02/23 14:37:49 ultrabug Exp $ EAPI=4 SCONS_MIN_VERSION="1.2.0" @@ -74,6 +74,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch" epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch" epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch" + epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch" # bug #462606 sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die |