Version bump. Fixes bug #392407

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

3 files changed, 249 insertions, 7 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 23eb43ed6a13..de24639f1c8b 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.146 2012/04/06 21:51:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.147 2012/04/24 09:08:50 eras Exp $
+
+*dspam-3.10.2 (24 Apr 2012)
+
+  24 Apr 2012; Eray Aslan <eras@gentoo.org> +dspam-3.10.2.ebuild:
+  Version bump. Fixes bug #392407
 
   06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #63588
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index b92e0e8779f3..ac71c9784623 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dspam.confd 299 RMD160 f53e474d51912b00ccf4876a20071814d2066364 SHA1 cde7c587dcf94174568d538cd55188bf5916de16 SHA256 fdc691c71a2518c13f61aa44159f1318b03ba4f9ca004a3f38c3c95ba6f02e63
 AUX dspam.cron-r4 160 RMD160 cd633a4a72ecae12ad70faf8d0ae486bba1fbe6e SHA1 0b620d69451b52968389c6e83d5a904d38299cc1 SHA256 ef59ea37a272b3d044a59fc1f30d1c60087e15d5735ba961cc57458cc5026aca
 AUX dspam.initd 979 RMD160 e7248f5b2feb6416bdc61e0b8ebf7593cae3c573 SHA1 fdbdfd9565e1581b422b2a0afc3daa27003be495 SHA256 4eaf5da3420a6196ce987429bedf3ba25d21616ea1eb2ebc35c58778c0105d7c
 AUX dspam.logrotate 180 RMD160 56ba31d0bf4558dd0b3b6bda247050bd2cbcc18e SHA1 94a988258efad37d51604769b0336c27e1aa3b31 SHA256 17285ab0e624ec52124e8f661649ac9549c00e91a2f8d0d6d9de4eabf273d582
 DIST dspam-3.10.1.tar.gz 1044198 RMD160 f7022c10c7555d8a05e5bacb5804b3dc29f96066 SHA1 dfd78c9f696470077d4e2e2b52f1f42f90ac52cc SHA256 359d9f58564a87da131b8390d0eeecae4aa40d22ff74b97256d46835a2474063
+DIST dspam-3.10.2.tar.gz 1035054 RMD160 7e112981e45e483350b9afc056ebfa4c5561036c SHA1 21133e0ee1880f3e8c849365b7e27a73f6d0413a SHA256 ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9
 EBUILD dspam-3.10.1-r1.ebuild 6170 RMD160 03e300553fceb782b32bba2f240afcd1c86fccf5 SHA1 bc9f1bbfae67d75cda36ef91d5144a5fba92a55c SHA256 f3c423397ee57def7c02637c7631b1d64bdf16af4ec05fa47a1d480cb5184a37
-MISC ChangeLog 24983 RMD160 864f9c0c2a76910bab466f38f970622c1410d87c SHA1 8d77dcf00ca3790cf63534f8f6b26bd24a06d32b SHA256 8f22c16b397dcde8ad56a209c706f7d6bf7a96f8e1979884057e9cec69eb78e7
+EBUILD dspam-3.10.2.ebuild 6166 RMD160 c373b77d01038d1d9d9eee26e5c669da5eb94657 SHA1 e7afed3632ff889ee63bdd85889dd28cf3f45054 SHA256 f655b93fe27c96174ea7ec6aaa129e30f65457a4fc317a7415f0600870b21a55
+MISC ChangeLog 25112 RMD160 1aaa2bbbfec9395115423ade5c89cfe687811cd4 SHA1 1f6168233b4f53f9bce1afd49a4609b568218e48 SHA256 f1e4906e7e3a1e0075a2fe46df9a36883b2eeb317f9d6e5c9b1030d5d63e53aa
 MISC metadata.xml 988 RMD160 d6364edd271e8332bb792dc0dd336962f3386ef5 SHA1 1ab827c2c197afb352ad7bbc0b6be4a5dec8ffe8 SHA256 f4e606cfc13e00ee42e46fdc32059610d9927605bc4e55c10c02fcb71fa65916
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9/ZVEACgkQCaWpQKGI+9TlyACdFKRC1Lb3BBkoVvAkiRBIjPfc
-apsAn00rEty19Y1H4F3XX3UqqsL+z8wP
-=RN9P
+iQIcBAEBCAAGBQJPlm2nAAoJEHfx8XVYajsfhI4QAIuE0V24vNjgnayNv4Ydm91V
+6Ex9QKivG+FNz9erSzbRPGKvt6BgjoaKZ8VRVFD+7ySGLrUJZsRWa2Rnv3cpl890
+9mk61L6XMyjJVmLi1fF06CVHS2Kgovp9ANz5WqzTVxktMcdjnmyxcs+At/UW9yCy
+lX3FlGT/MyjvPjD3i8bbDLpx8Z1jF1eVQZcaIt+UUbRM7AmmTSlZugmyahbgHK/F
+ETXcXlx/e49ZdCVwIJ1GHBwTrTI7nJFdhNgDa6XBD4osNL0BP4dOReJF5agyFahX
+8DBGgBXkFIBTrISUB0pdfWX1x3FPI3/TiI43pVJjmZPvDE/um+Tq01OFdZUePplH
+dyaFhMyCaZ8gUktt18Gsc3BaQYhL2h4MlST1tq+KzOCrPy+ma2XZbiFvBM3VPJNu
+QVwsKdTwISc9JPH/RMdJzprTUxayMSnagu1uyR61/WJiLzplTgkUvBozuj+CtPCi
+K3mhOrHU+x/XsWAMLHVQ5oL+QmZDZo7f8JlxdKCsZA1FQAj7Z0iJfDVg6vuA2QUL
+RrFyTRTEMmOmnvNJ/56pLSfUYnyKY6GJYasn+fpphoyi4UX/+Gp7LCTltue1Oqe1
+IdLo4bSmIhVDXU41EzWeqZ+cR4lAT4PQpEEYGbqcPexJHiKcTQg4S4uHaAEk09oP
+oFOkxGevUpPuloamHY+H
+=Y2aJ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.10.2.ebuild b/mail-filter/dspam/dspam-3.10.2.ebuild
new file mode 100644
index 000000000000..fbe2bbad531b
--- /dev/null
+++ b/mail-filter/dspam/dspam-3.10.2.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.2.ebuild,v 1.1 2012/04/24 09:08:50 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="~amd64 ~ppc ~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
+
+	# stop logrotate-3.8 from complaining
+	dodir /var/log/dspam
+	fowners dspam:dspam /var/log/dspam
+	fperms 0750 /var/log/dspam
+
+	# Install dspamc setgid
+	fowners root:dspam /usr/bin/dspamc &&
+		fperms g+s /usr/bin/dspamc ||
+		die "failed to alter dspamc owner:group or mode"
+}
+
+pkg_preinst() {
+	# dspam-3.10.0: config dir change, should be removed at some later point
+	if [ -d "${ROOT}/etc/mail/dspam" ]; then
+		ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
+		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
+}