Skip to Content.
Sympa Menu

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

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 (94b875876f13783c47f7b54484b6a838ae5a0890)
  • Date: Tue, 6 Mar 2012 07:40:21 -0600

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

mail/dspam/BUILD | 9 +++------
mail/dspam/CONFIGURE | 16 +++++++++++-----
mail/dspam/DEPENDS | 5 -----
mail/dspam/HISTORY | 7 +++++++
4 files changed, 21 insertions(+), 16 deletions(-)

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

dspam: corrected several issues

diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index 9ad3fc1..24147d4 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -16,9 +16,6 @@ STORAGE_DRIVERS='hash_drv' &&
if is_depends_enabled $SPELL sqlite ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
fi &&
-if is_depends_enabled $SPELL db ; then
-STORAGE_DRIVERS="$STORAGE_DRIVERS,libdb4_drv"
-fi &&
if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv"
fi &&
@@ -28,9 +25,9 @@ fi &&
OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&

case "$DSPAM_SCALE" in
- "none") OPTS="--disable-large-scale --disable-domain-scale" ;;
- "Large Scale") OPTS="$OPTS --enable-large-scale --disable-domain-scale" ;;
- "Domain Scale") OPTS="$OPTS --enable-domain-scale --disable-large-scale" ;;
+ "None") OPTS="--disable-large-scale --disable-domain-scale $OPTS" ;;
+ "Large Scale") OPTS="--enable-large-scale --disable-domain-scale $OPTS" ;;
+ "Domain Scale") OPTS="--enable-domain-scale --disable-large-scale $OPTS" ;;
esac &&

default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 1c492cc..e6d0aa0 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -32,18 +32,24 @@ config_query_option DSPAM_OPTS 'Enable long usernames?
(defaults to system lengt
'--enable-long-usernames' \
'--disable-long-usernames' &&

-config_query_option DSPAM_OPTS 'Enable home directory filesystem storage
driver?' n \
- '--enable-homedir' \
- '--disable-homedir' &&
-
config_query_option DSPAM_OPTS 'Enable performance profiling?' n \
'--enable-profiling' \
'--disable-profiling' &&

-config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
+config_query_list DSPAM_SCALE 'Select a filesystem organization method:' \
'None' \
'Domain Scale' \
'Large Scale' &&
+
+if [[ $DSPAM_SCALE == None ]]; then
+ config_query_option DSPAM_OPTS 'Enable home directory filesystem storage
driver?' n \
+ '--enable-homedir' \
+ '--disable-homedir'
+else
+ list_add "DSPAM_OPTS" "--disable-homedir" &&
+ list_remove "DSPAM_OPTS" "--enable-homedir"
+fi &&
+
# 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'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index ac3b72f..0b97eba 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -3,11 +3,6 @@ optional_depends MAIL-TRANSPORT-AGENT \
'' \
'Enable delivery agent support' &&

-optional_depends db \
- '' \
- '' \
- 'Enable DB storage driver' &&
-
optional_depends sqlite \
'' \
'' \
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index b509864..c847fcc 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,10 @@
+2012-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: corrected typo ('none' -> 'None'), fixed OPTS joining; moved
+ OPTS to the end of lines; removed deprecated db4 driver
+ * DEPENDS: dropped deprecated db dependency
+ * CONFIGURE: resolved conflict with home-dir vs. large || domain
scale,
+ fixes build with specific setups
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (94b875876f13783c47f7b54484b6a838ae5a0890), Vlad Glagolev, 03/06/2012

Archive powered by MHonArc 2.6.24.

Top of Page