diff options
| author |   Lim Swee Tat <st_lim@gentoo.org> | 2005-04-05 08:37:13 +0000 |
|---|---|---|
| committer | Lim Swee Tat <st_lim@gentoo.org> | 2005-04-05 08:37:13 +0000 |
| commit | e261c04db40b1489bff796d9fde71d54679f0479 (patch) | |
| tree | 557f2f296f291c3ff8977b10a6fc27f17133b8b8 /mail-filter | |
| parent | Fixed bug #85365 (diff) | |
| download | gentoo-2-e261c04db40b1489bff796d9fde71d54679f0479.tar.gz gentoo-2-e261c04db40b1489bff796d9fde71d54679f0479.tar.bz2 gentoo-2-e261c04db40b1489bff796d9fde71d54679f0479.zip | |
Fixed bug #87358 and #85939
(Portage version: 2.0.51.19)
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/dspam/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-filter/dspam/dspam-3.4.1.ebuild | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog index cf3f63b9a490..5b9ac8bd9335 100644 --- a/mail-filter/dspam/ChangeLog +++ b/mail-filter/dspam/ChangeLog @@ -1,6 +1,9 @@ # 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.50 2005/03/28 14:33:00 st_lim Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.51 2005/04/05 08:37:13 st_lim Exp $ + + 05 Apr 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.1.ebuild: + Fixed bug #87358 and #85939 28 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.1.ebuild: Fixed bug #86099 diff --git a/mail-filter/dspam/dspam-3.4.1.ebuild b/mail-filter/dspam/dspam-3.4.1.ebuild index e3122222dac7..ca39b7f01c7a 100644 --- a/mail-filter/dspam/dspam-3.4.1.ebuild +++ b/mail-filter/dspam/dspam-3.4.1.ebuild @@ -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.4.1.ebuild,v 1.2 2005/03/28 14:33:00 st_lim Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.4.1.ebuild,v 1.3 2005/04/05 08:37:13 st_lim Exp $ inherit eutils @@ -60,11 +60,14 @@ pkg_setup() { epause 30 elif [ "${multiple_dbs}" -eq "0" ]; then echo - ewarn "You need to select at least one database backend in your USE flags." - ewarn "Please enable one of the following USE flags:" - ewarn " ${supported_dbs}" + ewarn "You did not select any SQL based database backend. DSPAM will use" + ewarn "Berkeley DB for storing data. If you don't want that, then enable" + ewarn "one of the following USE flags:" + ewarn "${supported_dbs}" echo - die "Database support missing" + ewarn "Waiting 30 seconds before starting..." + ewarn "(Control-C to abort)..." + epause 30 fi has_version sys-kernel/linux26-headers || ( einfo "To use the new DSPAM deamon mode, you need to emerge" @@ -196,7 +199,7 @@ src_install () { dodoc src/tools.pgsql_drv/README elif use oci8 ; then dodoc src/tools.ora_drv/README - elif use sqlite || sqlite3 ; then + elif use sqlite || use sqlite3 ; then dodoc src/tools.sqlite_drv/README fi doman man/dspam* @@ -353,7 +356,7 @@ src_install () { 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 || sqlite3 ; then + elif use sqlite || use sqlite3 ; then insinto ${HOMEDIR} insopts -m644 -o dspam -g dspam newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql @@ -489,7 +492,7 @@ pkg_config () { 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 if use virtual-users ; then - einfo "Creating DSPAM MySQL database for virtual-users users" + einfo "Creating DSPAM PostgreSQL database for virtual-users users" 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 fi elif use oci8 ; then |