Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2527fd3449bb43cd46578e9282ff1db10149bcf6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2527fd3449bb43cd46578e9282ff1db10149bcf6)
  • Date: Sat, 27 Sep 2014 10:38:57 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

database/mongodb/DETAILS | 4 +-
database/mongodb/HISTORY | 10 ++++--
database/mongodb/PRE_BUILD | 1
database/mongodb/intsign.patch | 67
+++++++++++++++++++++++++++++++++++++++++
database/mongodb/scons.patch | 26 +++++++++------
5 files changed, 94 insertions(+), 14 deletions(-)

New commits:
commit 2527fd3449bb43cd46578e9282ff1db10149bcf6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mongodb: => 2.4.11

diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index fa29f03..a0096f1 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,10 +1,10 @@
SPELL=mongodb
- VERSION=2.4.10
+ VERSION=2.4.11
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:970364dda2dba18bf979a0fc8291d9656b3cc3ba0aec1ca26d81f14f833e355c023d19b3cfaa81704013bf2c0e732d72de08b0f8236dafe85a3ac4d51b87edc6
+
SOURCE_HASH=sha512:a132275b7d0be357958d4bffaa8d8b660df1812811e8b94b1482906d1cf4567f6b6f13c77dcdf6dea38c56f54fe4b462a41379185c04c9eb5661848b80e40106
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 17b8400..63156e7 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,5 +1,11 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2014-09-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.11
+ * PRE_BUILD: apply new patch
+ * scons.patch: adapted for new version
+ * intsign.patch: added, backported from Debian to fix build
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4.10
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index 9357ab2..79e40d7 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -3,5 +3,6 @@ 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/intsign.patch b/database/mongodb/intsign.patch
new file mode 100644
index 0000000..bd02e4d
--- /dev/null
+++ b/database/mongodb/intsign.patch
@@ -0,0 +1,67 @@
+--- 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 94dbc05..e4edb15 100644
--- a/database/mongodb/scons.patch
+++ b/database/mongodb/scons.patch
@@ -1,6 +1,6 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -702,7 +702,6 @@
+--- SConstruct.orig 2014-08-22 01:56:32.000000000 +0400
++++ SConstruct 2014-09-27 15:28:11.496080339 +0400
+@@ -704,7 +704,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,17 +8,12 @@
"-pthread",
"-Wall",
"-Wsign-compare",
-@@ -710,14 +709,14 @@
- "-Winvalid-pch"] )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux:
-- env.Append( CCFLAGS=["-Werror", "-pipe"] )
- if not has_option('clang'):
+@@ -719,9 +718,10 @@
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( CXXFLAGS=os.environ['CXXFLAGS'] )
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
- env.Append( LIBS=[] )
@@ -26,3 +21,14 @@

#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 Vlad Glagolev (2527fd3449bb43cd46578e9282ff1db10149bcf6), Vlad Glagolev, 09/27/2014

Archive powered by MHonArc 2.6.24.

Top of Page