[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9a072300b9e5286c97b9915027a522e3bd893a47)

Vlad Glagolev scm at sourcemage.org
Thu Mar 8 09:14:58 EST 2012


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

 mail/dspam/BUILD   |    3 +++
 mail/dspam/DEPENDS |   15 +++++++++++----
 mail/dspam/HISTORY |    4 ++++
 3 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 9a072300b9e5286c97b9915027a522e3bd893a47
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dspam: added sqlite2 storage driver

diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index 24147d4..a442fdf 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -16,6 +16,9 @@ STORAGE_DRIVERS='hash_drv' &&
 if is_depends_enabled $SPELL sqlite ; then
 STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
 fi &&
+if is_depends_enabled $SPELL sqlite2 ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite_drv"
+fi &&
 if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
 STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv"
 fi &&
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 0b97eba..4d5da68 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -3,10 +3,17 @@ optional_depends MAIL-TRANSPORT-AGENT \
                  '' \
                  'Enable delivery agent support' &&
 
-optional_depends sqlite \
-                 '' \
-                 '' \
-                 'Enable SQLite storage driver' &&
+if ! list_find "$DSPAM_OPTS" "--enable-daemon"; then
+  optional_depends sqlite \
+                   '' \
+                   '' \
+                   'Enable SQLite storage driver' &&
+
+  optional_depends sqlite2 \
+                   '' \
+                   '' \
+                   'Enable SQLite2 storage driver'
+fi &&
 
 optional_depends MYSQL \
                  '--with-mysql-includes=/usr/include/mysql' \
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index c847fcc..713e0b3 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,7 @@
+2012-03-08 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: added sqlite2 storage driver
+	* DEPENDS: non-thread-safe storage drivers are not allowed in daemon mode
+
 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


More information about the SM-Commit mailing list