# ChangeLog for mail-filter/dspam
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.26 2004/11/11 15:31:54 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.27 2004/11/11 16:00:30 st_lim Exp $
+
+ 11 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+ dspam-3.2.1.ebuild:
+ Fixed bug #70388, #70647, #70755. Also rearranged some of the wording.
+
+ 11 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+ dspam-3.2.1.ebuild:
+ Fixed bug #70755
11 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
dspam-3.2.1.ebuild:
-MD5 3d0d6add85f1ff52329892cb016d2866 ChangeLog 5664
+MD5 223042941709fb1fe98848217142f49a ChangeLog 5938
MD5 818341ff579ee7d21ed37a42b91cb945 dspam-3.0.0.ebuild 7029
MD5 b08fbc1616907518bbe03909a57b8b6e dspam-3.1.2.ebuild 14858
-MD5 e3685d3970b70c69a7351eb929bb9383 dspam-3.2.0.ebuild 15240
-MD5 cffbc97ad7fe1e39f98e13d789c7067f dspam-3.2.1.ebuild 15942
+MD5 aa6b749d142cea8bf252e18a7f277983 dspam-3.2.0.ebuild 15971
+MD5 0b3e3ea84eca7eac2dc72a77ceec8b54 dspam-3.2.1.ebuild 15927
MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.0.ebuild,v 1.6 2004/11/11 15:31:54 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.0.ebuild,v 1.7 2004/11/11 16:00:30 st_lim Exp $
inherit eutils
procmail? ( >=mail-filter/procmail-3.22 )
x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
"
- #mysql41? ( >=dev-db/mysql-4.1 ) # There is no mysql-4.1 in gentoo!!! Ouch
RDEPEND="virtual/cron
app-admin/logrotate"
KEYWORDS="~x86 ~ppc"
myconf="${myconf} --enable-large-scale"
#myconf="${myconf} --enable-domain-scale"
- # ${HOMEDIR}/data is a symlink to ${DATADIR}
myconf="${myconf} --with-dspam-mode=4755"
myconf="${myconf} --with-dspam-owner=dspam"
myconf="${myconf} --with-dspam-group=dspam"
use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
# select storage driver
- if use mysql || use mysql41; then
+ 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"
diropts -m0775 -o dspam -g dspam
dodir ${DATADIR}
keepdir ${DATADIR}
+ # ${HOMEDIR}/data is a symlink to ${DATADIR}
+ dosym ${DATADIR} ${HOMEDIR}/data
# keeps dspam log in /var/log
diropts -m0775 -o dspam -g dspam
# documentation
dodoc CHANGELOG LICENSE README RELEASE.NOTES
dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
- if use mysql || mysql41; then
+ if use mysql; then
newdoc tools.mysql_drv/README
elif use postgres ; then
newdoc tools.pgsql_drv/README
-i ${D}${HOMEDIR}/dspam.conf
fi
fi
+ chown dspam.dspam ${D}${HOMEDIR}/dspam.conf
+ chmod 644 ${D}${HOMEDIR}/dspam.conf
local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
# database related configuration and scripts
- if use mysql || use mysql41; then
+ if use mysql; then
insinto ${HOMEDIR}
insopts -m644 -o dspam -g dspam
PASSWORD="$(tail -n 2 ${HOMEDIR}/mysql.data | head -n 1 )"
else
# Create the mysql.data file
- echo "127.0.0.1" >${T}/mysql.data
- echo "3306" >>${T}/mysql.data
- echo "dspam" >>${T}/mysql.data
- echo "${PASSWORD}" >>${T}/mysql.data
- echo "dspam" >>${T}/mysql.data
+ 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 >> ${D}/${HOMEDIR}/dspam.conf
+ sed -e 's/^MySQL[A-Za-z]* *//g' -i ${T}/mysql.data
doins ${T}/mysql.data
fi
PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )"
else
# Create the pgsql.data file
- echo "127.0.0.1" >${T}/pgsql.data
- echo "5432" >>${T}/pgsql.data
- echo "dspam" >>${T}/pgsql.data
- echo "${PASSWORD}" >>${T}/pgsql.data
- echo "dspam" >>${T}/pgsql.data
+ 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 >> ${D}/${HOMEDIR}/dspam.conf
+ sed -e 's/^PgSQL[A-Za-z]* *//g' -i ${T}/pgsql.data
doins ${T}/pgsql.data
fi
# Use an existing password
PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )"
else
- # Create the pgsql.data file
- echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521))(CONNECT_DATA=(SID=PROD)))" >${T}/oracle.data
- echo "dspam" >>${T}/oracle.data
- echo "${PASSWORD}" >>${T}/oracle.data
- echo "dspam" >>${T}/oracle.data
+ # Create the oracle.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 >> ${D}/${HOMEDIR}/dspam.conf
+ sed -e 's/^Ora[A-Za-z]* *//g' -i ${T}/oracle.data
doins ${T}/oracle.data
fi
}
pkg_postinst() {
- if use mysql || use mysql41 || use postgres; then
+ 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
pkg_config () {
if use mysql ; then
[[ -f ${HOMEDIR}/mysql.data ]] && mv -f ${HOMEDIR}/mysql.data ${HOMEDIR}
- DSPAM_MySQL_USER="$(cat ${HOMEDIR}/mysql.data|head -n 3|tail -n 1)"
- DSPAM_MySQL_PWD="$(cat ${HOMEDIR}/mysql.data|head -n 4|tail -n 1)"
- DSPAM_MySQL_DB="$(cat ${HOMEDIR}/mysql.data|head -n 5|tail -n 1)"
+ 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}
- if use mysql41 ; then
- /usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-4.1.sql
+ 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
- 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
+ /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 -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="$(cat ${HOMEDIR}/pgsql.data|head -n 3|tail -n 1)"
- DSPAM_PgSQL_PWD="$(cat ${HOMEDIR}/pgsql.data|head -n 4|tail -n 1)"
- DSPAM_PgSQL_DB="$(cat ${HOMEDIR}/pgsql.data|head -n 5|tail -n 1)"
+ 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 ""
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.1.ebuild,v 1.4 2004/11/11 15:31:54 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.1.ebuild,v 1.5 2004/11/11 16:00:30 st_lim Exp $
inherit eutils
procmail? ( >=mail-filter/procmail-3.22 )
x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
"
- #mysql41? ( >=dev-db/mysql-4.1 ) # There is no mysql-4.1 in gentoo!!! Ouch
RDEPEND="virtual/cron
app-admin/logrotate"
KEYWORDS="~x86 ~ppc ~alpha ~ia64"
myconf="${myconf} --enable-large-scale"
#myconf="${myconf} --enable-domain-scale"
- # ${HOMEDIR}/data is a symlink to ${DATADIR}
myconf="${myconf} --with-dspam-mode=4755"
myconf="${myconf} --with-dspam-owner=dspam"
myconf="${myconf} --with-dspam-group=dspam"
use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
# select storage driver
- if use mysql || use mysql41; then
+ 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"
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' \
# documentation
dodoc CHANGELOG LICENSE README RELEASE.NOTES
dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail
- if use mysql || mysql41; then
+ if use mysql; then
newdoc tools.mysql_drv/README
elif use postgres ; then
newdoc tools.pgsql_drv/README
-i ${D}${HOMEDIR}/dspam.conf
fi
fi
+ chown dspam.dspam ${D}${HOMEDIR}/dspam.conf
+ chmod 644 ${D}${HOMEDIR}/dspam.conf
local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
# database related configuration and scripts
- if use mysql || use mysql41; then
+ if use mysql; then
insinto ${HOMEDIR}
insopts -m644 -o dspam -g dspam
echo "MySQLPass ${PASSWORD}" >> ${T}/mysql.data
echo "MySQLDb dspam" >> ${T}/mysql.data
echo "MySQLCompress true" >> ${T}/mysql.data
- doins ${T}/mysql.data
[ -z "`grep '^MySQL' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/mysql.data >> ${D}/${HOMEDIR}/dspam.conf
+ sed -e 's/^MySQL[A-Za-z]* *//g' -i ${T}/mysql.data
+ doins ${T}/mysql.data
fi
newins tools.mysql_drv/mysql_objects-space.sql mysql_objects-space.sql
insinto ${HOMEDIR}
insopts -m644 -o dspam -g dspam
- if [ -f ${HOMEDIR}/mysql.data ]; 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}/mysql.data
- echo "PgSQLPort 5432" >> ${T}/mysql.data
- echo "PgSQLUser dspam" >> ${T}/mysql.data
- echo "PgSQLPass ${PASSWORD}" >> ${T}/mysql.data
- echo "PgSQLDb dspam" >> ${T}/mysql.data
- doins ${T}/pgsql.data
+ 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 >> ${D}/${HOMEDIR}/dspam.conf
+ sed -e 's/^PgSQL[A-Za-z]* *//g' -i ${T}/pgsql.data
+ doins ${T}/pgsql.data
fi
newins tools.pgsql_drv/pgsql_objects.sql pgsql_objects.sql
echo "OraUser dspam" >>${T}/oracle.data
echo "OraPass ${PASSWORD}" >>${T}/oracle.data
echo "OraSchema dspam" >>${T}/oracle.data
- doins ${T}/oracle.data
[ -z "`grep '^Ora' ${D}/${HOMEDIR}/dspam.conf`" ] && cat ${T}/oracle.data >> ${D}/${HOMEDIR}/dspam.conf
+ sed -e 's/^Ora[A-Za-z]* *//g' -i ${T}/oracle.data
+ doins ${T}/oracle.data
fi
newins tools.ora_drv/oral_objects.sql ora_objects.sql
}
pkg_postinst() {
- if use mysql || use mysql41 || use postgres; then
+ 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
pkg_config () {
if use mysql ; then
[[ -f ${HOMEDIR}/mysql.data ]] && mv -f ${HOMEDIR}/mysql.data ${HOMEDIR}
- DSPAM_MySQL_USER="$(cat ${HOMEDIR}/mysql.data|head -n 3|tail -n 1)"
- DSPAM_MySQL_PWD="$(cat ${HOMEDIR}/mysql.data|head -n 4|tail -n 1)"
- DSPAM_MySQL_DB="$(cat ${HOMEDIR}/mysql.data|head -n 5|tail -n 1)"
+ 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}
- if use mysql41 ; then
- /usr/bin/mysql -u root -p ${DSPAM_MySQL_DB} < ${HOMEDIR}/mysql_objects-4.1.sql
+ 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
- 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
+ /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 -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="$(cat ${HOMEDIR}/pgsql.data|head -n 3|tail -n 1)"
- DSPAM_PgSQL_PWD="$(cat ${HOMEDIR}/pgsql.data|head -n 4|tail -n 1)"
- DSPAM_PgSQL_DB="$(cat ${HOMEDIR}/pgsql.data|head -n 5|tail -n 1)"
+ 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 ""
projects / gentoo.git / commitdiff