Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32366/scripts
Modified Files:
Tag: rel-1-2-patches
dspam sagator
Log Message:
resolved some dependencies
Index: sagator
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sagator,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -d -r1.6.2.6 -r1.6.2.7
--- sagator 19 May 2006 17:16:26 -0000 1.6.2.6
+++ sagator 22 May 2006 23:17:53 -0000 1.6.2.7
@@ -32,8 +32,7 @@
export PYTHONHOME=$WORKDIR/Python-install/usr
export PATH=$WORKDIR/Python-install/usr/bin:$PATH
#export APACHE_ROOT=/etc/apache2
- export DSPAM=yes
- export DSPAM_PREFIX=/usr
+ #[ "$CONFIG_DSPAM" = "y" ] && eval "export DSPAM=yes; export DSPAM_PREFIX=/usr"
./configure --prefix /usr || exit 1
make $PMAKE all || exit 1
strip_debug
Index: dspam
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dspam,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- dspam 19 May 2006 17:16:26 -0000 1.2.2.2
+++ dspam 22 May 2006 23:17:53 -0000 1.2.2.3
@@ -14,7 +14,7 @@
# Required-Stop:
# Default-Start: 1 2
# Default-Stop:
-# Description: Command line Disk Archive backup utility
+# Description: extremely scalable, open-source statistical anti-spam filter
### END INIT INFO
# get the directoryname of the script
@@ -23,15 +23,31 @@
# source functions and config
source $MYDIR/settings
-MYNAME=DAR
+MYNAME=DSPAM
+MYHOME=/var/dspam
+MYLOGDIR=/var/log/dspam
case $1 in
build )
if [ "$CONFIG_DSPAM" = "y" ]; then
+ CONFIGURE_OPTIONS=""
+
+ # database dependencies
+ STORAGE_DRIVERS=""
+ [ "$CONFIG_MYSQL_CLIENT" = "y" ] && STORAGE_DRIVERS="${STORAGE_DRIVERS},mysql_drv"
+ [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ] && STORAGE_DRIVERS="${STORAGE_DRIVERS},pgsql_drv"
+ CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --with-storage-driver=hash_drv${STORAGE_DRIVERS}"
+ [ "$CONFIG_MYSQL_CLIENT" = "y" ] && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --with-mysql-includes=/usr/include/mysql"
+
+ # other dependencies
+ [ "$CONFIG_CLAMAV" = "y" ] && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-clamav"
+ [ "$CONFIG_OPENLDAPLIB" = "y" ] && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-ldap"
+
./configure --prefix=/usr --sysconfdir=/etc --enable-long-usernames \
- --enable-virtual-users --with-storage-driver=hash_drv,mysql_drv,pgsql_drv --with-dspam-home=/var/dspam \
- --enable-daemon --enable-ldap --enable-clamav --enable-syslog --enable-homedir \
- --enable-preferences-extension --enable-large-scale --with-mysql-includes=/usr/include/mysql || exit 1
+ --enable-virtual-users --with-dspam-home=${MYHOME} \
+ --enable-daemon --enable-syslog --with-logdir=${MYLOGDIR} --enable-homedir \
+ --enable-preferences-extension --enable-large-scale \
+ ${CONFIGURE_OPTIONS} || exit 1
make $PMAKE all || exit 1
strip_debug
@@ -62,6 +78,10 @@
mkdir -p $DOCDIR/dspam || exit 1
cp README* $DOCDIR/dspam/ || exit 1
+ mkdir -p ${MYLOGDIR} || exit 1
+ # till we know better make it world-writeable - FIXME!
+ chmod 777 ${MYLOGDIR} || exit 1
+
#cp $MYDIR/scripts/dar $ETCDIR/etc/init.d/ || exit 1
#echo "# Start $MYNAME Server?" >> $CONFIGFILE
|
