Skip to Content.
Sympa Menu

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

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 (87a0631c567211def3077079bed4db076648efbe)
  • Date: Thu, 20 Jan 2011 12:24:26 -0600

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

mail/dspam/BUILD | 6 +++++-
mail/dspam/DETAILS | 1 +
mail/dspam/HISTORY | 6 ++++++
mail/dspam/INSTALL | 4 ++++
mail/dspam/init.d/dspam | 22 +++++++---------------
5 files changed, 23 insertions(+), 16 deletions(-)

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

dspam: corrected some paths and init script

diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index c531333..db581cf 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -1,4 +1,8 @@
-OPTS="$DSPAM_OPTS $OPTS" &&
+OPTS="--with-dspam-home=$INSTALL_ROOT/var/spool/dspam \
+ --with-logdir=$INSTALL_ROOT/var/log/dspam \
+ $DSPAM_OPTS \
+ $OPTS" &&
+
STORAGE_DRIVERS='hash_drv' &&
if is_depends_enabled $SPELL sqlite ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index d2fe513..0563d59 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -18,6 +18,7 @@ elif [[ $DSPAM_BRANCH == devel ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
VERSION=3.9.0
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_HASH=sha512:9208e973855e4527802603570ae7a8fbdafe9c4a40aaa55eda91810d98c13a234e1e1f681c9a219869fbb58c5be10d908d8a974d63d75dab965641b29ef557e6
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index f7b52a6..c02a0d8 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,9 @@
+2011-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: use correct db paths
+ * INSTALL: install pid dir for init script
+ * init.d/dspam: rewritten, to handle a pid file right way
+
2010-09-30 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated stable to 3.9.0, added devel 3.9.1-RC1, modified
scm
to use a SCM specific tarball so that any SCM migration by upstream
won't
diff --git a/mail/dspam/INSTALL b/mail/dspam/INSTALL
index 70bba0d..3547603 100755
--- a/mail/dspam/INSTALL
+++ b/mail/dspam/INSTALL
@@ -15,4 +15,8 @@ fi &&
if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
mkdir -vp ${INSTALL_ROOT}/usr/share/doc/dspam/mysql &&
install -vD src/tools.mysql_drv/*.sql
${INSTALL_ROOT}/usr/share/doc/dspam/mysql/
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install -d -o root -g mail -vm 755 "$INSTALL_ROOT/var/run/dspam"
fi
diff --git a/mail/dspam/init.d/dspam b/mail/dspam/init.d/dspam
index 31fbeed..4a48b32 100755
--- a/mail/dspam/init.d/dspam
+++ b/mail/dspam/init.d/dspam
@@ -1,24 +1,16 @@
#!/bin/bash

-PROGRAM="/bin/true"
-NAME="dspam"
+PROGRAM="/usr/bin/dspam"
+ARGS="--daemon > /dev/null 2>&1 &"
RUNLEVEL=3
+PIDFILE="/var/run/dspam/dspam.pid"
NEEDS="+remote_fs +network"
-PIDFILE=/var/run/dspam.pid

. /etc/init.d/smgl_init

-start()
-{
- echo "Starting dspam..."
- /usr/bin/dspam --daemon &
- ps -C dspam > /dev/null
- evaluate_retval
-}
+start() {
+ echo "Starting $NAME..."

-stop()
-{
- echo "stopping dspam..."
- kill $(cat ${PIDFILE})
- evaluate_retval
+ su root -c "$PROGRAM $ARGS"
+ evaluate_retval
}



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (87a0631c567211def3077079bed4db076648efbe), Vlad Glagolev, 01/20/2011

Archive powered by MHonArc 2.6.24.

Top of Page