dspam: => 3.10.0

7 files changed, 80 insertions, 36 deletions

diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index aeba885bf7..3edbe134d8 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -4,6 +4,7 @@ OPTS="--with-dspam-home=$INSTALL_ROOT/var/spool/dspam \
      --with-dspam-group=dspam \
 --with-dspam-home-group=dspam \
           --with-logdir=$INSTALL_ROOT/var/log/dspam \
+              --disable-mysql4-initialization \
                         $DSPAM_OPTS \
                         $OPTS" &&
 
@@ -27,9 +28,9 @@ fi &&
 OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&
 
 case "$DSPAM_SCALE" in
-  "none") ;;
-  "Large Scale") OPTS="$OPTS --enable-large-scale" ;;
-  "Domain Scale") OPTS="$OPTS --enable-domain-scale" ;;
+  "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" ;;
 esac  &&
 
 default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 88bc89cb13..6a7647abed 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -1,16 +1,46 @@
 config_query DSPAM_GD     'Use gd for pretty graphs?' n  &&
 
 config_query_option DSPAM_OPTS 'Enable debug mode?' n \
-             '--enable-debug' '--disable-debug' &&
+                               '--enable-debug --enable-bnr-debug' \
+                               '--disable-debug --disable-bnr-debug' &&
+
+if list_find "$DSPAM_OPTS" "--enable-debug"; then
+  config_query_option DSPAM_OPTS 'Enable verbose debug mode?' n \
+                                 '--enable-verbose-debug' \
+                                 '--disable-verbose-debug'
+else
+  DSPAM_OPTS="--disable-verbose-debug $DSPAM_OPTS"
+fi &&
+
 config_query_option DSPAM_OPTS 'Enable daemon mode?' y \
-             '--enable-daemon' '--disable-daemon' &&
+                               '--enable-daemon' \
+                               '--disable-daemon' &&
+
 config_query_option DSPAM_OPTS 'Enable preferences extension?' y \
-             '--enable-preferences-extension' '--disable-preferences-extension' &&
+                               '--enable-preferences-extension' \
+                               '--disable-preferences-extension' &&
+
+config_query_option DSPAM_OPTS 'Enable trusted user security?' y \
+                               '--enable-trusted-user-security' \
+                               '--disable-trusted-user-security' &&
+
 config_query_option DSPAM_OPTS 'Enable split configuration file support?' y \
-             '--enable-split-configuration' '--disable--split-configuration' &&
+                               '--enable-split-configuration' \
+                               '--disable--split-configuration' &&
+
 config_query_option DSPAM_OPTS 'Enable long usernames?' y \
-             '--enable-long-usernames' '--disable-long-usernames' &&
+                               '--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:'\
-             'None'         \
-             'Domain Scale' \
-             'Large Scale'
+                              'None'         \
+                              'Domain Scale' \
+                              'Large Scale'
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index c7d9310658..103b2d501a 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -6,22 +6,25 @@ optional_depends MAIL-TRANSPORT-AGENT \
 optional_depends db \
                  '' \
                  '' \
-                 'Enable DB driver' &&
+                 'Enable DB storage driver' &&
+
 optional_depends sqlite \
                  '' \
                  '' \
-                 'Enable SQLite driver' &&
+                 'Enable SQLite storage driver' &&
+
 optional_depends MYSQL \
                  '--with-mysql-includes=/usr/include/mysql' \
                  '' \
-                 'Enable MYSQL driver' &&
+                 'Enable MYSQL storage driver' &&
+
 optional_depends postgresql \
                  '--with-pgsql-includes=/usr/include/postgresql' \
                  '' \
-                 'Enable PostgreSQL driver' &&
+                 'Enable PostgreSQL storage driver' &&
 
 if is_depends_enabled $SPELL postgresql ||
-   is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
+  is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
   config_query_option DSPAM_OPTS "Enable virtual users?" n \
                                  "--enable-virtual-users" \
                                  "--disable-virtual-users"
@@ -35,16 +38,18 @@ if [[ "$DSPAM_GD"  == y ]]; then
   depends gd-text       &&
   depends perl-cgi; 
 fi                      &&
+
 optional_depends openldap \
-                 '--enable-external-lookup --enable-ldap' \
-                 '--disable-ldap' \
+                 '--enable-external-lookup' \
+                 '--disable-external-lookup' \
                  'for LDAP support' &&
+
 optional_depends clamav \
                  '--enable-clamav' \
                  '--disable-clamav' \
                  'for virus detection' &&
+
 optional_depends SYSTEM-LOGGER \
                  '--enable-syslog' \
                  '--disable-syslog' \
                  'for logging through syslog'
-
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 0563d5967b..d51ae2d9cb 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -1,10 +1,10 @@
            SPELL=dspam
 if [[ $DSPAM_BRANCH == scm ]]; then
-if [[ $DSPAM_SCM_AUTO == y ]]; then
+  if [[ $DSPAM_SCM_AUTO == y ]]; then
          VERSION=$(date +%Y%m%d)
-else
+  else
          VERSION=scm
-fi
+  fi
           SOURCE="${SPELL}-git.tar.bz2"
    SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam:dspam-scm
    SOURCE_IGNORE=volatile
@@ -17,19 +17,20 @@ elif [[ $DSPAM_BRANCH == devel ]]; then
      SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 else
-         VERSION=3.9.0
-      PATCHLEVEL=1
+         VERSION=3.10.0
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-     SOURCE_HASH=sha512:9208e973855e4527802603570ae7a8fbdafe9c4a40aaa55eda91810d98c13a234e1e1f681c9a219869fbb58c5be10d908d8a974d63d75dab965641b29ef557e6
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=dspam.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE="http://dspam.sourceforge.net/"
             DOCS="$DOCS RELEASE.NOTES UPGRADING"
-      LICENSE[0]='GPL'
-      PATCHLEVEL=0
+      LICENSE[0]='AGPL'
         KEYWORDS="email mail spam filter"
-           SHORT='A server-side anti-spam agent for UNIX email servers'
+           SHORT='server-side anti-spam agent for UNIX email servers'
 cat << EOF
 DSPAM is a scalable and open-source content-based spam filter designed for 
 multi-user enterprise systems. On a properly configured system, many users 
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 567ada00be..1c99ad11fc 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,12 @@
+2011-08-04 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 3.10.0; converted to upstream gpg checking;
+	  changed license to AGPL; readability++
+	* BUILD: added missing configure options
+	* CONFIGURE: added missing configure options; readability++
+	* DEPENDS: corrected flags for current dependencies
+	* PREPARE: readability++
+	* dspam.gpg: added
+
 2011-01-31 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: added mta optional dependencies
 	* BUILD: use loyal rights if compiled with mta support
diff --git a/mail/dspam/PREPARE b/mail/dspam/PREPARE
index 251710b24c..2dcda1ba89 100755
--- a/mail/dspam/PREPARE
+++ b/mail/dspam/PREPARE
@@ -1,12 +1,10 @@
 config_query_list DSPAM_BRANCH "What branch do you want to use?" \
-              release \
-              devel \
-              scm &&
+                               release \
+                               devel \
+                               scm &&
 
 if [[ $DSPAM_BRANCH == scm ]]; then
-if [[ $DSPAM_SCM == y ]]; then
-config_query DSPAM_SCM_AUTO \
-             "Automaticaly update the spell on sorcery queue/system-update?" \
-						 n
-fi
+  if [[ $DSPAM_SCM == y ]]; then
+    config_query DSPAM_SCM_AUTO "Automaticaly update the spell on sorcery queue/system-update?" n
+  fi
 fi
diff --git a/mail/dspam/dspam.gpg b/mail/dspam/dspam.gpg
new file mode 100644
index 0000000000..f07ff150a3
--- /dev/null
+++ b/mail/dspam/dspam.gpg