[SM-Commit] GIT changes to master grimoire by Andraž Levstik (7ea0a48bdbe339a7e0671e8f86a6011fb2140524)

Andraž Levstik scm at sourcemage.org
Sat Oct 2 05:12:58 EDT 2010


GIT changes to master grimoire by Andraž Levstik <ruskie+2054d253 at codemages.net>:

 mail/alpine/DETAILS  |    2 +-
 mail/alpine/HISTORY  |    3 +++
 mail/dspam/BUILD     |   28 ++++++++++++----------------
 mail/dspam/CONFIGURE |   28 ++++++++++++++++------------
 mail/dspam/DEPENDS   |   37 ++++++++++++++++++++++++++++---------
 mail/dspam/DETAILS   |   27 +++++++++++++++++----------
 mail/dspam/HISTORY   |   11 +++++++++++
 mail/dspam/INSTALL   |   21 ++++++++-------------
 mail/dspam/PREPARE   |   10 +++++++---
 mail/dspam/PRE_BUILD |    2 ++
 10 files changed, 105 insertions(+), 64 deletions(-)

New commits:
commit 7ea0a48bdbe339a7e0671e8f86a6011fb2140524
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    alpine: v2.02 released

commit 88991882151118845fd624614587e822b1cbd16c
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dspam: update to 3.9.0, added devel version, cleaning up

diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 5fd76f3..eb082a8 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -1,6 +1,6 @@
            SPELL=alpine
              PKG=re-alpine
-         VERSION=2.01
+         VERSION=2.02
           SOURCE=${PKG}-${VERSION}.tar.bz2
          SOURCE2=${PKG}-${VERSION}.tar.bz2.sig
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index 60508dc..b9826e0 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 2.02
+
 2010-08-11 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* maildir.patch.diff: no longer needed
 	* outgoing.patch.diff: no longer needed
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index e24261e..c531333 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -1,19 +1,18 @@
-OPTS="$OPTS $DSPAM_DAEMON $DSPAM_PREFS" &&
-
+OPTS="$DSPAM_OPTS $OPTS" &&
 STORAGE_DRIVERS='hash_drv' &&
-if [[ "$DSPAM_SQLITE" == y ]]; then STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"; fi &&
-if [[ "$DSPAM_DB"     == y ]]; then STORAGE_DRIVERS="$STORAGE_DRIVERS,libdb4_drv" ; fi &&
-if [[ "$DSPAM_MYSQL"  == y ]]; then 
-  STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv" &&
-  OPTS="$OPTS --with-mysql-includes=/usr/include/mysql"
+if is_depends_enabled $SPELL sqlite ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
 fi &&
-if [[ "$DSPAM_PGSQL"  == y ]]; then 
-  STORAGE_DRIVERS="$STORAGE_DRIVERS,pgsql_drv"  &&
-  OPTS="$OPTS --with-pgsql-includes=/usr/include/postgresql"
+if is_depends_enabled $SPELL db ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,libdb4_drv"
 fi &&
-OPTS="$OPTS --with-storage-driver=$STORAGE_DRIVERS" &&
-
-if [[ "$DSPAM_VIRTUAL_USERS" == 'y' ]]; then OPTS="$OPTS --enable-virtual-users" ; fi &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv"
+fi &&
+if is_depends_enabled $SPELL postgresql ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,pgsql_drv"
+fi &&
+OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&
 
 case "$DSPAM_SCALE" in
   "none") ;;
@@ -21,7 +20,4 @@ case "$DSPAM_SCALE" in
   "Domain Scale") OPTS="$OPTS --enable-domain-scale" ;;
 esac  &&
 
-# no need for $INSTALL_ROOT here
-OPTS="$OPTS --with-logdir=/var/log" &&
-
 default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index e2c9236..14e1142 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -1,18 +1,22 @@
-config_query DSPAM_SQLITE 'Enable SQLite driver?' n      &&
-config_query DSPAM_MYSQL  'Enable MySQL driver?' n       &&
-config_query DSPAM_PGSQL  'Enable PostgreSQL driver?' n  &&
 config_query DSPAM_GD     'Use gd for pretty graphs?' n  &&
 
-if [[ "$DSPAM_PGSQL" == 'y' || "$DSPAM_MYSQL" == 'y' ]] ; then
-  config_query DSPAM_VIRTUAL_USERS 'Enable virtual users?' n
+if is_depends_enabled $SPELL postgresql ||
+   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'
 fi  &&
 
-config_query_option DSPAM_DAEMON 'Enable daemon mode?' y          \
-                 '--enable-daemon' '--disable-daemon'                               &&
-config_query_option DSPAM_PREFS 'Enable preferences extension?' y \
-                 '--enable-preferences-extension' '--disable-preferences-extension' &&
+config_query_option DSPAM_OPTS 'Enable daemon mode?' y \
+             '--enable-daemon' '--disable-daemon' &&
+config_query_option DSPAM_OPTS 'Enable preferences extension?' y \
+             '--enable-preferences-extension' '--disable-preferences-extension' &&
+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 \
+             '--enable-long-usernames' '--disable-long-usernames' &&
 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 3000063..3708050 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -1,9 +1,19 @@
-depends automake &&
-
-if [[ "$DSPAM_SQLITE" == y ]]; then depends sqlite    ; fi &&
-if [[ "$DSPAM_MYSQL"  == y ]]; then depends MYSQL     ; fi &&
-if [[ "$DSPAM_PGSQL"  == y ]]; then depends postgresql; fi &&
-
+optional_depends db \
+                 '' \
+                 '' \
+                 'Enable DB driver' &&
+optional_depends sqlite \
+                 '' \
+                 '' \
+                 'Enable SQLite driver' &&
+optional_depends MYSQL \
+                 '--with-mysql-includes=/usr/include/mysql' \
+                 '' \
+                 'Enable MYSQL driver' &&
+optional_depends postgresql \
+                 '--with-pgsql-includes=/usr/include/postgresql' \
+                 '' \
+                 'Enable PostgreSQL driver' &&
 if [[ "$DSPAM_GD"  == y ]]; then
   depends gd            &&
   sub_depends gd libpng &&
@@ -12,7 +22,16 @@ if [[ "$DSPAM_GD"  == y ]]; then
   depends gd-text       &&
   depends perl-cgi; 
 fi                      &&
+optional_depends openldap \
+                 '--enable-external-lookup --enable-ldap' \
+                 '--disable-ldap' \
+                 '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'
 
-optional_depends openldap '--enable-ldap'   '--disable-ldap'   '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 76c4293..d2fe513 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -1,25 +1,32 @@
            SPELL=dspam
-if [[ $DSPAM_SCM == n ]]; then
-         VERSION=3.8.0
-          SOURCE="${SPELL}-${VERSION}.tar.gz"
-     SOURCE_HASH=sha512:7a9e69ca1ce67dc14d98305a7d780ff9faf925e0380fbac755d53c8eb593445662350b6c62c8860151a8c8000e714d992a60cd9b8c83450e5557422366d1b60c
-   SOURCE_URL[0]="http://dspam.nuclearelephant.com/sources/${SOURCE}"
-else
+if [[ $DSPAM_BRANCH == scm ]]; then
 if [[ $DSPAM_SCM_AUTO == y ]]; then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=scm
 fi
-          SOURCE="${SPELL}-scm.tar.bz2"
-   SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam
+          SOURCE="${SPELL}-git.tar.bz2"
+   SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam:dspam-scm
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
-fi
+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"
+else
+         VERSION=3.9.0
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+     SOURCE_HASH=sha512:9208e973855e4527802603570ae7a8fbdafe9c4a40aaa55eda91810d98c13a234e1e1f681c9a219869fbb58c5be10d908d8a974d63d75dab965641b29ef557e6
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
         WEB_SITE="http://dspam.sourceforge.net/"
             DOCS="$DOCS RELEASE.NOTES UPGRADING"
       LICENSE[0]='GPL'
-      PATCHLEVEL=3
+      PATCHLEVEL=0
         KEYWORDS="email mail spam filter"
            SHORT='A server-side anti-spam agent for UNIX email servers'
 cat << EOF
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 2507fa1..f7b52a6 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,14 @@
+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
+	  be a problem later on
+	* BUILD: cleaned up
+	* CONFIGURE: added more options, cleaned up current ones
+	* DEPENDS: cleaned up
+	* INSTALL: cleaned up
+	* PREPARE: added devel version
+	* PRE_BUILD: only needed in scm version(and maybe not even then)
+
 2010-04-27 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed scm SOURCE_URL
 
diff --git a/mail/dspam/INSTALL b/mail/dspam/INSTALL
index be17051..70bba0d 100755
--- a/mail/dspam/INSTALL
+++ b/mail/dspam/INSTALL
@@ -1,7 +1,6 @@
 default_install                                             &&
 # needed if one wants to build anything with it afterwards
-cp src/pref.h                                               \
-   ${INSTALL_ROOT}/usr/include/dspam/                       &&
+cp src/pref.h ${INSTALL_ROOT}/usr/include/dspam/             &&
 pushd webui                                                 &&
 rm Makefile*                                                &&
 rm cgi-bin/Makefile*                                        &&
@@ -9,15 +8,11 @@ rm cgi-bin/templates/Makefile*                              &&
 rm htdocs/Makefile*                                         &&
 install_www_files                                           &&
 popd                                                        &&
-if [[ "$DSPAM_PGSQL"  == y ]]; then
-   [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql ]  &&
-     mkdir -p ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql
-   install -D src/tools.pgsql_drv/*.sql                     \
-              ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql/
-fi                                                          &&
-if [[ "$DSPAM_MYSQL"  == y ]]; then
-   [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/mysql ]       &&
-     mkdir -p ${INSTALL_ROOT}/usr/share/doc/dspam/mysql
-   install -D src/tools.mysql_drv/*.sql                     \
-              ${INSTALL_ROOT}/usr/share/doc/dspam/mysql/
+if is_depends_enabled $SPELL postgresql ; then
+mkdir -vp ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql     &&
+install -vD src/tools.pgsql_drv/*.sql ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql/
+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
diff --git a/mail/dspam/PREPARE b/mail/dspam/PREPARE
index d1f4b32..251710b 100755
--- a/mail/dspam/PREPARE
+++ b/mail/dspam/PREPARE
@@ -1,8 +1,12 @@
-config_query  DSPAM_SCM                                           \
-              "Do you want to use the dspam development version?" \
-              ${DSPAM_CVS:-n} &&
+config_query_list DSPAM_BRANCH "What branch do you want to use?" \
+              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
+fi
diff --git a/mail/dspam/PRE_BUILD b/mail/dspam/PRE_BUILD
index 27dec07..0a0667e 100755
--- a/mail/dspam/PRE_BUILD
+++ b/mail/dspam/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build     &&
+if [[ $DSPAM_BRANCH == scm ]]; then
 cd $SOURCE_DIRECTORY  &&
 aclocal               &&
 NOCONFIGURE=1 ./autogen.sh
+fi



More information about the SM-Commit mailing list