version bump

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

3 files changed, 237 insertions, 15 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 91bf9e25fcbc..992fa433c9f4 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.135 2011/08/07 14:49:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.136 2011/08/11 19:00:19 eras Exp $
+
+*dspam-3.10.1 (11 Aug 2011)
+
+  11 Aug 2011; Eray Aslan <eras@gentoo.org> +dspam-3.10.1.ebuild:
+  version bump
 
   07 Aug 2011; Eray Aslan <eras@gentoo.org> dspam-3.10.0-r1.ebuild:
   Fix small-scale use flag - bug #378075
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 2c4b2f251d6a..f5f7544fec6e 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -13,28 +13,30 @@ AUX logrotate.dspam 155 RMD160 17e0f5401843ccac1d349b938b1e9b755f847108 SHA1 746
 AUX pgsql_createdb.py 4520 RMD160 bcabe6298a0e97c4b3c10c48f98c5d09eb4a063b SHA1 0fe09f67a4f431dd9bf57a3e6c9ef6662f837403 SHA256 dc107ae72a3832b6ebce1066c5e84a0b164bcc01be74bb7dc1ee28c9135e9768
 AUX pgsql_purge.py 1236 RMD160 0fcc6154527932ded25397b093d40d113bb44335 SHA1 198add2080c5d229c77c518ff49b372a6f6f2b93 SHA256 3e996ed8ed5fdbdf3a65504ead870c742be7c0d05f4760e3d7d798205b6cdc1b
 DIST dspam-3.10.0.tar.gz 1027188 RMD160 87c0ea034557a1fce47a5b9e2c8ae0154b5dbb81 SHA1 68eb4e961898275a74a627a364ff0e7fe292ac76 SHA256 9195f584bbfdf8d55efe6b383aac551c1ebbd2024305502f1fd7491da5f7e29b
+DIST dspam-3.10.1.tar.gz 1044198 RMD160 f7022c10c7555d8a05e5bacb5804b3dc29f96066 SHA1 dfd78c9f696470077d4e2e2b52f1f42f90ac52cc SHA256 359d9f58564a87da131b8390d0eeecae4aa40d22ff74b97256d46835a2474063
 DIST dspam-3.8.0-patches-20091202.tar.gz 16009 RMD160 7dfff3091f4c8ccdd8feda0af8292c5b755e76e2 SHA1 e836d49679e07659775756cd504142d8d194a9b8 SHA256 c72f7e624ceafcf43f0402430eaeaaa47c7a1507192e696dadbc7f0957ca5d5b
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
 DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215
 EBUILD dspam-3.10.0-r1.ebuild 5908 RMD160 29a67f5fac8ef1c6c1c5787a7a1b1633ee9d629b SHA1 b418139c23bf1aa3bd086f5e962e09d5f37b5fce SHA256 48f3926b64ad9a6e1f9e236bcc327350601eba0385203cf0dd9e6c5e8584fc82
 EBUILD dspam-3.10.0.ebuild 6153 RMD160 6bf5922ab9822aad7acab4c927e6b71cdae57e04 SHA1 a181b49c423a901d93ef89d605fbb6bd3d3ede63 SHA256 35c85a297f2740e07ba6a4a91d5ad4b4b5bd39afaf4d580d5f33a32752813bf2
+EBUILD dspam-3.10.1.ebuild 5905 RMD160 fd65f574705f0410bfa81d254d0001c7afd11935 SHA1 103222cb15927ac7a65973fb5071af3de16bc645 SHA256 61f24e87178bb5909cf4425e652ff2e2abea5fb15b1448f99552a0e1d9f9443e
 EBUILD dspam-3.8.0-r15.ebuild 19692 RMD160 dbfc9ae12e751cc0ade8608f3073c284fd6f7fe4 SHA1 3beff2e7820d8a3a7e35d2ca871e042d8fc0c100 SHA256 6002f6e9db1e6e2de4296596297e7ea91d59b7090652d428df53301737fcd4a7
-MISC ChangeLog 23373 RMD160 80fd240a0bc8484b8c97f26c7bd5eca15fab23b4 SHA1 0ae9afe84aea395116d5cabef8c90f9d8e315e79 SHA256 18568e45de3a9751f7a47f6570b15b295c92ed655eab899861079f20eedda5b8
+MISC ChangeLog 23484 RMD160 532e55e1ce42451180f862f96ec6406b4d7f9ddd SHA1 0cd11c12dc92252ce9277fa0a0ed9b4dc0952e64 SHA256 97ce9c3295376991574f959f0ab98fdedec957e294e2fe9c6d658e35a347ec07
 MISC metadata.xml 1429 RMD160 40b71e8574ed33364dd81fae8f6f510c9dadbe5f SHA1 727dcfbe77e781fb4ad6b45837d70acace16e4bb SHA256 797884e76db42660b78b292db1436cf3154c74cd71a891ea482f9a68264d1560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOPqYdAAoJEHfx8XVYajsfKe4P/3SN/LjTO4AVrJzegkhL9tGH
-CyT6QX2S4A76b49pH4S8HXMFHHcWxaH+mbfuNE9I+x2A3DDUsfYvyzjfvcB0PtCU
-GLl9c81smn30teSB3Gb7pBUSH9mUANXfkLqnJ6UabGb9pVVeEyLDO/Pf7jddfeL+
-degRqt7oJwnOVyV7SQ5oe8iyR893Gqwrv4auqaICOSi9m2gMx0KLvu2V1gIbXJaO
-odep7qKZEflra2WtRbhRpZcyk6ylVg3p/wx8KFD8ikhCHR4fpRnKYKIEd1JXvJes
-/ldePN02t1Iow+bV/cwxAeIwfG4KvF1jp2OutfdeZIPXoXgFKJbYZqye6TDEEIU+
-nIQjkTZPdlhcBSK5PQcJwoLrLzrdfCSzl1FK33ROR5Oge5/eOnEdC6g0B917cGO2
-ErNWZoUbzkKysTGxtujYCW2EfsunfKL1Sm/QUFktzZhkowkCpFgRJRItFxdRU0w8
-V2iw0tRs8samz9jYSLvc9ts2Cb44ECV/kxOaj6CyZ5M8Vdh1rBqhm2J8PGDOYy+/
-DZ7XfzNVYMiuzE/E+sgNNFAyTvoyl95ZZXA5J5dzn+ZHwHp3JuUDrV6QoG36hOjN
-aDhXTKdTR4TXTkXOPIN9hRC+wutx0WgWNFb8ntnK4QYbDEeCFZHgQyKr290VxJar
-lNqgmYvffi7DWrP4tLPO
-=6eQQ
+iQIcBAEBCAAGBQJORCbSAAoJEHfx8XVYajsf9gMP/RDmWPUoJYrkFgUv4kJyP4UG
+jYUi5R9yhonxXpAvcWLJai3upDdw38hVCg9mlnlDALT3RW8jRh6KOFe8NWoUv4OH
+Lir28MOer+hYzIsI8BtB7SFTJdtsKjjHtdgwPyN5jEVsPo3B7WmsHK+G6Heu+tga
+F8c8IRP7+mZe/GreY6c0GnJ5fLwwtczAUafagmu5pmoEZwCrq5bNV+pH/mim4d06
+Jri6LN1trW5ZY1hV2n5VvQYNlwpfIdGmbD1KGTolMmLufktuRjiCLq+taZwVz/jb
+nQcmJXWEM3s1fYK0xDlkLfDHvhEh+F96gMsCC+jmWmdHzqLfFNUhllhVvjDE4oyj
+Xp/BpsZfVofgfgAYx5xaU3IJEyecCkU5ZPR10MOBZkTTfI2LQ4SCEzPo4wt5YebP
+aiIdDlIaahMENzHTVfirhCDUuLE744n4vnzdHGBLuEO3W5DKqGSzB1Khc2tBu6NN
+cIm42T98xjDIr7psGtBhrQ/1SrsDhRwObaumqnI77nDUEKPfcEjiHKywpmxUIzz8
+DimVSEcOqyvynpuX0wlPJbHlYvMiA7/03+r4zAFAJeYV6pOO8OWwMy62BqrBc61a
+nUCDpG6zmQ7I6YvkyQKYH013wcMbp1ujtQdgT7DBu1dUvS40Ws3zzXW0lToA91au
+mfgZdlm9xLplG69iLuWb
+=+jg5
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.10.1.ebuild b/mail-filter/dspam/dspam-3.10.1.ebuild
new file mode 100644
index 000000000000..967801b59e8f
--- /dev/null
+++ b/mail-filter/dspam/dspam-3.10.1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.1.ebuild,v 1.1 2011/08/11 19:00:19 eras Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
+HOMEPAGE="http://dspam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+DRIVERS_IUSE="+hash mysql postgres sqlite"
+SCALES_IUSE="small-scale +domain-scale large-scale"
+IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
+
+DEPEND="
+	ldap? ( net-nds/openldap )
+	mysql? ( >=virtual/mysql-5.0 )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+
+RDEPEND="
+	${DEPEND}
+	clamav? ( app-antivirus/clamav )
+	syslog?	( virtual/logger )
+"
+
+# Demands on sane USE flags:
+# - find out what driver to use: select at least one
+# - if static-libs is set, only one driver may be selected
+# - find out what scale to use: select exactly one
+# - user-homedirs does not work with virtual-users
+# - virtual-users does not work with hash or sqlite
+REQUIRED_USE="
+	|| ( ${DRIVERS_IUSE//+} )
+	static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
+	^^ ( ${SCALES_IUSE//+} )
+	virtual-users? ( !user-homedirs )
+	hash? ( !virtual-users )
+	sqlite? ( !virtual-users )
+"
+
+# dspam setup defaults
+DSPAM_HOME=/var/spool/dspam
+DSPAM_CONF=/etc/dspam
+DSPAM_LOG=/var/log/dspam
+DSPAM_MODE=2510
+DSPAM_DRIVERS=
+DSPAM_DRIVERS_EXTRAS=
+
+pkg_setup() {
+	# setup storage, this sets DSPAM_DRIVERS
+	dspam_setup_storage_drivers
+
+	# create dspam user and group
+	dspam_setup_user
+}
+
+src_configure() {
+	econf \
+	--sysconfdir=${DSPAM_CONF} \
+	--with-dspam-home=${DSPAM_HOME} \
+	--with-dspam-home-group=dspam \
+	--with-dspam-mode=${DSPAM_MODE} \
+	--with-dspam-group=dspam \
+	--with-logdir=${DSPAM_LOG} \
+	--enable-external-lookup \
+	--enable-long-usernames \
+	--enable-split-configuration \
+	$(use_enable clamav) \
+	$(use_enable daemon) \
+	$(use_enable debug) \
+	$(use_enable debug bnr-debug) \
+	$(use_enable debug verbose-debug) \
+	$(use_enable domain-scale) \
+	$(use_enable large-scale) \
+	$(use_enable static-libs static) \
+	$(use_enable syslog) \
+	$(use_enable user-homedirs homedir) \
+	$(use_enable virtual-users) \
+	--with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
+	$(use mysql || use postgres && echo "--enable-preferences-extension") \
+	$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
+}
+
+dspam_setup_user() {
+	# DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
+	# under suexec in apache, so DSPAM user/group need to be regular users too
+
+	local euid egid
+	for euid in {1000..5000} ; do
+		[ -z "$(egetent passwd ${euid})" ] && break
+	done
+	for egid in {1000..5000} ; do
+		[ -z "$(egetent group ${egid})" ] && break
+	done
+	enewgroup dspam ${egid}
+	enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
+}
+
+dspam_setup_storage_drivers() {
+	# Find out which storage drivers need to be enabled, and set some
+	# variables so that src_configure can pick them up
+
+	if use hash; then
+		DSPAM_DRIVERS+=",hash_drv"
+	fi
+
+	if use mysql; then
+		DSPAM_DRIVERS+=",mysql_drv"
+		DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
+	fi
+
+	if use postgres; then
+		DSPAM_DRIVERS+=",pgsql_drv"
+	fi
+
+	if use sqlite; then
+		DSPAM_DRIVERS+=",sqlite3_drv"
+	fi
+
+	if ! use static-libs; then
+		# set the driver name twice to avoid a static build
+		DSPAM_DRIVERS+=${DSPAM_DRIVERS}
+	fi
+
+	# remove first comma separator
+	DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
+	einfo "Building with drivers: ${DSPAM_DRIVERS}"
+	#echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
+}
+
+src_install() {
+	default
+
+	if use daemon; then
+		newinitd "${FILESDIR}/dspam.initd" dspam
+		newconfd "${FILESDIR}/dspam.confd" dspam
+	fi
+
+	if use mysql; then
+		insinto "/usr/share/${PN}/mysql"
+
+		local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
+		if use virtual-users; then
+			files+=" virtual_user_aliases.sql virtual_users.sql"
+		fi
+
+		for file in $files; do
+			doins src/tools.mysql_drv/${file}
+		done
+	fi
+
+	if use postgres; then
+		insinto "/usr/share/${PN}/pgsql"
+
+		local files="pgsql_objects.sql purge-pe.sql purge.sql"
+		if use virtual-users; then
+			files+=" virtual_users.sql"
+		fi
+
+		for file in $files; do
+			doins src/tools.pgsql_drv/${file}
+		done
+	fi
+
+	if use sqlite; then
+		insinto "/usr/share/${PN}/sqlite"
+		newins src/tools.sqlite_drv/purge-3.sql purge.sql
+	fi
+
+	insinto "${DSPAM_HOME}/txt"
+	doins txt/*.txt
+	for i in spam nonspam; do
+		echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
+		doins "${T}/msgtag.${i}"
+	done
+
+	exeinto /usr/bin
+	newexe contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/dspam.cron-r4" dspam
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/dspam.logrotate" dspam
+
+	dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
+}
+
+pkg_preinst() {
+	# dspam-3.10.0: config dir change, should be removed at some later point
+	ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
+	if [ -d "${ROOT}/etc/mail/dspam" ]; then
+		if [ -h "${ROOT}${DSPAM_CONF}" ]; then
+			# symlink, this is the setup in older ebuilds
+			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
+			rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
+			eend $?
+
+		elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
+			# directory and no symlink, do it manually since we cannot decide.
+			ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
+
+		else
+			# nothing interesting in /etc/dspam
+			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
+			mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
+			eend $?
+		fi
+	fi
+}