Version bump & masked 3.3.11. Let's have joy. :)
authorLim Swee Tat <st_lim@gentoo.org>
Mon, 17 Jan 2005 10:26:13 +0000 (10:26 +0000)
committerLim Swee Tat <st_lim@gentoo.org>
Mon, 17 Jan 2005 10:26:13 +0000 (10:26 +0000)
Package-Manager: portage-2.0.51-r13

mail-filter/dspam/ChangeLog
mail-filter/dspam/Manifest
mail-filter/dspam/dspam-3.3.11.ebuild
mail-filter/dspam/dspam-3.4_beta1.ebuild [new file with mode: 0644]
mail-filter/dspam/files/digest-dspam-3.4_beta1 [new file with mode: 0644]

index 82f401c867a3ac09369d4cbdbd77b3c751702645..11a4346ec7889df6c15fe52c4e9c14f81c87cc75 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.36 2005/01/14 04:48:29 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.37 2005/01/17 10:26:13 st_lim Exp $
+
+  17 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Removing 3.3.11, bad packaging upstream
+  Version bump to beta1
 
 *dspam-3.3.11 (14 Jan 2005)
 
index d2ef1dd69cc0588b47aab9abf0d3eb7f2c21534e..1da725f2c49fc227eab6d725d3c89e983ecd2b5c 100644 (file)
@@ -1,13 +1,15 @@
-MD5 845898bd66ae836e0d32d9a490e3392d ChangeLog 7377
+MD5 aba6b48eb1f8b656838a100f8d9ceb93 ChangeLog 7494
 MD5 7f062fc75a6ccd8d0905eff3e58a1434 dspam-3.2.4.ebuild 15740
-MD5 2ec3774336a1924e21d3155cf35f6457 dspam-3.3.11.ebuild 15599
+MD5 75861b5ea74049e7531a5078dd0281a2 dspam-3.3.11.ebuild 15579
 MD5 1609ebdee0c07a818876891982939128 dspam-3.3.8.ebuild 15812
+MD5 a138ea43b51d376704d0dc56eeb16756 dspam-3.4_beta1.ebuild 15635
 MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
 MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
 MD5 cd1bdb75fd86304f9453741a910cb8a2 files/crontab.db4 196
 MD5 f2f86e8f7ab440c8537f40fa18a0ee43 files/crontab.mysql 118
 MD5 bb0ac428fee5f2182499acc9752d71c4 files/digest-dspam-3.3.11 130
+MD5 99c7c9bf108d74d87d9d582417f14d49 files/digest-dspam-3.4_beta1 134
 MD5 9a2fda6789f0db17b6a32ca84e9e3884 files/dspam.cron 2501
 MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
 MD5 ea56d34fd80be48f9b308655b5620c2f files/digest-dspam-3.2.4 63
index c426ed5ba6cb8e7ebcfb7f9d6549a145982e7c9f..26e5d41de544134be9eac73c45f027a8270f3351 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.3.11.ebuild,v 1.2 2005/01/14 04:48:29 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.3.11.ebuild,v 1.3 2005/01/17 10:26:13 st_lim Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ DEPEND="exim? ( >=mail-mta/exim-4.34 )
                "
 RDEPEND="sys-apps/cronbase
                app-admin/logrotate"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
+KEYWORDS="-*"
 SLOT="0"
 
 # some FHS-like structure
diff --git a/mail-filter/dspam/dspam-3.4_beta1.ebuild b/mail-filter/dspam/dspam-3.4_beta1.ebuild
new file mode 100644 (file)
index 0000000..65a00f6
--- /dev/null
@@ -0,0 +1,386 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.4_beta1.ebuild,v 1.1 2005/01/17 10:26:13 st_lim Exp $
+
+inherit eutils
+
+MY_PV=${PV/_beta1/.beta.1}
+S=${WORKDIR}/${PN}-${MY_PV}
+DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${MY_PV}.tar.gz
+       http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
+HOMEPAGE="http://dspam.nuclearelephant.com/"
+LICENSE="GPL-2"
+
+IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite large-domain"
+DEPEND="exim? ( >=mail-mta/exim-4.34 )
+               mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
+               sqlite? ( >=dev-db/sqlite-2.7.7 )
+               maildrop? ( >=mail-filter/maildrop-1.5.3 )
+               postgres? ( >=dev-db/postgresql-7.4.3 )
+               procmail? ( >=mail-filter/procmail-3.22 )
+               x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
+               "
+RDEPEND="sys-apps/cronbase
+               app-admin/logrotate"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64"
+SLOT="0"
+
+# some FHS-like structure
+HOMEDIR="/etc/mail/dspam"
+DATADIR="/var/spool/dspam"
+LOGDIR="/var/log/dspam"
+
+pkg_setup() {
+       if (use mysql && use postgres) || \
+               (use mysql && use oci8) || \
+               (use mysql && use sqlite) || \
+               (use postgres && use oci8) || \
+               (use postgres && use sqlite) || \
+               (use sqlite && use oci8); then
+               echo
+               ewarn "You have two of either \"mysql\", \"postgres\", \"oci8\" or \"sqlite\" in your USE flags."
+               ewarn "Will default to MySQL as your dspam database backend."
+               ewarn "If you want to build with Postgres/Oracle/SQLite support; hit Control-C now."
+               ewarn "Change your USE flag -mysql and emerge again."
+               echo
+               has_version ">=sys-apps/portage-2.0.50" && (
+               einfo "It would be best practice to add the set of USE flags that you use for this"
+               einfo "package to the file: /etc/portage/package.use. Example:"
+               einfo "\`echo \"net-mail/dspam -mysql postgres -oci8 -sqlite\" >> /etc/portage/package.use\`"
+               einfo "to build dspam with Postgres database as your dspam backend."
+               )
+               echo
+               ewarn "Waiting 30 seconds before starting..."
+               ewarn "(Control-C to abort)..."
+               epause 30
+       fi
+       id dspam 2>/dev/null || enewgroup dspam 65532
+       id dspam 2>/dev/null || enewuser dspam 65532 /bin/bash ${HOMEDIR} dspam
+}
+
+src_compile() {
+       local myconf
+
+       # these are the default settings
+       #myconf="${myconf} --enable-daemon"
+       #myconf="${myconf} --enable-nodalcore"
+       myconf="${myconf} --enable-homedir"
+       myconf="${myconf} --enable-long-username"
+       myconf="${myconf} --enable-robinson"
+       #myconf="${myconf} --enable-chi-square"
+       #myconf="${myconf} --enable-robinson-pvalues"
+       use large-domain && myconf="${myconf} --enable-large-scale" ||\
+               myconf="${myconf} --enable-domain-scale"
+
+       myconf="${myconf} --with-dspam-mode=4755"
+       myconf="${myconf} --with-dspam-owner=dspam"
+       myconf="${myconf} --with-dspam-group=dspam"
+       myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
+       myconf="${myconf} --with-logdir=${LOGDIR}"
+
+       use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
+
+       # select storage driver
+       if use mysql; then
+               myconf="${myconf} --with-storage-driver=mysql_drv"
+               myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
+               myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
+               myconf="${myconf} --enable-virtual-users"
+               myconf="${myconf} --enable-preferences-extension"
+
+               # an experimental feature available with MySQL and PgSQL backend
+               if use neural ; then
+                       myconf="${myconf} --enable-neural-networking"
+               fi
+       elif use postgres ; then
+               myconf="${myconf} --with-storage-driver=pgsql_drv"
+               myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
+               myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
+               myconf="${myconf} --enable-virtual-users"
+               myconf="${myconf} --enable-preferences-extension"
+
+               # an experimental feature available with MySQL and PgSQL backend
+               if use neural ; then
+                       myconf="${myconf} --enable-neural-networking"
+               fi
+       elif use oci8 ; then
+               myconf="${myconf} --with-storage-driver=ora_drv"
+               myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
+               myconf="${myconf} --enable-virtual-users"
+               myconf="${myconf} --enable-preferences-extension"
+
+               # I am in no way a Oracle specialist. If someone knows
+               # how to query the version of Oracle, then let me know.
+               if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1)
+               then
+                       --with-oracle-version=MAJOR
+                       myconf="${myconf} --with-oracle-version=10"
+               fi
+       elif use sqlite ; then
+               myconf="${myconf} --with-storage-driver=sqlite_drv"
+               myconf="${myconf} --enable-virtual-users"
+
+       else
+               myconf="${myconf} --with-storage-driver=libdb4_drv"
+       fi
+
+       econf ${myconf} || die
+       emake || die
+
+}
+
+src_install () {
+       # open up perms on /etc/mail/dspam
+       diropts -m0775 -o dspam -g dspam
+       dodir ${HOMEDIR}
+       keepdir ${HOMEDIR}
+
+       # keeps dspam data in /var
+       diropts -m0775 -o dspam -g dspam
+       dodir ${DATADIR}
+       keepdir ${DATADIR}
+
+       # keeps dspam log in /var/log
+       diropts -m0775 -o dspam -g dspam
+       dodir ${LOGDIR}
+       keepdir ${LOGDIR}
+       # ${HOMEDIR}/data is a symlink to ${DATADIR}
+       dosym ${DATADIR} ${HOMEDIR}/data
+
+       # make install
+       sed -e 's/rm -f ..mandir.\(.*\)/rm -f ${D}${mandir}\1/g' \
+               -e 's/ln -s ..mandir.\(.*\) ..mandir.\(.*3\)/ln -s ${mandir}\1.gz ${D}${mandir}\2.gz/g' \
+               -i Makefile
+       make DESTDIR=${D} install || die
+       chmod 4755 ${D}/usr/bin/dspam
+
+       # documentation
+       dodoc CHANGELOG LICENSE README* RELEASE.NOTES
+       dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
+       if use mysql; then
+               dodoc src/tools.mysql_drv/README
+       elif use postgres ; then
+               dodoc src/tools.pgsql_drv/README
+       elif use oci8 ; then
+               dodoc src/tools.ora_drv/README
+       elif use sqlite ; then
+               dodoc src/tools.sqlite_drv/README
+       fi
+       doman man/dspam*
+       dodoc ${DISTDIR}/dspam_sa_trainer.tar.gz
+
+       # build some initial configuration data
+       # Copy existing dspam.conf
+       [ -f ${HOMEDIR}/dspam.conf ] && cp ${HOMEDIR}/dspam.conf ${T}/dspam.conf
+       # If no existing dspam.conf
+       if [ ! -f ${HOMEDIR}/dspam.conf ]; then
+               cp ${D}${HOMEDIR}/dspam.conf ${T}/dspam.conf
+               if use cyrus; then
+                       echo "UntrustedDeliveryAgent /usr/lib/cyrus/deliver %u" >> ${T}/dspam.conf
+                       dosed 's:/usr/bin/procmail:/usr/lib/cyrus/deliver %u:g' ${T}/dspam.conf
+               elif use exim; then
+                       echo "UntrustedDeliveryAgent /usr/sbin/exim -oMr spam-scanned %u" >> ${T}/dspam.conf
+                       dosed 's:/usr/bin/procmail:/usr/sbin/exim -oMr spam-scanned %u:g' ${T}/dspam.conf
+               elif use maildrop; then
+                       echo "UntrustedDeliveryAgent /usr/bin/maildrop -d %u" >> ${T}/dspam.conf
+                       dosed 's:/usr/bin/procmail:/usr/bin/maildrop -d %u:g' ${T}/dspam.conf
+               elif use procmail; then
+                       echo "UntrustedDeliveryAgent /usr/bin/procmail" >> ${T}/dspam.conf
+               else
+                       echo "UntrustedDeliveryAgent /usr/sbin/sendmail" >> ${T}/dspam.conf
+                       sed 's:/usr/bin/procmail:/usr/sbin/sendmail:g' ${T}/dspam.conf
+               fi
+       fi
+
+       local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+
+       # database related configuration and scripts
+       insinto ${HOMEDIR}
+       insopts -m644 -o dspam -g dspam
+       if use mysql; then
+
+               if [ -f ${HOMEDIR}/mysql.data ]; then
+                       # Use an existing password
+                       PASSWORD="$(tail -n 2 ${HOMEDIR}/mysql.data | head -n 1 )"
+               else
+                       # Create the mysql.data file
+                       echo "MySQLServer    /var/run/mysqld/mysqld.sock" >> ${T}/mysql.data
+                       echo "MySQLPort"                                  >> ${T}/mysql.data
+                       echo "MySQLUser      dspam"                       >> ${T}/mysql.data
+                       echo "MySQLPass      ${PASSWORD}"                 >> ${T}/mysql.data
+                       echo "MySQLDb        dspam"                       >> ${T}/mysql.data
+                       echo "MySQLCompress  true"                        >> ${T}/mysql.data
+                       [ -z "`grep '^MySQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/mysql.data >> ${T}/dspam.conf
+                       sed -e 's/^MySQL[A-Za-z]* *//g' -i ${T}/mysql.data
+                       doins ${T}/mysql.data
+               fi
+
+               newins src/tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
+               newins src/tools.mysql_drv/mysql_objects-speed.sql mysql_objects-speed.sql
+               newins src/tools.mysql_drv/mysql_objects-4.1.sql mysql_objects-4.1.sql
+               newins src/tools.mysql_drv/virtual_users.sql mysql_virtual_users.sql
+               newins src/tools.mysql_drv/neural.sql mysql_neural.sql
+               newins src/tools.mysql_drv/purge.sql mysql_purge.sql
+               newins src/tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql
+       elif use postgres ; then
+               if [ -f ${HOMEDIR}/pgsql.data ]; then
+                       # Use an existing password
+                       PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )"
+               else
+                       # Create the pgsql.data file
+                       echo "PgSQLServer    127.0.0.1"    >> ${T}/pgsql.data
+                       echo "PgSQLPort      5432"         >> ${T}/pgsql.data
+                       echo "PgSQLUser      dspam"        >> ${T}/pgsql.data
+                       echo "PgSQLPass      ${PASSWORD}"  >> ${T}/pgsql.data
+                       echo "PgSQLDb        dspam"        >> ${T}/pgsql.data
+                       [ -z "`grep '^PgSQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/pgsql.data >> ${T}/dspam.conf
+                       sed -e 's/^PgSQL[A-Za-z]* *//g' -i ${T}/pgsql.data
+                       doins ${T}/pgsql.data
+               fi
+
+               newins src/tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
+               newins src/tools.pgsql_drv/virtual_users.sql pgsql_virtual_users.sql
+               newins src/tools.pgsql_drv/purge.sql pgsql_purge.sql
+
+       elif use oci8 ; then
+               if [ -f ${HOMEDIR}/oracle.data ]; then
+                       # Use an existing password
+                       PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )"
+               else
+                       # Create the pgsql.data file
+                       echo "OraServer      (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >>${T}/oracle.data
+                       echo "OraUser        dspam" >>${T}/oracle.data
+                       echo "OraPass        ${PASSWORD}" >>${T}/oracle.data
+                       echo "OraSchema      dspam" >>${T}/oracle.data
+                       [ -z "`grep '^Ora' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/oracle.data >> ${T}/dspam.conf
+                       sed -e 's/^Ora[A-Za-z]* *//g' -i ${T}/oracle.data
+                       doins ${T}/oracle.data
+               fi
+
+               newins src/tools.ora_drv/oral_objects.sql ora_objects.sql
+               newins src/tools.ora_drv/virtual_users.sql ora_virtual_users.sql
+               newins src/tools.ora_drv/purge.sql ora_purge.sql
+       elif use sqlite ; then
+               newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
+       fi
+       insinto ${HOMEDIR}
+       insopts -m644 -o dspam -g dspam
+       doins ${T}/dspam.conf
+
+       # installs the logrotation scripts to the logrotate.d directory
+       diropts -m0755 -o dspam -g dspam
+       dodir /etc/logrotate.d
+       keepdir /etc/logrotate.d
+       insinto /etc/logrotate.d
+       newins ${FILESDIR}/logrotate.dspam dspam
+
+       # installs the cron job to the cron directory
+       diropts -m0755 -o dspam -g dspam
+       dodir /etc/cron.daily
+       keepdir /etc/cron.daily
+       exeinto /etc/cron.daily
+       exeopts -m0755 -o dspam -g dspam
+       doexe ${FILESDIR}/dspam.cron
+
+       # dspam enviroment
+       echo -ne "CONFIG_PROTECT_MASK=\"${HOMEDIR}\"\n\n" > ${T}/40dspam
+       doenvd ${T}/40dspam || die
+}
+
+pkg_postinst() {
+       if use mysql || use postgres; then
+               einfo "To setup dspam to run out-of-the-box on your system with a mysql or pgsql database, run:"
+               einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+       fi
+       if use exim ; then
+               echo
+               einfo "To use dspam in conjunction with your exim system, you should read the README"
+       fi
+}
+
+pkg_config () {
+       if use mysql ; then
+               [[ -f ${HOMEDIR}/mysql.data ]] && mv -f ${HOMEDIR}/mysql.data ${HOMEDIR}
+               DSPAM_MySQL_USER="$(head -n 3 ${HOMEDIR}/mysql.data|tail -n 1)"
+               DSPAM_MySQL_PWD="$(head -n 4 ${HOMEDIR}/mysql.data|tail -n 1)"
+               DSPAM_MySQL_DB="$(head -n 5 ${HOMEDIR}/mysql.data|tail -n 1)"
+
+               ewarn "When prompted for a password, please enter your MySQL root password"
+               ewarn ""
+
+               einfo "Creating DSPAM MySQL database \"${DSPAM_MySQL_DB}\""
+               /usr/bin/mysqladmin -u root -p create ${DSPAM_MySQL_DB}
+
+               einfo "Creating DSPAM MySQL tables for data objects"
+               einfo "  Please select what kind of object database you like to use."
+               einfo "    [1] Space optimized database"
+               einfo "    [2] Speed optimized database"
+               einfo
+               while true
+               do
+                       read -n 1 -s -p "  Press 1 or 2 on the keyboard to select database" DSPAM_MySQL_DB_Type
+                       [[ "${DSPAM_MySQL_DB_Type}" == "1" || "${DSPAM_MySQL_DB_Type}" == "2" ]] && break
+               done
+
+               if [ "${DSPAM_MySQL_DB_Type}" == "1" ]
+               then
+                       /usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-space.sql
+               else
+                       /usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-speed.sql
+               fi
+
+               einfo "Creating DSPAM MySQL database for virtual users"
+               /usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_virtual_users.sql
+
+               if use neural ; then
+                       /usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_neural.sql
+               fi
+
+               einfo "Creating DSPAM MySQL user \"${DSPAM_MySQL_USER}\""
+               /usr/bin/mysql -u root -p -e "GRANT SELECT,INSERT,UPDATE,DELETE ON ${DSPAM_MySQL_DB}.* TO ${DSPAM_MySQL_USER}@localhost IDENTIFIED BY '${DSPAM_MySQL_PWD}';FLUSH PRIVILEGES;" -D mysql
+       elif use postgres ; then
+               [[ -f ${HOMEDIR}/pgsql.data ]] && mv -f ${HOMEDIR}/pgsql.data ${HOMEDIR}
+               DSPAM_PgSQL_USER="$(head -n 3 ${HOMEDIR}/pgsql.data|tail -n 1)"
+               DSPAM_PgSQL_PWD="$(head -n 4 ${HOMEDIR}/pgsql.data|tail -n 1)"
+               DSPAM_PgSQL_DB="$(head -n 5 ${HOMEDIR}/pgsql.data|tail -n 1)"
+
+               ewarn "When prompted for a password, please enter your PgSQL postgres password"
+               ewarn ""
+
+               einfo "Creating DSPAM PostgreSQL user \"${DSPAM_PgSQL_USER}\""
+               /usr/bin/psql -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER;" 1>/dev/null 2>&1
+
+               einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\""
+               /usr/bin/psql -d template1 -U postgres -c "CREATE DATABASE ${DSPAM_PgSQL_DB};" 1>/dev/null 2>&1
+
+               einfo "Getting DSPAM PostgreSQL userid for \"${DSPAM_PgSQL_USER}\""
+               DSPAM_PgSQL_USERID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT usesysid FROM pg_user WHERE usename='${DSPAM_PgSQL_USER}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
+               einfo "  UserID: ${DSPAM_PgSQL_USERID}"
+
+               einfo "Getting DSPAM PostgreSQL databaseid for \"${DSPAM_PgSQL_DB}\""
+               DSPAM_PgSQL_DBID=$(/usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -t -c "SELECT datdba FROM pg_database WHERE datname='${DSPAM_PgSQL_DB}';" | head -n1 | sed "s/^[ ]*\([^ ]*\).*/\1/g")
+               einfo "  DBID: ${DSPAM_PgSQL_DBID}"
+
+               einfo "Changing owner of DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" to \"${DSPAM_PgSQL_USER}\""
+               /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "UPDATE pg_database SET datdba=${DSPAM_PgSQL_USERID} WHERE datname='${DSPAM_PgSQL_DB}';" 1>/dev/null 2>&1
+
+               einfo "Creating DSPAM PostgreSQL tables"
+               PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_objects.sql 1>/dev/null 2>&1
+               PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U ${DSPAM_PgSQL_USER} -f ${HOMEDIR}/pgsql_virtual_users.sql 1>/dev/null 2>&1
+
+               einfo "Grant privileges to DSPAM PostgreSQL objects to \"${DSPAM_PgSQL_USER}\""
+               for foo in $(/usr/bin/psql -t -d ${DSPAM_PgSQL_DB} -U postgres -c "SELECT tablename FROM pg_tables WHERE tablename LIKE 'dspam\%';")
+               do
+                       /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON TABLE ${foo} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
+               done
+               /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
+               /usr/bin/psql -d ${DSPAM_PgSQL_DB} -U postgres -c "GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER};" 1>/dev/null 2>&1
+       elif use oci8 ; then
+               [[ -f ${HOMEDIR}/oracle.data ]] && mv -f ${HOMEDIR}/oracle.data ${HOMEDIR}
+       elif use sqlite ; then
+               einfo "sqlite_drv will automatically create the necessary database"
+               einfo "objects for each user upon first use of DSPAM by that user."
+       fi
+
+}
diff --git a/mail-filter/dspam/files/digest-dspam-3.4_beta1 b/mail-filter/dspam/files/digest-dspam-3.4_beta1
new file mode 100644 (file)
index 0000000..644e523
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 7a5047c8d78dbe0d427e52db9cc5a6e7 dspam-3.4.beta.1.tar.gz 657645
+MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230