From fe5ab5f22cc966925afb8167d1bf5a07247ef92e Mon Sep 17 00:00:00 2001 From: Lim Swee Tat Date: Sun, 28 Nov 2004 14:41:32 +0000 Subject: [PATCH] Fixed Bug # 71802 --- mail-filter/dspam/ChangeLog | 9 +++++++- mail-filter/dspam/Manifest | 4 ++-- mail-filter/dspam/dspam-3.2.2.ebuild | 31 +++++++++++----------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog index b450c86c6405..1f1025e4d307 100644 --- a/mail-filter/dspam/ChangeLog +++ b/mail-filter/dspam/ChangeLog @@ -1,6 +1,13 @@ # 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.29 2004/11/18 10:59:13 st_lim Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.30 2004/11/28 14:41:32 st_lim Exp $ + + 28 Nov 2004; Lim Swee Tat dspam-3.2.2.ebuild: + Fixed bug #71802. + Removed --enable-homedir + Using sqlite-2.7.7 + Changing the newdoc to dodoc. + newins for sqlite specific files is done with the correct set of insopts *dspam-3.2.2 (18 Nov 2004) diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest index 5225a593703c..2d8dfc2593a3 100644 --- a/mail-filter/dspam/Manifest +++ b/mail-filter/dspam/Manifest @@ -1,9 +1,9 @@ -MD5 362d7ed31c930e83dab4b9769a17f3fa ChangeLog 6185 +MD5 c9e7efb3a98f64d3ec7d92721eed3eda ChangeLog 6429 MD5 818341ff579ee7d21ed37a42b91cb945 dspam-3.0.0.ebuild 7029 MD5 b08fbc1616907518bbe03909a57b8b6e dspam-3.1.2.ebuild 14858 MD5 8a08e7029b398b05ff2e2472ffde5465 dspam-3.2.0.ebuild 15966 MD5 b98b3dde5ed0d1d0313a65d6d0211e73 dspam-3.2.1.ebuild 15929 -MD5 e621a2aa12fc853bb5b246546768111f dspam-3.2.2.ebuild 15929 +MD5 c63cb857eba5be84b0763d36ab8be0db dspam-3.2.2.ebuild 15833 MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309 MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317 diff --git a/mail-filter/dspam/dspam-3.2.2.ebuild b/mail-filter/dspam/dspam-3.2.2.ebuild index ed4eac494160..cdf7229005e1 100644 --- a/mail-filter/dspam/dspam-3.2.2.ebuild +++ b/mail-filter/dspam/dspam-3.2.2.ebuild @@ -1,6 +1,6 @@ # 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.2.ebuild,v 1.1 2004/11/18 10:59:13 st_lim Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.2.ebuild,v 1.2 2004/11/28 14:41:32 st_lim Exp $ inherit eutils @@ -10,16 +10,16 @@ SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${PN}-${PV}.tar.g HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html" LICENSE="GPL-2" -IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite" +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-3.0.6 ) + 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="virtual/cron +RDEPEND="sys-apps/cronbase app-admin/logrotate" KEYWORDS="~x86 ~ppc ~alpha ~ia64" SLOT="0" @@ -69,13 +69,12 @@ src_compile() { #myconf="${myconf} --enable-chi-square" myconf="${myconf} --enable-robinson-pvalues" #myconf="${myconf} --enable-broken-mta" - myconf="${myconf} --enable-large-scale" - #myconf="${myconf} --enable-domain-scale" + 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} --enable-homedir --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}" + myconf="${myconf} --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}" myconf="${myconf} --with-logdir=${LOGDIR}" # enables support for debugging (touch /etc/dspam/.debug to turn on) @@ -161,13 +160,13 @@ src_install () { dodoc CHANGELOG LICENSE README RELEASE.NOTES dodoc ${FILESDIR}/README.postfix ${FILESDIR}/README.qmail if use mysql; then - newdoc tools.mysql_drv/README + dodoc tools.mysql_drv/README elif use postgres ; then - newdoc tools.pgsql_drv/README + dodoc tools.pgsql_drv/README elif use oci8 ; then - newdoc tools.ora_drv/README + dodoc tools.ora_drv/README elif use sqlite ; then - newdoc tools.sqlite_drv/README + dodoc tools.sqlite_drv/README fi # build some initial configuration data @@ -199,9 +198,9 @@ src_install () { local PASSWORD="${RANDOM}${RANDOM}${RANDOM}${RANDOM}" # database related configuration and scripts + insinto ${HOMEDIR} + insopts -m644 -o dspam -g dspam if use mysql; then - insinto ${HOMEDIR} - insopts -m644 -o dspam -g dspam if [ -f ${HOMEDIR}/mysql.data ]; then # Use an existing password @@ -228,9 +227,6 @@ src_install () { newins tools.mysql_drv/purge-4.1.sql mysql_purge-4.1.sql newins ${FILESDIR}/upgrade.sql mysql_upgrade.sql elif use postgres ; then - insinto ${HOMEDIR} - insopts -m644 -o dspam -g dspam - if [ -f ${HOMEDIR}/pgsql.data ]; then # Use an existing password PASSWORD="$(tail -n 2 ${HOMEDIR}/pgsql.data | head -n 1 )" @@ -251,9 +247,6 @@ src_install () { newins tools.pgsql_drv/purge.sql pgsql_purge.sql elif use oci8 ; then - insinto ${HOMEDIR} - insopts -m644 -o dspam -g dspam - if [ -f ${HOMEDIR}/oracle.data ]; then # Use an existing password PASSWORD="$(tail -n 2 ${HOMEDIR}/oracle.data | head -n 1 )" -- 2.26.2