drop old and vulnerable version wrt #497540

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

6 files changed, 8 insertions, 421 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index d156734acde9..7314aceedd9f 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.95 2014/06/20 16:44:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.96 2014/07/23 15:42:49 ultrabug Exp $
+
+  23 Jul 2014; Ultrabug <ultrabug@gentoo.org> -mongodb-2.2.7.ebuild,
+  -files/mongodb-2.2-fix-sharedclient.patch,
+  -files/mongodb-2.2-fix-x86client.patch,
+  -files/mongodb-2.2-r1-fix-scons.patch,
+  -files/mongodb-2.2-r2-boost-1.50.patch:
+  drop old and vulnerable version wrt #497540
 
 *mongodb-2.6.3 (20 Jun 2014)
 
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
deleted file mode 100644
index 21e3f66c7cb6..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
---- mongodb-src-r2.2.0.orig/src/SConscript.client	2012-08-28 08:28:11.000000000 +0300
-+++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:32:46.776436389 +0200
-@@ -3,7 +3,7 @@
- # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple
- # programs.
- 
--Import('env clientEnv')
-+Import('env clientEnv has_option')
- 
- clientSource = [
-     'mongo/bson/oid.cpp',
-@@ -96,9 +96,11 @@
-     clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
- 
- mongoclient_lib = env.Library('mongoclient', clientSource),
-+if has_option( "sharedclient" ):
-+    mongoclient_slib = env.SharedLibrary('mongoclient', clientSource)
- mongoclient_install = env.Install('#/', [
-         mongoclient_lib,
--        #env.SharedLibrary('mongoclient', clientSource),
-+        mongoclient_slib,
-         ])
- env.Alias('mongoclient', mongoclient_install)
- 
-@@ -135,6 +137,8 @@
- prefix = GetOption("prefix")
- 
- env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
-+if has_option( "sharedclient" ):
-+    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
- 
- for x in clientHeaderDirectories:
-     env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
deleted file mode 100644
index 197372c4b14e..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
---- mongodb-src-r2.2.0.orig/src/SConscript.client	2013-03-08 10:32:46.000000000 +0200
-+++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:34:04.208437762 +0200
-@@ -136,9 +136,9 @@
- # install
- prefix = GetOption("prefix")
- 
--env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
-+env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
- if has_option( "sharedclient" ):
--    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
-+    env.InstallAs(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
- 
- for x in clientHeaderDirectories:
-     env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch
deleted file mode 100644
index 2d08fb454dfa..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch
+++ /dev/null
@@ -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=['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"] );
diff --git a/dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch b/dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch
deleted file mode 100644
index c8b146f5d87d..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch
+++ /dev/null
@@ -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];
diff --git a/dev-db/mongodb/mongodb-2.2.7.ebuild b/dev-db/mongodb/mongodb-2.2.7.ebuild
deleted file mode 100644
index ee4b5bcdcddd..000000000000
--- a/dev-db/mongodb/mongodb-2.2.7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.7.ebuild,v 1.1 2014/02/17 09:43:11 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user versionator check-reqs
-
-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/20130821-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient --usesm"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
-	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
-
-	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
-	# on amd64 machines [2].
-	# [1] https://jira.mongodb.org/browse/SERVER-5575
-	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}