Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d21b663522e567b9a5c1ac6f1efebab6299e7bdd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d21b663522e567b9a5c1ac6f1efebab6299e7bdd)
  • Date: Sun, 3 May 2015 20:41:59 -0500

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

database/mongodb/BUILD | 11 ------
database/mongodb/CONFIGURE | 16 ++++-----
database/mongodb/DETAILS | 5 +--
database/mongodb/HISTORY | 8 ++++
database/mongodb/INSTALL | 2 -
database/mongodb/PRE_BUILD | 2 -
database/mongodb/fips.patch | 21 ------------
database/mongodb/intsign.patch | 67
-----------------------------------------
database/mongodb/scons.patch | 29 +++++++----------
9 files changed, 32 insertions(+), 129 deletions(-)

New commits:
commit d21b663522e567b9a5c1ac6f1efebab6299e7bdd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

database/mongodb: version 3.0.2

diff --git a/database/mongodb/BUILD b/database/mongodb/BUILD
index 73c97d7..e66ead0 100755
--- a/database/mongodb/BUILD
+++ b/database/mongodb/BUILD
@@ -4,15 +4,6 @@ if ! list_find "$LDFLAGS" "-s"; then
OPTS="--nostrip $OPTS"
fi &&

-case $MONGODB_JSE in
- v8)
- OPTS="--usev8 $OPTS"
- ;;
- spidermonkey)
- OPTS="--usesm $OPTS"
- ;;
-esac &&
-
-OPTS="--mongod-concurrency-level=$MONGODB_CCL $MONGODB_OPTS $OPTS" &&
+OPTS="--js-engine=$MONGODB_JSE --disable-warnings-as-errors $OPTS" &&

scons all --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
diff --git a/database/mongodb/CONFIGURE b/database/mongodb/CONFIGURE
index 7614005..3eae621 100755
--- a/database/mongodb/CONFIGURE
+++ b/database/mongodb/CONFIGURE
@@ -1,11 +1,9 @@
-config_query_list MONGODB_CCL "Choose mongod concurrency level:" \
- db \
- global &&
-
config_query_list MONGODB_JSE "Choose JavaScript engine to use:" \
- v8 \
- spidermonkey &&
+ v8-3.12 \
+ v8-3.25 \
+ none

-config_query_option MONGODB_OPTS "Build shared client?" y \
- "--sharedclient" \
- ""
+list_remove MONGODB_JSE "v8" &&
+list_remove MONGODB_JSE "spidermonkey" &&
+persistent_remove MONGODB_OPTS &&
+persistent_remove MONGODB_CCL
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index a0096f1..b6db63d 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,13 +1,14 @@
SPELL=mongodb
- VERSION=2.4.11
+ VERSION=3.0.2
SECURITY_PATCH=1
SOURCE=$SPELL-src-r$VERSION.tar.gz
SOURCE_URL[0]=http://fastdl.mongodb.org/src/$SOURCE
SOURCE_URL[1]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:a132275b7d0be357958d4bffaa8d8b660df1812811e8b94b1482906d1cf4567f6b6f13c77dcdf6dea38c56f54fe4b462a41379185c04c9eb5661848b80e40106
+
SOURCE_HASH=sha512:ec14529f39459835644dd681a98133c276bb96c676ce3ad91c20dff1ce96aeda3e14f08c05019a72a6f8eaadfed7e176944b42187a273b3e82001946126931d7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
+ TMPFS=off
WEB_SITE=http://www.mongodb.org/
ENTERED=20101207
KEYWORDS="nosql database"
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 63156e7..fce9f5c 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,11 @@
+2015-05-03 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.2, TMPFS=off
+ * BUILD, CONFIGURE: cleaned up deprecated flags, disabled -Werror
+ * INSTALL: removed --full, no longer an option
+ * PRE_BUILD: removed obsolete patches
+ * fips.patch, intsign.patch: removed
+ * scons.patch: updated the patch
+
2014-09-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4.11
* PRE_BUILD: apply new patch
diff --git a/database/mongodb/INSTALL b/database/mongodb/INSTALL
index af039c1..2c1298b 100755
--- a/database/mongodb/INSTALL
+++ b/database/mongodb/INSTALL
@@ -1,4 +1,4 @@
-scons install --prefix="$INSTALL_ROOT/usr" --full $OPTS &&
+scons install --prefix="$INSTALL_ROOT/usr" $OPTS &&

if [[ $INIT_INSTALLED ]]; then
install_config_file "$SPELL_DIRECTORY/init.d/mongodb.conf" \
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index 79e40d7..86afe25 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -2,7 +2,5 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/fips.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/intsign.patch" &&

sedit "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/fips.patch b/database/mongodb/fips.patch
deleted file mode 100644
index c0da948..0000000
--- a/database/mongodb/fips.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/mongo/util/net/ssl_manager.cpp.orig
-+++ src/mongo/util/net/ssl_manager.cpp
-@@ -186,6 +186,7 @@
-
- void SSLManager::_setupFIPS() {
- // Turn on FIPS mode if requested.
-+#ifdef OPENSSL_FIPS
- int status = FIPS_mode_set(1);
- if (!status) {
- error() << "can't activate FIPS mode: " <<
-@@ -193,6 +194,10 @@
- fassertFailed(16703);
- }
- log() << "FIPS 140-2 mode activated" << endl;
-+#else
-+ error() << "this version of mongodb was not compiled with FIPS
support";
-+ fassertFailed(17084);
-+#endif
- }
-
- bool SSLManager::_setupPEM(const std::string& keyFile , const
std::string& password) {
diff --git a/database/mongodb/intsign.patch b/database/mongodb/intsign.patch
deleted file mode 100644
index bd02e4d..0000000
--- a/database/mongodb/intsign.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- mongodb-2.4.6.orig/src/mongo/db/auth/privilege_set.cpp
-+++ mongodb-2.4.6/src/mongo/db/auth/privilege_set.cpp
-@@ -79,7 +79,7 @@ namespace mongo {
- resourceSearchList[1] =
nsToDatabaseSubstring(desiredPrivilege.getResource());
-
- ActionSet unmetRequirements = desiredPrivilege.getActions();
-- for (int i = 0; i < boost::size(resourceSearchList); ++i) {
-+ for (unsigned int i = 0; i < boost::size(resourceSearchList); ++i) {
- ResourcePrivilegeCacheEntry* entry =
_lookupEntry(resourceSearchList[i]);
- if (NULL == entry)
- continue;
---- mongodb-2.4.6.orig/src/mongo/db/cmdline_test.cpp
-+++ mongodb-2.4.6/src/mongo/db/cmdline_test.cpp
-@@ -71,7 +71,7 @@ namespace {
- "KEEP",
- "--servicePasswordFake=KEEP"
- };
-- const int argc = boost::size(argv);
-+ const unsigned int argc = boost::size(argv);
- testCensoringArgv(argv, argv, argc);
- }
-
-@@ -88,7 +88,7 @@ namespace {
- "--servicePassword",
- "get out of dodge"
- };
-- const int argc = boost::size(argv);
-+ const unsigned int argc = boost::size(argv);
-
- const char* const expected[] = {
- "first",
-@@ -120,7 +120,7 @@ namespace {
- "-servicePassword",
- "get out of dodge"
- };
-- const int argc = boost::size(argv);
-+ const unsigned int argc = boost::size(argv);
-
- const char* const expected[] = {
- "first",
-@@ -152,7 +152,7 @@ namespace {
- "KEEP",
- "--servicePasswordFake=KEEP"
- };
-- const int argc = boost::size(argv);
-+ const unsigned int argc = boost::size(argv);
- testCensoringVector(argv, argv, argc);
- }
-
-@@ -169,7 +169,7 @@ namespace {
- "--servicePassword",
- "get out of dodge"
- };
-- const int argc = boost::size(argv);
-+ const unsigned int argc = boost::size(argv);
-
- const char* const expected[] = {
- "first",
-@@ -201,7 +201,7 @@ namespace {
- "-servicePassword",
- "get out of dodge"
- };
-- const int argc = boost::size(argv);
-+ const unsigned int argc = boost::size(argv);
-
- const char* const expected[] = {
- "first",
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
index e4edb15..66a0a04 100644
--- a/database/mongodb/scons.patch
+++ b/database/mongodb/scons.patch
@@ -1,6 +1,6 @@
---- SConstruct.orig 2014-08-22 01:56:32.000000000 +0400
-+++ SConstruct 2014-09-27 15:28:11.496080339 +0400
-@@ -704,7 +704,6 @@
+--- SConstruct.orig 2015-05-03 20:26:13.324176663 -0400
++++ SConstruct 2015-05-03 20:35:06.104098160 -0400
+@@ -1007,7 +1007,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",
@@ -8,27 +8,22 @@
"-pthread",
"-Wall",
"-Wsign-compare",
-@@ -719,9 +718,10 @@
- env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp
is faster than gcc's
+@@ -1020,7 +1019,8 @@
+ env.Append( CCFLAGS=["-Werror"] )

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( LINKFLAGS=["-fPIC", "-pthread"] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent
libraries at program
+@@ -1038,7 +1038,7 @@
+ if not darwin:
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
- env.Append( LIBS=[] )
+ env.Append( LIBS=['pcre', 'pcrecpp'] )

#make scons colorgcc friendly
for key in ('HOME', 'TERM'):
---- src/mongo/SConscript.orig 2014-08-22 01:56:32.000000000 +0400
-+++ src/mongo/SConscript 2014-09-27 18:24:40.903897125 +0400
-@@ -456,7 +456,7 @@
- env.Library('stacktrace', 'util/stacktrace.cpp')
-
- env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp',
-- LIBDEPS=['stacktrace',
-+ LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools',
- '$BUILD_DIR/mongo/base/base'])
-
- serverOnlyFiles += mmapFiles



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d21b663522e567b9a5c1ac6f1efebab6299e7bdd), Pavel Vinogradov, 05/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page