From e043c3d8a2ebfbd776fcd7db2bf2ed51ae01bdde Mon Sep 17 00:00:00 2001 From: Michael Cummings Date: Sun, 30 Jan 2005 14:11:08 +0000 Subject: bug 76168 Package-Manager: portage-2.0.51-r13 --- mail-filter/spamassassin/ChangeLog | 11 +- mail-filter/spamassassin/Manifest | 16 +- .../spamassassin/files/digest-spamassassin-2.64-r1 | 1 + .../files/digest-spamassassin-3.0.2-r1 | 1 + .../spamassassin/spamassassin-2.64-r1.ebuild | 98 ++++++++++ .../spamassassin/spamassassin-3.0.2-r1.ebuild | 203 +++++++++++++++++++++ 6 files changed, 323 insertions(+), 7 deletions(-) create mode 100644 mail-filter/spamassassin/files/digest-spamassassin-2.64-r1 create mode 100644 mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1 create mode 100644 mail-filter/spamassassin/spamassassin-2.64-r1.ebuild create mode 100644 mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild (limited to 'mail-filter') diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index af1e282efe8f..3cdb6662bb43 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for mail-filter/spamassassin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.27 2005/01/24 15:41:15 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.28 2005/01/30 14:11:08 mcummings Exp $ + +*spamassassin-3.0.2-r1 (30 Jan 2005) + + 30 Jan 2005; Michael Cummings files/3.0.0-spamd.conf, + files/spamd.conf, spamassassin-2.63-r1.ebuild, spamassassin-2.63.ebuild, + +spamassassin-2.64-r1.ebuild, spamassassin-2.64.ebuild, + spamassassin-3.0.0-r1.ebuild, spamassassin-3.0.0.ebuild, + +spamassassin-3.0.2-r1.ebuild: + Version bump to reflect bug 76168. 24 Jan 2005; Michael Cummings files/3.0.0-spamd.conf: Bug 76168 - removing -i from default config file so that SA is only listening diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 4a6ddcca19eb..39faa9264ced 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 4e95b6d75b21ebc1954b5025667c6aa9 ChangeLog 13576 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 MD5 0142860158103173c30577799937a6fd spamassassin-2.63-r1.ebuild 2411 MD5 7e70436bd6345888b62e9ce781661cc5 spamassassin-2.63.ebuild 2300 @@ -9,10 +10,11 @@ MD5 c7d9c4ea15b7c345a703d299f8f342a5 spamassassin-3.0.0-r1.ebuild 5774 MD5 b9b2ffa6e5df055b9c97dc8ed4e3dc4d spamassassin-3.0.0.ebuild 5971 MD5 41bfaa841cbc365eca6f13a085954165 spamassassin-3.0.1.ebuild 5778 MD5 707c884ce951b59e0dc244ee29ceac9f spamassassin-3.0.2.ebuild 5771 -MD5 920a357b908a80155acc461604f686a3 ChangeLog 13196 -MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75 +MD5 fc5439c1c80c13882e44619df91122c4 spamassassin-2.64-r1.ebuild 2518 +MD5 2e87e5b5f23cfbebfb66d3be9ff4efba spamassassin-3.0.2-r1.ebuild 5777 MD5 0a729fcad36340496651b99146401d21 files/3.0.0-spamd.conf 774 MD5 33f67831957d640746a374b8774e7d2d files/3.0.0-spamd.init 667 +MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63-r1 75 MD5 6a161feb8320fadb55f440aab192d008 files/digest-spamassassin-2.64 75 MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0 76 @@ -21,10 +23,12 @@ MD5 37be9f25f104cf5e5ad47b37351c7900 files/digest-spamassassin-3.0.1 76 MD5 faa89d7205b3bde710ddc585969a3992 files/digest-spamassassin-3.0.2 76 MD5 e76e0d7ee2c9225a16dfe1f177823f70 files/spamd.conf 446 MD5 90925e8f6521add45f8a727ed982e61a files/spamd.init 645 +MD5 6a161feb8320fadb55f440aab192d008 files/digest-spamassassin-2.64-r1 75 +MD5 faa89d7205b3bde710ddc585969a3992 files/digest-spamassassin-3.0.2-r1 76 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.2.4 (GNU/Linux) -iD8DBQFB9RcltG5z4I8BtQoRAmU+AJwK2CSGnVOmyo1FQCCy2+P/t5w/hgCfXhKO -NUdlg46C/ZBwFQAFIQBAbEc= -=ZvlM +iD8DBQFB/OqrtG5z4I8BtQoRAounAJsFrpZEDt9qiebTUdsDXM4Axqb2nACfVHPF +VM62RDNiUVAmrXOmW9QcXmY= +=6oAv -----END PGP SIGNATURE----- diff --git a/mail-filter/spamassassin/files/digest-spamassassin-2.64-r1 b/mail-filter/spamassassin/files/digest-spamassassin-2.64-r1 new file mode 100644 index 000000000000..6071f0182a89 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-2.64-r1 @@ -0,0 +1 @@ +MD5 cd482160ddbe371bbf4fb58b715ebbdf Mail-SpamAssassin-2.64.tar.bz2 736911 diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1 new file mode 100644 index 000000000000..0656c7638050 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.0.2-r1 @@ -0,0 +1 @@ +MD5 b373bc48c4f50b70cb784f40d88868bf Mail-SpamAssassin-3.0.2.tar.bz2 846410 diff --git a/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild b/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild new file mode 100644 index 000000000000..3ddf36c73eaf --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-2.64-r1.ebuild,v 1.1 2005/01/30 14:11:08 mcummings Exp $ + +inherit perl-module + +MY_P=Mail-SpamAssassin-${PV} + +S=${WORKDIR}/${MY_P} +DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam" +HOMEPAGE="http://spamassassin.org/" +SRC_URI="http://old.spamassassin.org/released/${MY_P}.tar.bz2" + +LICENSE="|| ( GPL-2 Artistic )" +SLOT="0" +KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ppc64" +IUSE="berkdb ssl" + +DEPEND="|| ( >=dev-lang/perl-5.8.2-r1 + ( >=dev-perl/ExtUtils-MakeMaker-6.11-r1 + >=dev-perl/File-Spec-0.8 + dev-perl/Time-Local + dev-perl/Getopt-Long + ) ) + >=dev-perl/PodParser-1.22 + >=dev-perl/HTML-Parser-3.24 + dev-perl/Net-DNS + dev-perl/Digest-SHA1 + ssl? ( dev-perl/IO-Socket-SSL ) + berkdb? ( dev-perl/DB_File )" + +# Neither for 'make install'. +myinst="" + +# Some more files to be installed (README* and Changes are already +# included per default) +mydoc="License + COPYRIGHT + TRADEMARK + CONTRIB_CERT + BUGS + USAGE + procmailrc.example + sample-nonspam.txt + sample-spam.txt + qmail/README.qmail-spamc" + +src_compile() { + # If ssl is enabled, spamc can be built with ssl support + use ssl && myconf="${myconf} ENABLE_SSL=yes" + + # if you are going to enable taint mode, make sure that the bug where + # spamd doesn't start when the PATH contains . is addressed, and make + # sure you deal with versions of razor <2.36-r1 not being taint-safe. + # and + # . + myconf="${myconf} PERL_TAINT=no" + + # No settings needed for 'make all'. + mymake="" + + export PERL_MM_USE_DEFAULT=1 + perl-module_src_compile + + # without this check, portage .51 runs test suite twice for people + # with the maketest feature + + if ! hasq maketest $FEATURES; then + perl-module_src_test + fi + cd ${S} + make qmail/qmail-spamc +} + +src_install () { + perl-module_src_install + + # Add the init and config scripts. + dodir /etc/init.d /etc/conf.d + insinto /etc/init.d + newins ${FILESDIR}/spamd.init spamd + fperms 755 /etc/init.d/spamd + insinto /etc/conf.d + newins ${FILESDIR}/spamd.conf spamd + + into /usr + dobin qmail/qmail-spamc +} + +pkg_postinst() { + perl-module_pkg_postinst + + if [ -z "`best_version dev-perl/DB_File`" ]; then + einfo "The Bayes backend requires the Berkeley DB to store its data. You" + einfo "need to emerge dev-perl/DB_File to make it available." + fi + +} diff --git a/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild new file mode 100644 index 000000000000..95f1e1307e87 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.2-r1.ebuild,v 1.1 2005/01/30 14:11:08 mcummings Exp $ + +inherit perl-module + +MY_P=Mail-SpamAssassin-${PV//_/-} +S=${WORKDIR}/${MY_P} +DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam." +HOMEPAGE="http://spamassassin.apache.org/" +SRC_URI="http://www.apache.org/dist/spamassassin/${MY_P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 ppc64" +IUSE="berkdb qmail ssl doc" + +DEPEND=">=dev-lang/perl-5.8.2-r1 + >=dev-perl/PodParser-1.22 + dev-perl/MIME-Base64 + >=dev-perl/HTML-Parser-3.31 + >=dev-perl/Net-DNS-0.34 + dev-perl/Digest-SHA1 + ssl? ( + dev-perl/IO-Socket-SSL + dev-libs/openssl + ) + berkdb? ( + dev-perl/DB_File + )" + + +# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again +# (just to be sure, nobody knows how it could happen in the first place). +myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin" + +# If ssl is enabled, spamc can be built with ssl support +if use ssl; then + myconf="${myconf} ENABLE_SSL=yes" +else + myconf="${myconf} ENABLE_SSL=no" +fi + +# Set the path to the Perl executable explictly. This will be used to +# create the initial sharpbang line in the scripts and might cause +# a versioned app name end in there, see +# +myconf="${myconf} PERL_BIN=/usr/bin/perl" + +# If you are going to enable taint mode, make sure that the bug where +# spamd doesn't start when the PATH contains . is addressed, and make +# sure you deal with versions of razor <2.36-r1 not being taint-safe. +# and +# . +myconf="${myconf} PERL_TAINT=no" + +# No settings needed for 'make all'. +mymake="" + +# Neither for 'make install'. +myinst="" + +# Some more files to be installed (README* and Changes are already +# included per default) +mydoc="NOTICE + TRADEMARK + LICENSE + CREDITS + INSTALL + UPGRADE + BUGS + USAGE + README.spamd + README.sql + README.ldap + procmailrc.example + sample-nonspam.txt + sample-spam.txt + STATISTICS.set0 + STATISTICS.set1 + STATISTICS.set2 + STATISTICS.set3" + +use qmail && mydoc="${mydoc} README.qmail" + + +src_move_doc() { + echo "Renaming $1 to $2" + mv $1 $2 || die failed to move documentation +} + +src_append_doc() { + echo "Appending $1 to $2" + cat $1 >> $2 || die failed to append documentation +} + +src_compile() { + # Add Gentoo tag to make it easier for the upstream devs to spot + # possible modifications or patches. + version_tag="g${PV:6}${PR}" + version_str="${PV//_/-}-${version_tag}" + + # Create the Gentoo config file before Makefile.PL is called so it + # is copied later on. + echo "version_tag ${version_tag}" > rules/11_gentoo.cf + + # Setting the following env var ensures that no questions are asked. + export PERL_MM_USE_DEFAULT=1 + perl-module_src_prep + # Run the autoconf stuff now, just to make the build sequence look more + # familiar to the user :) Plus feeding the VERSION_STRING skips some + # calls to Perl. + make spamc/Makefile VERSION_STRING="${version_str}" + + # Now compile all the stuff selected. + perl-module_src_compile + if use qmail; then + make spamc/qmail-spamc || die building qmail-spamc failed + fi + + # Rename some docu files so they don't clash with others + src_move_doc spamd/README README.spamd + src_move_doc spamc/README.qmail README.qmail + src_move_doc sql/README README.sql + src_append_doc sql/README.bayes README.sql + src_append_doc sql/README.awl README.sql + src_move_doc ldap/README README.ldap + src_move_doc rules/STATISTICS.txt STATISTICS.set0 + src_move_doc rules/STATISTICS-set1.txt STATISTICS.set1 + src_move_doc rules/STATISTICS-set2.txt STATISTICS.set2 + src_move_doc rules/STATISTICS-set3.txt STATISTICS.set3 + # Remove the MANIFEST files as they aren't docu files + rm -f MANIFEST* + + if use doc; then + make text_html_doc + fi + +} + +src_install () { + perl-module_src_install + + # Move spamd to sbin where it belongs. + dodir /usr/sbin + mv ${D}/usr/bin/spamd ${D}/usr/sbin/spamd || die + + if use qmail; then + into /usr + dobin spamc/qmail-spamc + fi + + # Add the init and config scripts. + dodir /etc/init.d /etc/conf.d + insinto /etc/init.d + newins ${FILESDIR}/3.0.0-spamd.init spamd + fperms 755 /etc/init.d/spamd + insinto /etc/conf.d + newins ${FILESDIR}/3.0.0-spamd.conf spamd + dosym /etc/mail/spamassassin /etc/spamassassin + + if use doc; then + dodoc spamd/PROTOCOL + for f in doc/*.html; do + dodoc $f + done + fi +} + +pkg_postinst() { + perl-module_pkg_postinst + + if ! has_version "dev-perl/DB_File"; then + einfo "The Bayes backend requires the Berkeley DB to store its data. You" + einfo "need to emerge dev-perl/DB_File or USE=berkdb to make it available." + fi + + if has_version "mail-filter/razor"; then + if ! has_version ">=mail-filter/razor-2.61"; then + ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin" + if has_version "