Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7b32be526f9d122251bea402df2007c5131ad440)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7b32be526f9d122251bea402df2007c5131ad440)
  • Date: Wed, 5 Oct 2011 10:25:43 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

mail/dspam/BUILD | 4 ++--
mail/dspam/CONFIGURE | 8 ++++++--
mail/dspam/DEPENDS | 5 ++++-
mail/dspam/DETAILS | 14 +++++++-------
mail/dspam/HISTORY | 9 +++++++++
mail/dspam/INSTALL | 2 ++
mail/dspam/init.d/dspam | 1 +
7 files changed, 31 insertions(+), 12 deletions(-)

New commits:
commit e6c404858f91f9a05e5d49dbc0fbace5e808a2b6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

dspam: version 3.10.1, switched off the devel version (3.9.x), made the
init script check/create the dir for the pidfile, homedir and logdir are
now configurable and default to the previous spell default (not upstream
default), added optional deps on procmail and WEBSERVER

diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index 3edbe13..9ad3fc1 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -1,9 +1,9 @@
create_account dspam &&

-OPTS="--with-dspam-home=$INSTALL_ROOT/var/spool/dspam \
+OPTS="--with-dspam-home="${DSPAM_HOME}" \
--with-dspam-group=dspam \
--with-dspam-home-group=dspam \
- --with-logdir=$INSTALL_ROOT/var/log/dspam \
+ --with-logdir="${DSPAM_LOG}" \
--disable-mysql4-initialization \
$DSPAM_OPTS \
$OPTS" &&
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 6751c48..1c492cc 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -28,7 +28,7 @@ config_query_option DSPAM_OPTS 'Enable split configuration
file support?' y \
'--enable-split-configuration' \
'--disable-split-configuration' &&

-config_query_option DSPAM_OPTS 'Enable long usernames?' y \
+config_query_option DSPAM_OPTS 'Enable long usernames? (defaults to system
length)' y \
'--enable-long-usernames' \
'--disable-long-usernames' &&

@@ -43,4 +43,8 @@ config_query_option DSPAM_OPTS 'Enable performance
profiling?' n \
config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
'None' \
'Domain Scale' \
- 'Large Scale'
+ 'Large Scale' &&
+# the next 2 queries use the previous spell defaults instead of the upstream
+# default, to make sure the spell does not disrupt anything
+config_query_string DSPAM_HOME 'which home directory for dspam?'
'/var/spool/dspam'
+config_query_string DSPAM_LOG 'which log directory for dspam?'
'/var/log/dspam'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 103b2d5..ac3b72f 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -52,4 +52,7 @@ optional_depends clamav \
optional_depends SYSTEM-LOGGER \
'--enable-syslog' \
'--disable-syslog' \
- 'for logging through syslog'
+ 'for logging through syslog' &&
+
+optional_depends procmail '' '' 'for the default TrustedDeliveryAgent'
+optional_depends WEBSERVER '' '' 'for the web interface'
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index d51ae2d..73c8b52 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -10,14 +10,14 @@ if [[ $DSPAM_BRANCH == scm ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
-elif [[ $DSPAM_BRANCH == devel ]]; then
- VERSION=3.9.1-RC1
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+#elif [[ $DSPAM_BRANCH == devel ]]; then
+# VERSION=3.9.1-RC1
+# SOURCE="${SPELL}-${VERSION}.tar.gz"
+# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+#
SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
+#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=3.10.0
+ VERSION=3.10.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index c7f11c0..74167d1 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,12 @@
+2011-10-05 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.10.1 and commented out the devel version as the
+ release version was more recent anyway
+ * init.d/dspam: check for and create dir for pidfile as [/var]/run is
+ supposed to be on a tmpfs these days
+ * BUILD,CONFIGURE,INSTALL: made the homedir and logdir configurable so
+ the default config actually works
+ * DEPENDS: added optional deps on WEBSERVER and procmail
+
2011-08-20 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE: fixed typo

diff --git a/mail/dspam/INSTALL b/mail/dspam/INSTALL
index d0e03d1..4eecf20 100755
--- a/mail/dspam/INSTALL
+++ b/mail/dspam/INSTALL
@@ -1,3 +1,5 @@
+install -d -o dspam -g dspam -vm 770 "${INSTALL_ROOT}/${DSPAM_HOME}" &&
+install -d -o dspam -g dspam -vm 770 "${INSTALL_ROOT}/${DSPAM_LOG}" &&
default_install &&
# needed if one wants to build anything with it afterwards
cp src/pref.h ${INSTALL_ROOT}/usr/include/dspam/ &&
diff --git a/mail/dspam/init.d/dspam b/mail/dspam/init.d/dspam
index 4a48b32..f6fdfd5 100755
--- a/mail/dspam/init.d/dspam
+++ b/mail/dspam/init.d/dspam
@@ -11,6 +11,7 @@ NEEDS="+remote_fs +network"
start() {
echo "Starting $NAME..."

+ [[ -d /var/run/dspam ]] || mkdir -p /var/run/dspam
su root -c "$PROGRAM $ARGS"
evaluate_retval
}



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7b32be526f9d122251bea402df2007c5131ad440), Arjan Bouter, 10/05/2011

Archive powered by MHonArc 2.6.24.

Top of Page