public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in mail-filter/dspam: dspam-3.10.0.ebuild ChangeLog metadata.xml
@ 2011-08-05  6:42 Eray Aslan (eras)
  0 siblings, 0 replies; only message in thread
From: Eray Aslan (eras) @ 2011-08-05  6:42 UTC (permalink / raw
  To: gentoo-commits

eras        11/08/05 06:42:42

  Modified:             ChangeLog metadata.xml
  Added:                dspam-3.10.0.ebuild
  Log:
  version bump - bug #299090. Ebuild thanks to Tom Hendrikx
  
  (Portage version: 2.1.10.9/cvs/Linux x86_64)

Revision  Changes    Path
1.132                mail-filter/dspam/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/ChangeLog?r1=1.131&r2=1.132

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog	17 Jun 2010 21:44:20 -0000	1.131
+++ ChangeLog	5 Aug 2011 06:42:42 -0000	1.132
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/dspam
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.131 2010/06/17 21:44:20 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.132 2011/08/05 06:42:42 eras Exp $
+
+*dspam-3.10.0 (05 Aug 2011)
+
+  05 Aug 2011; Eray Aslan <eras@gentoo.org> +dspam-3.10.0.ebuild,
+  +files/dspam.confd, +files/dspam.cron, +files/dspam.initd,
+  +files/dspam.logrotate, metadata.xml:
+  version bump - bug #299090. Ebuild thanks to Tom Hendrikx
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> dspam-3.8.0-r15.ebuild:
   Really migrating away from deprecated postgres virtuals



1.7                  mail-filter/dspam/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dspam/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	5 Oct 2008 08:41:28 -0000	1.6
+++ metadata.xml	5 Aug 2011 06:42:42 -0000	1.7
@@ -30,5 +30,14 @@
 	<flag name='virtual-users'>
 		Build with virtual-users support
 	</flag>
+	<flag name='domain-scale'>
+		Build with domain scale setups
+	</flag>
+	<flag name='large-scale'>
+		Build with large scale setups
+	</flag>
+	<flag name='hash'>
+		Enable support for the file-orientated hash driver
+	</flag>
 </use>
 </pkgmetadata>



1.1                  mail-filter/dspam/dspam-3.10.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/dspam-3.10.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/dspam-3.10.0.ebuild?rev=1.1&content-type=text/plain

Index: dspam-3.10.0.ebuild
===================================================================
# 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.0.ebuild,v 1.1 2011/08/05 06:42:42 eras Exp $

EAPI=4

inherit eutils

SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
HOMEPAGE="http://dspam.sourceforge.net/"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
DRIVERS_IUSE="hash mysql postgres sqlite"
SCALES_IUSE="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: choose at most one (default to domain-scale if
# both not selected)
# - 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} ) )
	domain-scale? ( !large-scale )
	large-scale? ( !domain-scale )
	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() {
	local myconf=""
	if ! use large-scale && ! use domain-scale ; then
		# default to domain-scale
		myconf="--disable-large-scale --enable-domain-scale"
	fi

	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") \
	${myconf}
}

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" 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
}






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-08-05  6:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-05  6:42 [gentoo-commits] gentoo-x86 commit in mail-filter/dspam: dspam-3.10.0.ebuild ChangeLog metadata.xml Eray Aslan (eras)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox