Fixed dspam web

5 files changed, 179 insertions, 8 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index 88ca2e32c198..be2bc49bd36c 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/dspam-web
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.15 2005/03/11 04:26:41 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.16 2005/03/23 10:24:03 st_lim Exp $
+
+*dspam-web-3.4.1 (23 Mar 2005)
+
+  23 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.4.0.ebuild,
+  +dspam-web-3.4.1.ebuild:
+  Added 3.4.1
 
 *dspam-web-3.4_beta3 (11 Mar 2005)
 
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index 4a84ba324813..f0e9286a174f 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,10 +1,12 @@
 MD5 ce99e48bc647985e0f388aef7413d57f ChangeLog 2798
 MD5 a21ea1fdf0293cd17d270dadc6e1d7e3 dspam-web-3.2.7.ebuild 5213
-MD5 767d81eafe1a285a8522550f4e3e5dbb dspam-web-3.4.0.ebuild 5118
+MD5 92c79b019116bb675bdc958145d1c0e1 dspam-web-3.4.0.ebuild 5088
+MD5 92c79b019116bb675bdc958145d1c0e1 dspam-web-3.4.1.ebuild 5088
 MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
 MD5 c885857556610347f7225ab4f6153070 dspam-web-3.4_rc3.ebuild 4972
 MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
 MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
 MD5 8518bd049104dded248d771b3238a776 files/digest-dspam-web-3.4_rc3 65
 MD5 75c7634845fababdfe9dbbd4be1b613a files/digest-dspam-web-3.4.0 63
+MD5 bd9de6b83d0fbae03ae313c8e47ecfe2 files/digest-dspam-web-3.4.1 63
 MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-web-3.2.7 63
diff --git a/www-apps/dspam-web/dspam-web-3.4.0.ebuild b/www-apps/dspam-web/dspam-web-3.4.0.ebuild
index e3cce4e653e1..995f109ac456 100644
--- a/www-apps/dspam-web/dspam-web-3.4.0.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.4.0.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/www-apps/dspam-web/dspam-web-3.4.0.ebuild,v 1.1 2005/03/23 06:08:04 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.4.0.ebuild,v 1.2 2005/03/23 10:24:03 st_lim Exp $
 
 inherit webapp eutils
 
@@ -53,7 +53,7 @@ src_compile() {
 			myconf="${myconf} --enable-daemon"
 		fi
 
-		use virtual-users && myconf="${myconf} --enable-virtual-users-users"
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
 		# an experimental feature available with MySQL and PgSQL backend
 		use neural && myconf="${myconf} --enable-neural-networking"
 	elif use postgres ; then
@@ -66,13 +66,13 @@ src_compile() {
 			myconf="${myconf} --enable-daemon"
 		fi
 
-		use virtual-users && myconf="${myconf} --enable-virtual-users-users"
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
 		# an experimental feature available with MySQL and PgSQL backend
 		use neural && myconf="${myconf} --enable-neural-networking"
 	elif use oci8 ; then
 		myconf="${myconf} --with-storage-driver=ora_drv"
 		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
-		myconf="${myconf} --enable-virtual-users-users"
+		myconf="${myconf} --enable-virtual-users"
 
 		# I am in no way a Oracle specialist. If someone knows
 		# how to query the version of Oracle, then let me know.
@@ -81,10 +81,10 @@ src_compile() {
 		fi
 	elif use sqlite3 ; then
 		myconf="${myconf} --with-storage-driver=sqlite3_drv"
-		myconf="${myconf} --enable-virtual-users-users"
+		myconf="${myconf} --enable-virtual-users"
 	elif use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
-		myconf="${myconf} --enable-virtual-users-users"
+		myconf="${myconf} --enable-virtual-users"
 	else
 		myconf="${myconf} --with-storage-driver=libdb4_drv"
 	fi
diff --git a/www-apps/dspam-web/dspam-web-3.4.1.ebuild b/www-apps/dspam-web/dspam-web-3.4.1.ebuild
new file mode 100644
index 000000000000..2568a6fa1653
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.4.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2005 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.4.1.ebuild,v 1.1 2005/03/23 10:24:03 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PN=${PN/-web/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Web based administration and user controls for dspam"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz"
+
+HOMEPAGE="http://dspam.nuclearelephant.com/"
+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
+IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite sqlite3 large-domain virtual-users"
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-long-username"
+	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} --sysconfdir=${HOMEDIR}"
+	myconf="${myconf} --with-logdir=${LOGDIR}"
+	use virtual-users || myconf="${myconf} --with-dspam-home=${HOMEDIR}"
+
+	# 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; 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-preferences-extension"
+
+		if has_version sys-kernel/linux26-headers; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	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-preferences-extension"
+
+		if has_version sys-kernel/linux26-headers; then
+			myconf="${myconf} --enable-daemon"
+		fi
+
+		use virtual-users && myconf="${myconf} --enable-virtual-users"
+		# an experimental feature available with MySQL and PgSQL backend
+		use neural && myconf="${myconf} --enable-neural-networking"
+	elif use oci8 ; then
+		myconf="${myconf} --with-storage-driver=ora_drv"
+		myconf="${myconf} --with-oracle-home=${ORACLE_HOME}"
+		myconf="${myconf} --enable-virtual-users"
+
+		# 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
+			myconf="${myconf} --with-oracle-version=10"
+		fi
+	elif use sqlite3 ; then
+		myconf="${myconf} --with-storage-driver=sqlite3_drv"
+		myconf="${myconf} --enable-virtual-users"
+	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
+	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.4.1 b/www-apps/dspam-web/files/digest-dspam-web-3.4.1
new file mode 100644
index 000000000000..89d0c29f976a
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.4.1
@@ -0,0 +1 @@
+MD5 46764fdcf5db676ac784e7a633e19da3 dspam-3.4.1.tar.gz 692977