Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	libre/icecat/PKGBUILD
	multilib/lib32-v4l-utils/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD
	testing/libreoffice/PKGBUILD

4 files changed, 17 insertions, 17 deletions

diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index fe2cac7f9..50a62916a 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mongodb
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
@@ -18,8 +18,8 @@ source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc'
         'mongodb.conf')
 md5sums=('951fb1a75d90fc822cf4528585a970cf'
-         '859f8f9bb32ef2bd21fec55ae9a87d0a'
-         '9e0ea3f96732bb7811f0b64dace56440')
+         '85eaa28e349fdc6250f883624e624cca'
+         '4839fe1d638187ca3226e8267b947318')
 
 build() {
   export SCONSFLAGS="$MAKEFLAGS"
@@ -43,7 +43,8 @@ package() {
     ${pkgdir}/etc/rc.d/mongodb
   install -D -m644 ${srcdir}/mongodb.conf \
     ${pkgdir}/etc/mongodb.conf
-  install -d -m700 ${pkgdir}/var/state/mongodb
+  install -d -m700 ${pkgdir}/var/lib/mongodb
+  install -d -m755 ${pkgdir}/var/log/mongodb
 
   if [ -d ${pkgdir}/usr/lib64 ]; then
     mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
diff --git a/community/mongodb/mongodb.conf b/community/mongodb/mongodb.conf
index 60d73eae8..c5272b7f2 100644
--- a/community/mongodb/mongodb.conf
+++ b/community/mongodb/mongodb.conf
@@ -3,4 +3,6 @@
 
 bind_ip = 127.0.0.1
 quiet = true
-dbpath = /var/state/mongodb
+dbpath = /var/lib/mongodb
+logpath = /var/log/mongodb/mongod.log
+logappend = true
diff --git a/community/mongodb/mongodb.install b/community/mongodb/mongodb.install
index 152f36515..9e13a4d14 100755
--- a/community/mongodb/mongodb.install
+++ b/community/mongodb/mongodb.install
@@ -4,28 +4,25 @@ show_msg(){
     if [ "$(arch)" != "x86_64" ]
     then
         cat <<END
-###########################################################################
-# Warning: the 32 bit version of MongoDB is limited to about 2GB of data. #
-# See http://blog.mongodb.org/post/137788967/32-bit-limitations           #
-###########################################################################
+==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.
+==> See http://blog.mongodb.org/post/137788967/32-bit-limitations
 END
     fi
 }
 
 post_install() {
-  useradd -r -g daemon -d /var/state/mongodb -s /bin/false mongodb
-  chown -R mongodb:daemon /var/state/mongodb
+  useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
+  chown -R mongodb:daemon /var/lib/mongodb
+  chown -R mongodb:daemon /var/log/mongodb
 
   show_msg
 }
 
 post_upgrade() {
-  chown -R mongodb:daemon /var/state/mongodb
-
-  show_msg
+  chown -R mongodb:daemon /var/lib/mongodb
+  chown -R mongodb:daemon /var/log/mongodb
 }
 
 pre_remove() {
-    /etc/rc.d/mongodb stop
-    userdel mongodb
+  userdel mongodb
 }
diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc
index b808a2fb0..517258f63 100755
--- a/community/mongodb/mongodb.rc
+++ b/community/mongodb/mongodb.rc
@@ -8,7 +8,7 @@ PID=`pidof /usr/bin/mongod`
 case "$1" in
   start)
     stat_busy "Starting mongodb"
-    [ -z "$PID" ] && /bin/su mongodb -s /bin/bash -c "/usr/bin/mongod --config /etc/mongodb.conf &" > /var/log/mongod 2>&1
+    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else