Skip to Content.
Sympa Menu

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

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 (f611fe4b1665ac3ba979f1e5e91679e26feee662)
  • Date: Sun, 6 Apr 2014 16:47:56 -0500

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

database/mongodb/BUILD | 18 +++++++++++++++---
database/mongodb/CONFIGURE | 11 +++++++++++
database/mongodb/DEPENDS | 21 +++++++++++++++++++--
database/mongodb/DETAILS | 7 ++++---
database/mongodb/FINAL | 5 +++++
database/mongodb/HISTORY | 14 ++++++++++++++
database/mongodb/INSTALL | 5 +++--
database/mongodb/PRE_BUILD | 5 +++--
database/mongodb/fips.patch | 21 +++++++++++++++++++++
database/mongodb/init.d/mongodb | 7 +++++++
database/mongodb/init.d/mongodb.conf | 4 +++-
database/mongodb/init.d/mongos | 21 +++++++++++++++++++++
database/mongodb/scons.patch | 28 ++++++++++++++++++++++++++++
dev/null |binary
mail/postfix/DETAILS | 2 +-
mail/postfix/HISTORY | 3 +++
16 files changed, 158 insertions(+), 14 deletions(-)

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

postfix: => 2.9.9

commit 8f50fd64ccde010ce6a65f1036d1d107da951069
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mongodb: => 2.4.10

diff --git a/database/mongodb/BUILD b/database/mongodb/BUILD
index 2b10b63..73c97d7 100755
--- a/database/mongodb/BUILD
+++ b/database/mongodb/BUILD
@@ -1,6 +1,18 @@
create_account mongodb &&

-# use bundled spidermonkey, 2.2 will switch to V8
-OPTS="--sharedclient --usesm $OPTS" &&
+if ! list_find "$LDFLAGS" "-s"; then
+ OPTS="--nostrip $OPTS"
+fi &&

-scons --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
+case $MONGODB_JSE in
+ v8)
+ OPTS="--usev8 $OPTS"
+ ;;
+ spidermonkey)
+ OPTS="--usesm $OPTS"
+ ;;
+esac &&
+
+OPTS="--mongod-concurrency-level=$MONGODB_CCL $MONGODB_OPTS $OPTS" &&
+
+scons all --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
diff --git a/database/mongodb/CONFIGURE b/database/mongodb/CONFIGURE
new file mode 100755
index 0000000..7614005
--- /dev/null
+++ b/database/mongodb/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_list MONGODB_CCL "Choose mongod concurrency level:" \
+ db \
+ global &&
+
+config_query_list MONGODB_JSE "Choose JavaScript engine to use:" \
+ v8 \
+ spidermonkey &&
+
+config_query_option MONGODB_OPTS "Build shared client?" y \
+ "--sharedclient" \
+ ""
diff --git a/database/mongodb/DEPENDS b/database/mongodb/DEPENDS
index 0dd5739..fcbdf9f 100755
--- a/database/mongodb/DEPENDS
+++ b/database/mongodb/DEPENDS
@@ -1,7 +1,24 @@
-depends -sub CXX gcc &&
depends scons &&
depends readline &&
-depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost &&
+depends -sub CXX gcc &&
+depends -sub CPP pcre '--use-system-pcre' &&
+depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost '--use-system-boost'
&&
+
+optional_depends google-perftools \
+ "--use-system-tcmalloc" \
+ "" \
+ "to use system version of tcmalloc library" &&
+
+optional_depends snappy \
+ "--use-system-snappy" \
+ "" \
+ "to use system version of snappy library" &&
+
+optional_depends LIBSASL \
+ "--use-sasl-client" \
+ "" \
+ "for SASL authentication in the client library" &&

optional_depends openssl "--ssl" "" "for OpenSSL support" &&
+optional_depends libpcap "" "" "to build mongosniff utility" &&
optional_depends distcc "--distcc" "" "to use distcc for distributing builds"
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index f6f1fec..fa29f03 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,9 +1,10 @@
SPELL=mongodb
- VERSION=2.0.9
+ VERSION=2.4.10
SECURITY_PATCH=1
SOURCE=$SPELL-src-r$VERSION.tar.gz
- SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:5c7504bcc0f58999424c8bed5e43b7649b812bc2009fa251118442cd072e5cef08eaec4d3a45ad387eceaa79d0b336c58939a1b8f6e5b4566b0f745254844030
+ SOURCE_URL[0]=http://fastdl.mongodb.org/src/$SOURCE
+ SOURCE_URL[1]=http://downloads.mongodb.org/src/$SOURCE
+
SOURCE_HASH=sha512:970364dda2dba18bf979a0fc8291d9656b3cc3ba0aec1ca26d81f14f833e355c023d19b3cfaa81704013bf2c0e732d72de08b0f8236dafe85a3ac4d51b87edc6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/FINAL b/database/mongodb/FINAL
new file mode 100755
index 0000000..86fab5a
--- /dev/null
+++ b/database/mongodb/FINAL
@@ -0,0 +1,5 @@
+message "${PROBLEM_COLOR}"
+message "WARNING: don't forget to run mongod and mongos with '--upgrade'"
+message "flag to upgrade db and meta data version on updates of MongoDB"
+message "major branch versions (e.g. 2.2.* -> 2.4.*)."
+message "${DEFAULT_COLOR}"
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 2e6dc88..2565e94 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,17 @@
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.10
+ * DEPENDS: added missing dependencies
+ * CONFIGURE: added, to select between js engines and concurrency
levels
+ * PRE_BUILD: sed -i -> sedit
+ * INSTALL: install run dir for mongos daemon
+ * FINAL: added, notify SA about spell branch updates
+ * init.d/mongodb: added stop() for clean shutdown
+ * init.d/mongos: added, init script for mongos (sharding daemon)
+ * fips.patch: added, to fix build against OpenSSL without FIPS support
+ (official patch 51a0bf4)
+ * scons.patch: added, to respect CXX/LD flags
+ * boost150.patch.gz: dropped, fixed by upstream
+
2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply patch
* boost150.patch.gz: added, to fix build with boost 1.50+
diff --git a/database/mongodb/INSTALL b/database/mongodb/INSTALL
index 50a5204..af039c1 100755
--- a/database/mongodb/INSTALL
+++ b/database/mongodb/INSTALL
@@ -1,8 +1,9 @@
-scons --prefix="$INSTALL_ROOT/usr" --full install &&
+scons install --prefix="$INSTALL_ROOT/usr" --full $OPTS &&

if [[ $INIT_INSTALLED ]]; then
install_config_file "$SPELL_DIRECTORY/init.d/mongodb.conf" \
"$INSTALL_ROOT/etc/sysconfig/mongodb"
fi &&

-install -d -o mongodb -g mongodb -vm 755 "$INSTALL_ROOT/var/run/mongod"
+install -d -o mongodb -g mongodb -vm 755 "$INSTALL_ROOT/var/run/mongod" \
+ "$INSTALL_ROOT/var/run/mongos"
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index ff92c07..9357ab2 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-zcat "$SPELL_DIRECTORY/boost150.patch.gz" | patch -p1 &&
+patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/fips.patch" &&

-sed -i "s:lib64:lib:g" SConstruct
+sedit "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/boost150.patch.gz
b/database/mongodb/boost150.patch.gz
deleted file mode 100644
index 24fbd28..0000000
Binary files a/database/mongodb/boost150.patch.gz and /dev/null differ
diff --git a/database/mongodb/fips.patch b/database/mongodb/fips.patch
new file mode 100644
index 0000000..c0da948
--- /dev/null
+++ b/database/mongodb/fips.patch
@@ -0,0 +1,21 @@
+--- 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/init.d/mongodb b/database/mongodb/init.d/mongodb
index a4c4457..386518f 100755
--- a/database/mongodb/init.d/mongodb
+++ b/database/mongodb/init.d/mongodb
@@ -18,4 +18,11 @@ start() {
evaluate_retval
}

+stop() {
+ echo "Stopping $NAME..."
+
+ su mongodb -s /bin/sh -c "$PROGRAM $ARGS --shutdown"
+ evaluate_retval
+}
+
. /etc/init.d/smgl_init
diff --git a/database/mongodb/init.d/mongodb.conf
b/database/mongodb/init.d/mongodb.conf
index b3a4479..60b6e5e 100644
--- a/database/mongodb/init.d/mongodb.conf
+++ b/database/mongodb/init.d/mongodb.conf
@@ -1,3 +1,5 @@
-# For the arguments and description see ``mongod --help''
+# For the arguments and description see ``mongod --help'' and ``mongos
--help''

MONGOD_ARGS=""
+
+MONGOS_ARGS=""
diff --git a/database/mongodb/init.d/mongos b/database/mongodb/init.d/mongos
new file mode 100755
index 0000000..2485ffd
--- /dev/null
+++ b/database/mongodb/init.d/mongos
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+. /etc/sysconfig/mongodb
+
+PROGRAM=/usr/bin/mongos
+PIDFILE=/var/run/mongos/mongos.pid
+ARGS="-f /etc/mongos.conf --pidfilepath $PIDFILE --fork $MONGOS_ARGS"
+RUNLEVEL=3
+NEEDS="+network"
+
+start() {
+ echo "Starting $NAME..."
+
+ # needs C locale on startup
+ export LC_ALL="C"
+
+ su mongodb -s /bin/sh -c "$PROGRAM $ARGS"
+ evaluate_retval
+}
+
+. /etc/init.d/smgl_init
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
new file mode 100644
index 0000000..94dbc05
--- /dev/null
+++ b/database/mongodb/scons.patch
@@ -0,0 +1,28 @@
+--- SConstruct.orig
++++ SConstruct
+@@ -702,7 +702,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",
+@@ -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'):
+ 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'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 2895678..5e33523 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -4,7 +4,7 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then
VERSION=2.9-20110615
PFIX_BRANCH=experimental
else
- VERSION=2.9.8
+ VERSION=2.9.9
PFIX_BRANCH=official
SECURITY_PATCH=1
fi
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 2e811a3..3806fdb 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.9
+
2013-09-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.8




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f611fe4b1665ac3ba979f1e5e91679e26feee662), Vlad Glagolev, 04/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page