From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QpE7Q-0003F7-LM for garchives@archives.gentoo.org; Fri, 05 Aug 2011 06:42:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 043EB21C042; Fri, 5 Aug 2011 06:42:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B6DF921C042 for ; Fri, 5 Aug 2011 06:42:44 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5D091B4010 for ; Fri, 5 Aug 2011 06:42:43 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2282) id 97DAE2004C; Fri, 5 Aug 2011 06:42:42 +0000 (UTC) From: "Eray Aslan (eras)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, eras@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in mail-filter/dspam: dspam-3.10.0.ebuild ChangeLog metadata.xml X-VCS-Repository: gentoo-x86 X-VCS-Files: dspam-3.10.0.ebuild ChangeLog metadata.xml X-VCS-Directories: mail-filter/dspam X-VCS-Committer: eras X-VCS-Committer-Name: Eray Aslan Content-Type: text/plain; charset=utf8 Message-Id: <20110805064242.97DAE2004C@flycatcher.gentoo.org> Date: Fri, 5 Aug 2011 06:42:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e74fd831c2efe122e8e128642c4322c7 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 =20 (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=3D1.132&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/= ChangeLog?rev=3D1.132&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/= ChangeLog?r1=3D1.131&r2=3D1.132 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 2= 010/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 2= 011/08/05 06:42:42 eras Exp $ + +*dspam-3.10.0 (05 Aug 2011) + + 05 Aug 2011; Eray Aslan +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 =20 17 Jun 2010; Patrick Lauer 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=3D1.7&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/= metadata.xml?rev=3D1.7&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/= metadata.xml?r1=3D1.6&r2=3D1.7 Index: metadata.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 @@ Build with virtual-users support + + Build with domain scale setups + + + Build with large scale setups + + + Enable support for the file-orientated hash driver + 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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dspam/= dspam-3.10.0.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: dspam-3.10.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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=3D4 inherit eutils SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.gz" DESCRIPTION=3D"A statistical-algorithmic hybrid anti-spam filter" HOMEPAGE=3D"http://dspam.sourceforge.net/" LICENSE=3D"AGPL-3" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~ppc ~sparc ~x86" DRIVERS_IUSE=3D"hash mysql postgres sqlite" SCALES_IUSE=3D"domain-scale large-scale" IUSE=3D"clamav daemon debug ldap static-libs syslog virtual-users user-ho= medirs ${DRIVERS_IUSE} ${SCALES_IUSE}" DEPEND=3D" ldap? ( net-nds/openldap ) mysql? ( >=3Dvirtual/mysql-5.0 ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) " RDEPEND=3D" ${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-sca= le if # both not selected) # - user-homedirs does not work with virtual-users # - virtual-users does not work with hash or sqlite REQUIRED_USE=3D" || ( ${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=3D/var/spool/dspam DSPAM_CONF=3D/etc/dspam DSPAM_LOG=3D/var/log/dspam DSPAM_MODE=3D2510 DSPAM_DRIVERS=3D DSPAM_DRIVERS_EXTRAS=3D pkg_setup() { # setup storage, this sets DSPAM_DRIVERS dspam_setup_storage_drivers # create dspam user and group dspam_setup_user } src_configure() { local myconf=3D"" if ! use large-scale && ! use domain-scale ; then # default to domain-scale myconf=3D"--disable-large-scale --enable-domain-scale" fi econf \ --sysconfdir=3D${DSPAM_CONF} \ --with-dspam-home=3D${DSPAM_HOME} \ --with-dspam-home-group=3Ddspam \ --with-dspam-mode=3D${DSPAM_MODE} \ --with-dspam-group=3Ddspam \ --with-logdir=3D${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=3D${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \ $(use mysql || use postgres && echo "--enable-preferences-extension") \ $(use syslog || echo "--with-logfile=3D${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 t= oo 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+=3D",hash_drv" fi if use mysql; then DSPAM_DRIVERS+=3D",mysql_drv" DSPAM_DRIVERS_EXTRAS+=3D"--with-mysql-includes=3D/usr/include/mysql " fi if use postgres; then DSPAM_DRIVERS+=3D",pgsql_drv" fi if use sqlite; then DSPAM_DRIVERS+=3D",sqlite3_drv" fi if ! use static-libs; then # set the driver name twice to avoid a static build DSPAM_DRIVERS+=3D${DSPAM_DRIVERS} fi # remove first comma separator DSPAM_DRIVERS=3D${DSPAM_DRIVERS:1} einfo "Building with drivers: ${DSPAM_DRIVERS}" #echo DSPAM_DRIVERS_EXTRAS=3D$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=3D"mysql_objects-4.1.sql mysql_objects-space.sql mysql_obje= cts-speed.sql purge-4.1.sql purge.sql" if use virtual-users; then files+=3D" 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=3D"pgsql_objects.sql purge-pe.sql purge.sql" if use virtual-users; then files+=3D" 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 IS= P" > "${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, pl= ease 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 }