Version bump

11 files changed, 185 insertions, 204 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index 8219e0ea8724..c3ec7d511902 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/dspam-web
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.6 2004/10/21 03:34:51 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.7 2004/11/04 17:37:58 st_lim Exp $
+
+  05 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump
 
   21 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.2_rc3.ebuild:
   Need to make to get configure.pl
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index 6dae37adb76f..993a19d93602 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,12 +1,10 @@
 MD5 82c8023cfd7c1a6103f3a131dfa70921 ChangeLog 1494
 MD5 4692761753a5e1a98e276b526d94012e dspam-web-3.0.0.ebuild 2466
-MD5 55a56f7500a70a7a2b0eb13264adc8d0 dspam-web-3.1.0.ebuild 2496
-MD5 4c0fb80119dae74b9a563a35fe629569 dspam-web-3.1.1.ebuild 2496
+MD5 a345741af8869f1b7bcf6df10af4e68e dspam-web-3.2.0.ebuild 5251
+MD5 a345741af8869f1b7bcf6df10af4e68e dspam-web-3.2.1.ebuild 5251
 MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
-MD5 3f1a94c15ede34153bd3c0c62ecca6c0 dspam-web-3.2_rc3.ebuild 5236
 MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
 MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
-MD5 e867cb6cbb3196ac407e7dfc765bb327 files/digest-dspam-web-3.2_rc3 65
 MD5 05dce5dc8cf516655657aa2a4cc5f1da files/digest-dspam-web-3.0.0 63
-MD5 7f1185a1a89bc7c74aafba93afc2b0cf files/digest-dspam-web-3.1.0 63
-MD5 1abffcec9dd1aad2db3d68918b4aec05 files/digest-dspam-web-3.1.1 63
+MD5 4b7bb6bbede742676e3e7017210104c5 files/digest-dspam-web-3.2.0 63
+MD5 4d666bbdf8092d4bd49428ea31eadbfb files/digest-dspam-web-3.2.1 63
diff --git a/www-apps/dspam-web/dspam-web-3.1.0.ebuild b/www-apps/dspam-web/dspam-web-3.1.0.ebuild
deleted file mode 100644
index 2d43cf3dad7d..000000000000
--- a/www-apps/dspam-web/dspam-web-3.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.1.0.ebuild,v 1.1 2004/08/23 14:14:01 st_lim Exp $
-
-inherit webapp
-
-MY_PN=${PN/-web/}
-MY_PV=${PV/_beta11/.beta.1.1}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Web based administration and user controls for dspam"
-SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${MY_P}.tar.gz"
-
-HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
-LICENSE="GPL-2"
-DEPEND=">=mail-filter/dspam-3.1.0_beta11
-	>=net-www/apache-1.3
-	>=dev-lang/perl-5.8.2
-	>=dev-perl/GD-2.0
-	dev-perl/GD-Graph3d
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
-S=${WORKDIR}/${MY_P}/cgi
-
-src_compile () {
-	einfo "Nothing to compile"
-}
-
-src_install () {
-	webapp_src_preinst
-
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i ${S}/admin.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i ${S}/dspam.cgi
-
-	insinto ${MY_HTDOCSDIR}
-	insopts -m644 -o apache -g apache
-
-	doins *.css
-	doins *.gif
-	doins rgb.txt
-	doins default.prefs
-	doins admins
-
-	newins ${FILESDIR}/htaccess .htaccess
-	newins ${FILESDIR}/htpasswd .htpasswd
-
-	insopts -m755 -o apache -g apache
-	doins *.cgi
-
-	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
-	done
-
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins templates/*.html
-
-	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_src_install
-}
-
-pkg_config () {
-	# add apache to the dspam group so the CGIs can access the data
-
-	local groups
-	groups=`groups apache`
-	groups=`echo ${groups} | sed -e 's/ /,/g'`
-	usermod -G "${groups},dspam" apache
-}
-
-pkg_postinst () {
-	einfo "The CGIs need to be executed as group dspam in order to write"
-	einfo "to the dspam data directory. You will need to configure apache"
-	einfo "manually to do this. Another option is to add the user apache"
-	einfo "to the dspam group. You can do this automatically by running:"
-	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
-	einfo "This app requires basic auth in order to operate properly."
-	einfo "You will need to add dspam users to the .htpasswd file or"
-	einfo "configure a different authentication mechanism for the user"
-	einfo "accounts."
-}
diff --git a/www-apps/dspam-web/dspam-web-3.1.1.ebuild b/www-apps/dspam-web/dspam-web-3.1.1.ebuild
deleted file mode 100644
index 634676234470..000000000000
--- a/www-apps/dspam-web/dspam-web-3.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.1.1.ebuild,v 1.1 2004/08/23 17:22:50 st_lim Exp $
-
-inherit webapp
-
-MY_PN=${PN/-web/}
-MY_PV=${PV/_beta11/.beta.1.1}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Web based administration and user controls for dspam"
-SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${MY_P}.tar.gz"
-
-HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
-LICENSE="GPL-2"
-DEPEND=">=mail-filter/dspam-3.1.0_beta11
-	>=net-www/apache-1.3
-	>=dev-lang/perl-5.8.2
-	>=dev-perl/GD-2.0
-	dev-perl/GD-Graph3d
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil"
-KEYWORDS="~x86 ~ppc"
-S=${WORKDIR}/${MY_P}/cgi
-
-src_compile () {
-	einfo "Nothing to compile"
-}
-
-src_install () {
-	webapp_src_preinst
-
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i ${S}/admin.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i ${S}/dspam.cgi
-
-	insinto ${MY_HTDOCSDIR}
-	insopts -m644 -o apache -g apache
-
-	doins *.css
-	doins *.gif
-	doins rgb.txt
-	doins default.prefs
-	doins admins
-
-	newins ${FILESDIR}/htaccess .htaccess
-	newins ${FILESDIR}/htpasswd .htpasswd
-
-	insopts -m755 -o apache -g apache
-	doins *.cgi
-
-	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
-	done
-
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins templates/*.html
-
-	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_src_install
-}
-
-pkg_config () {
-	# add apache to the dspam group so the CGIs can access the data
-
-	local groups
-	groups=`groups apache`
-	groups=`echo ${groups} | sed -e 's/ /,/g'`
-	usermod -G "${groups},dspam" apache
-}
-
-pkg_postinst () {
-	einfo "The CGIs need to be executed as group dspam in order to write"
-	einfo "to the dspam data directory. You will need to configure apache"
-	einfo "manually to do this. Another option is to add the user apache"
-	einfo "to the dspam group. You can do this automatically by running:"
-	echo
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	echo
-	einfo "This app requires basic auth in order to operate properly."
-	einfo "You will need to add dspam users to the .htpasswd file or"
-	einfo "configure a different authentication mechanism for the user"
-	einfo "accounts."
-}
diff --git a/www-apps/dspam-web/dspam-web-3.2_rc3.ebuild b/www-apps/dspam-web/dspam-web-3.2.0.ebuild
index 8ac695854da9..ab8cb5cd1726 100644
--- a/www-apps/dspam-web/dspam-web-3.2_rc3.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.2.0.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/www-apps/dspam-web/dspam-web-3.2_rc3.ebuild,v 1.3 2004/10/21 03:34:51 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.2.0.ebuild,v 1.1 2004/11/04 17:37:58 st_lim Exp $
 
 inherit webapp eutils
 
@@ -30,7 +30,6 @@ src_compile() {
 	# these are the default settings
 	myconf="${myconf} --with-signature-life=14"
 	myconf="${myconf} --enable-broken-return-codes"
-	myconf="${myconf} --enable-preferences-extension"
 	myconf="${myconf} --enable-experimental"
 	myconf="${myconf} --enable-long-username"
 	myconf="${myconf} --enable-robinson"
@@ -58,6 +57,7 @@ src_compile() {
 		myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
 		myconf="${myconf} --with-client-compression"
 		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
 
 		# an experimental feature available with MySQL and PgSQL backend
 		if use neural ; then
@@ -68,6 +68,7 @@ src_compile() {
 		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
@@ -77,6 +78,7 @@ src_compile() {
 		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.
@@ -88,15 +90,13 @@ src_compile() {
 	elif use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
 		myconf="${myconf} --enable-virtual-users"
+		myconf="${myconf} --enable-preferences-extension"
 
 	else
 		myconf="${myconf} --with-storage-driver=libdb4_drv"
-		myconf="${myconf} --with-db4-includes=/usr/include"
-		myconf="${myconf} --with-db4-libraries=/usr/lib"
 	fi
 
-	econf ${myconf} \
-		--with-delivery-agent="${agent}" || die
+	econf ${myconf} || die
 	cd ${S}/cgi
 	make
 }
diff --git a/www-apps/dspam-web/dspam-web-3.2.1.ebuild b/www-apps/dspam-web/dspam-web-3.2.1.ebuild
new file mode 100644
index 000000000000..805c91a0054c
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.2.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.2.1.ebuild,v 1.1 2004/11/04 17:37:58 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PN=${PN/-web/}
+MY_PV=${PV/_rc3/.pr1}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="Web based administration and user controls for dspam"
+SRC_URI="http://www.nuclearelephant.com/projects/dspam/sources/${MY_P}.tar.gz"
+
+HOMEPAGE="http://www.nuclearelephant.com/projects/dspam/index.html"
+LICENSE="GPL-2"
+DEPEND=">=mail-filter/dspam-3.2_rc3
+	>=net-www/apache-1.3
+	>=dev-lang/perl-5.8.2
+	>=dev-perl/GD-2.0
+	dev-perl/GD-Graph3d
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil"
+KEYWORDS="~x86 ~ppc"
+S=${WORKDIR}/${MY_P}
+HOMEDIR=/etc/mail/dspam
+
+src_compile() {
+	local myconf
+
+	# these are the default settings
+	myconf="${myconf} --with-signature-life=14"
+	myconf="${myconf} --enable-broken-return-codes"
+	myconf="${myconf} --enable-experimental"
+	myconf="${myconf} --enable-long-username"
+	myconf="${myconf} --enable-robinson"
+	#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"
+
+	# ${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"
+	myconf="${myconf} --enable-homedir --with-dspam-home=${HOMEDIR} --sysconfdir=${HOMEDIR}"
+	myconf="${myconf} --with-logdir=/var/log/dspam"
+
+	# enables support for debugging (touch /etc/dspam/.debug to turn on)
+	# optional: even MORE debugging output, use with extreme caution!
+	use debug && myconf="${myconf} --enable-debug --enable-verbose-debug"
+
+	# select storage driver
+	if use mysql || use mysql41; 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} --with-client-compression"
+		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"
+		myconf="${myconf} --enable-preferences-extension"
+
+	else
+		myconf="${myconf} --with-storage-driver=libdb4_drv"
+	fi
+
+	econf ${myconf} || die
+	cd ${S}/cgi
+	make
+}
+
+src_install () {
+	cd ${S}/cgi
+	webapp_src_preinst
+
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i admin.cgi
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i dspam.cgi
+
+	insinto ${MY_HTDOCSDIR}
+	insopts -m644 -o apache -g apache
+	doins *.css
+	doins *.gif
+	doins rgb.txt
+	doins default.prefs
+	doins admins
+	doins configure.pl
+
+	newins ${FILESDIR}/htaccess .htaccess
+	newins ${FILESDIR}/htpasswd .htpasswd
+
+	insopts -m755 -o apache -g apache
+	doins *.cgi
+
+	for CGI_SCRIPT in admin.cgi  admingraph.cgi  dspam.cgi  graph.cgi; do
+		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
+	done
+
+	dodir ${MY_HTDOCSDIR}/templates
+
+	insinto ${MY_HTDOCSDIR}/templates
+	doins templates/*.html
+
+	#All files must be owned by server
+	cd ${D}${MY_HTDOCSDIR}
+	for x in `find . -type f -print` ; do
+		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	done
+
+	webapp_src_install
+}
+
+pkg_config () {
+	# add apache to the dspam group so the CGIs can access the data
+
+	local groups
+	groups=`groups apache`
+	groups=`echo ${groups} | sed -e 's/ /,/g'`
+	usermod -G "${groups},dspam" apache
+}
+
+pkg_postinst () {
+	einfo "The CGIs need to be executed as group dspam in order to write"
+	einfo "to the dspam data directory. You will need to configure apache"
+	einfo "manually to do this. Another option is to add the user apache"
+	einfo "to the dspam group. You can do this automatically by running:"
+	echo
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	echo
+	einfo "This app requires basic auth in order to operate properly."
+	einfo "You will need to add dspam users to the .htpasswd file or"
+	einfo "configure a different authentication mechanism for the user"
+	einfo "accounts."
+}
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.1.0 b/www-apps/dspam-web/files/digest-dspam-web-3.1.0
deleted file mode 100644
index 5ae37a5f154d..000000000000
--- a/www-apps/dspam-web/files/digest-dspam-web-3.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 217c622c8eba132756ebc3cac8396897 dspam-3.1.0.tar.gz 611220
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.1.1 b/www-apps/dspam-web/files/digest-dspam-web-3.1.1
deleted file mode 100644
index d5be6906884e..000000000000
--- a/www-apps/dspam-web/files/digest-dspam-web-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2e316ca905af86dd73d2abe5ba69b82 dspam-3.1.1.tar.gz 612267
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.2.0 b/www-apps/dspam-web/files/digest-dspam-web-3.2.0
new file mode 100644
index 000000000000..b5b46dde2f67
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.2.0
@@ -0,0 +1 @@
+MD5 6ebcbc130afde2ef0dc00e95051ab362 dspam-3.2.0.tar.gz 617716
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.2.1 b/www-apps/dspam-web/files/digest-dspam-web-3.2.1
new file mode 100644
index 000000000000..619daf44be2e
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.2.1
@@ -0,0 +1 @@
+MD5 a4357c02ca39a68480719adf47fca67a dspam-3.2.1.tar.gz 618780
diff --git a/www-apps/dspam-web/files/digest-dspam-web-3.2_rc3 b/www-apps/dspam-web/files/digest-dspam-web-3.2_rc3
deleted file mode 100644
index 3704cecc84df..000000000000
--- a/www-apps/dspam-web/files/digest-dspam-web-3.2_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e096266381684e44ae9cc8793ea72ab3 dspam-3.2.pr1.tar.gz 608734