Version bump

(Portage version: 2.1_pre3-r1)

4 files changed, 168 insertions, 11 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index fd2b0cdbe27d..952d7496096b 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/dspam-web
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.21 2006/01/08 17:34:50 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.22 2006/01/20 08:43:11 st_lim Exp $
+
+*dspam-web-3.6.3 (20 Jan 2006)
+
+  20 Jan 2006; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.6.3.ebuild:
+  Version bump
 
   08 Jan 2006; Renat Lumpau <rl03@gentoo.org> dspam-web-3.2.7.ebuild,
   dspam-web-3.4.9-r1.ebuild, dspam-web-3.6.0.ebuild, dspam-web-3.6.1.ebuild:
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index 638c6115356e..6522e8797075 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6ce66c606b26a6c7bef6204982b17a13 ChangeLog 3653
 MD5 3556db7ff664537dca11a80a1aa937d3 dspam-web-3.2.7.ebuild 5216
 MD5 26409854de884f5d97f3a6f424e03fa6 dspam-web-3.4.9-r1.ebuild 5034
 MD5 1898f823113a777c154c426f9ee8d194 dspam-web-3.6.0.ebuild 5177
 MD5 ff51188171a9e215248bf6f62cda5138 dspam-web-3.6.1.ebuild 5177
+MD5 ff51188171a9e215248bf6f62cda5138 dspam-web-3.6.3.ebuild 5177
 MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-web-3.2.7 63
 MD5 c26bf920b2afa7ae432ac6b6d96fb9b4 files/digest-dspam-web-3.4.9-r1 63
 MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-web-3.6.0 129
 MD5 5a495629f2b3fbcfabc0f4ae4a9b4e4b files/digest-dspam-web-3.6.1 129
+MD5 f73f2bd58b9d8ace7a6f431e8587c909 files/digest-dspam-web-3.6.3 129
 MD5 ffdfc8d816078f4c58b75b9bed07503f files/htaccess 135
 MD5 b4099a94a52af9abd4ade48d82914c3c files/htpasswd 19
 MD5 f1ea445d6b4ddf81c55a4e886bc04218 metadata.xml 341
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDwVEAEzitwsaoONoRAkHeAJ98kVPaFoFizhupD12fbJ9I75xNVwCghA8k
-voTOPCDLgREw9tNAFk1cb8s=
-=LGWP
------END PGP SIGNATURE-----
diff --git a/www-apps/dspam-web/dspam-web-3.6.3.ebuild b/www-apps/dspam-web/dspam-web-3.6.3.ebuild
new file mode 100644
index 000000000000..8a589d787dd7
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.6.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 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.6.3.ebuild,v 1.1 2006/01/20 08:43:12 st_lim Exp $
+
+inherit webapp eutils
+
+MY_PN=${PN/-web/}
+MY_P=${MY_PN}-${PV}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Web based administration and user controls for dspam"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${MY_P}.tar.gz
+		http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
+HOMEPAGE="http://dspam.nuclearelephant.com/"
+LICENSE="GPL-2"
+
+IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite virtual-users"
+DEPEND=">=mail-filter/dspam-${PV}
+		clamav? ( >=app-antivirus/clamav-0.86 )
+		mysql? ( >=dev-db/mysql-3.23 )
+		sqlite? ( dev-db/sqlite )
+		postgres? ( >=dev-db/postgresql-7.4.3 )
+		>=sys-libs/db-4.0
+		>=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 ~amd64"
+
+# some FHS-like structure
+HOMEDIR="/var/spool/dspam"
+CONFDIR="/etc/mail/dspam"
+LOGDIR="/var/log/dspam"
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-long-username"
+	myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
+	use large-domain && myconf="${myconf} --enable-large-scale" ||\
+	    myconf="${myconf} --enable-domain-scale"
+
+	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
+	myconf="${myconf} --sysconfdir=${CONFDIR}"
+	use virtual-users || myconf="${myconf} --enable-homedir"
+	use clamav || myconf="${myconf} --enable-clamav"
+
+	# 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 sqlite ; then
+		myconf="${myconf} --with-storage-driver=sqlite_drv"
+		myconf="${myconf} --enable-virtual-users"
+	elif 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/linux-headers-2.6"; 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/linux-headers-2.6"; 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
+	else
+		myconf="${myconf} --with-storage-driver=libdb4_drv"
+	fi
+
+	econf ${myconf} || die
+	cd ${S}/webui
+	make
+}
+
+src_install () {
+	cd ${S}/webui
+	webapp_src_preinst
+
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/admin.cgi
+	sed -e 's,/var/dspam,/etc/mail/dspam,' \
+		-e 's,/usr/local,/usr,' \
+		-i ${S}/webui/cgi-bin/dspam.cgi
+
+	cp -r ${S}/webui/htdocs/* ${D}/${MY_HTDOCSDIR} || die
+	cp -r ${S}/webui/cgi-bin/* ${D}/${MY_CGIBINDIR} || die
+	insinto ${MY_HTDOCSDIR}
+	insopts -m644 -o apache -g apache
+
+	newins ${FILESDIR}/htaccess .htaccess
+	newins ${FILESDIR}/htpasswd .htpasswd
+
+	#All files must be owned by server
+	cd ${D}/${MY_HTDOCSDIR}
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+
+	#All files must be owned by server
+	cd ${D}/${MY_CGIBINDIR}
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_CGIBINDIR}/${file}"
+	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 "emerge --config ${PF}"
+	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.6.3 b/www-apps/dspam-web/files/digest-dspam-web-3.6.3
new file mode 100644
index 000000000000..9f83483736ce
--- /dev/null
+++ b/www-apps/dspam-web/files/digest-dspam-web-3.6.3
@@ -0,0 +1,2 @@
+MD5 db1aedb9677e6bf5c7a47a72d4f130e5 dspam-3.6.3.tar.gz 740097
+MD5 8ffe9d41e6104a4c6d19067528193145 dspam_sa_trainer.tar.gz 1230