Install the dspamc binary setgid so it can read its config file when called by any user similar to the dspam binary.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 243 insertions, 17 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 56a3e2434cff..7ccc809e6a4f 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,12 @@
 # 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.137 2011/08/13 04:19:26 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.138 2011/08/24 08:54:54 radhermit Exp $
+
+*dspam-3.10.1-r1 (24 Aug 2011)
+
+  24 Aug 2011; Tim Harder <radhermit@gentoo.org> +dspam-3.10.1-r1.ebuild:
+  Install the dspamc binary setgid so it can read its config file when called
+  by any user similar to the dspam binary.
 
   13 Aug 2011; Eray Aslan <eras@gentoo.org> dspam-3.10.1.ebuild:
   stop logwatch from complaining - bug #378877
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 5b1fea40cf2a..7cdfecac4035 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX README.postfix 309 RMD160 34f35ffa4e393ba1791cef2800bc8b4d4f49df5b SHA1 c004a3e7d54dfdd6fae8a654e44d0b9240935739 SHA256 e0928cf2d734e79419c30a4ee829962351ef5a1247ed1d1ddf3b58410e14828b
 AUX README.qmail 2317 RMD160 ebdd90be77441540848caf39b6fcde3d332b2b93 SHA1 081b28b6c261644fe3f799e3bbb5aedf59b00b8f SHA256 c70a32eb183401f3d36b8e13c1e298875692b8a9d3f34151ae42b172dd6f064a
@@ -19,24 +19,19 @@ DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 S
 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-r1.ebuild 6188 RMD160 b8287b57d48ea802a36b3b7decf398f361c4b522 SHA1 b89803896aaca7856abba10400a934ce8dcf460b SHA256 ad0b491f8bf1fea6defa66cd996a08a717af78bfabc71ae0bd6745e5eba06a48
 EBUILD dspam-3.10.1.ebuild 6032 RMD160 e006e49b67e8a4c00f2c5bbc7d6f5dfbac8e28e2 SHA1 51eabebbe694d4a4b2d9faf63be6114df9dba7eb SHA256 fa6d8b0ee89f0895c524029a58914d02b0c6fdab9b161f7dc46ed1692b88c06c
 EBUILD dspam-3.8.0-r15.ebuild 19692 RMD160 dbfc9ae12e751cc0ade8608f3073c284fd6f7fe4 SHA1 3beff2e7820d8a3a7e35d2ca871e042d8fc0c100 SHA256 6002f6e9db1e6e2de4296596297e7ea91d59b7090652d428df53301737fcd4a7
-MISC ChangeLog 23597 RMD160 49c9506c09e292274772688df5480897bf6b14da SHA1 beb07abed09f0e76b071606e9c263fd51508400a SHA256 e15277e0fc846fbd522b3127310d4d7004ec3b324a73d9b27373725c9c7e9609
+MISC ChangeLog 23830 RMD160 7934d8d76dc976abbebc9384d4b9620100ad14f4 SHA1 a690f919348c17dc87abf8774cfbc9643c35e075 SHA256 16e20227fd7e640bc3ea5d34996e381d8c95393aa33b8c31508ab0e63aff5e6e
 MISC metadata.xml 1429 RMD160 40b71e8574ed33364dd81fae8f6f510c9dadbe5f SHA1 727dcfbe77e781fb4ad6b45837d70acace16e4bb SHA256 797884e76db42660b78b292db1436cf3154c74cd71a891ea482f9a68264d1560
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJORftcAAoJEHfx8XVYajsfC+wP/j1OBqDwFMb39nwYRO/sbTeX
-LucskBp4Gvi05+VxTe41Gt9k22gF+ADGL8fZlo1CUNPQMc2F9TcmzwRgD0Kn0fze
-ISdWtOQZGmTgUlATFqw1NmeGp4aDu7SC7XbXkVkSGBFP2/iXM915/B1CBBXSDwW0
-4/CLbZiTOZlZlNkWYfe2Wf72maA5yM7oa2c+OSAmQ6y3GPJRB4s4xixeYoeogdXY
-bLap38ZEWOW5gMnTW6hNNZPYvty8WsgwF410HHmRkcV9t4aDnkrZCjM/ArPbEAzN
-jRzQM8WEPOsBZc5KORu1kuYWZ9wOta0ZarrXb61SFAaT7cL/lHuHlyH79kq2j2QT
-dJqSUtb8bANnaD4mY430PMCOIzIfrk51WIFv/43p2zaOIcRg+3ioVdTlw26uHVEM
-i8Pq+zWlIw/WgjjOI8f15+IfPVxcN/mrCtTXOeRQ0bu+kGxH3HGj1tw+S/O+M7P6
-rR6Eyyumx2rMLvpqMX/l35TkC5sXvkyP0a+jJkNy6FQqo9wDQ2r8xbbmIZIQcIQd
-2hBgrk0vfCrJ/raon6tdVRbWWW0k42hiIjEYhcdFp3X2GURCUV46TQBZPJfIIT7Y
-QoZmmgPjjPAuqspcztTQw3L3aKrH00zIkMV6VrNsg2PMn811Ug6MPjBQKXiOoXKl
-Q6SAFPycLgBM4vgMF9sz
-=cuXJ
+iQEcBAEBCgAGBQJOVLxjAAoJEEqz6FtPBkyjGakIAIvmDasLmPe4ssGVKewt31ed
+ITz7rueCSrZGG5/vzc+S/5kw4xAdELij5hsaQQ5MX8oKfe1Vlhfvgyc+SLQGFKyr
+2ek/H4+Otqn80YOpQCcgt7I5rMihNVvZFiX4lXzYvlDS/emWEzY6RY9JZntAx6gO
+Pk6LP6QvuevGt40nExsEpAOJFku5R30VOQahbFqV+TjvnWd7V/B1hBOEwkRTM4Qj
+rxaj518XB944295EMhW0tu3m23euXFHkq5q/jyTNIM/Q4VSYoUbD/CuEWia8JZni
+PYTMkS4KmTpIBDhMMktTvk3W65Zg14CiLUliGR9KzfVtWUWayJIbxaKwKXCRFts=
+=pMb3
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.10.1-r1.ebuild b/mail-filter/dspam/dspam-3.10.1-r1.ebuild
new file mode 100644
index 000000000000..c8f7197515f3
--- /dev/null
+++ b/mail-filter/dspam/dspam-3.10.1-r1.ebuild
@@ -0,0 +1,225 @@
+# 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-r1.ebuild,v 1.1 2011/08/24 08:54:54 radhermit 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
+
+	# 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
+}