mrueg       14/08/12 23:21:34

  Modified:             ChangeLog
  Added:                spamassassin-3.4.0.ebuild
  Log:
  Version bump. Fixes bug #501246.
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.234                mail-filter/spamassassin/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- ChangeLog   21 Jul 2014 19:04:56 -0000      1.233
+++ ChangeLog   12 Aug 2014 23:21:34 -0000      1.234
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.233 
2014/07/21 19:04:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.234 
2014/08/12 23:21:34 mrueg Exp $
+
+*spamassassin-3.4.0 (12 Aug 2014)
+
+  12 Aug 2014; Manuel RĂ¼ger <[email protected]> +spamassassin-3.4.0.ebuild:
+  Version bump. Fixes bug #501246.
 
   21 Jul 2014; Andreas K. Huettel <[email protected]>
   spamassassin-3.3.2-r1.ebuild, spamassassin-3.3.2-r2.ebuild,



1.1                  mail-filter/spamassassin/spamassassin-3.4.0.ebuild

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

Index: spamassassin-3.4.0.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 
1.1 2014/08/12 23:21:34 mrueg Exp $

EAPI=5

inherit perl-module toolchain-funcs eutils systemd readme.gentoo

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="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"

LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="-alpha ~amd64 -arm -hppa -ia64 -ppc -ppc64 -s390 -sh -sparc ~x86 
-x86-fbsd -amd64-linux -x86-linux -x86-macos"
IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"

DEPEND=">=dev-lang/perl-5.8.8-r8
        virtual/perl-MIME-Base64
        >=virtual/perl-Pod-Parser-1.510.0-r2
        virtual/perl-Storable
        virtual/perl-Time-HiRes
        >=dev-perl/HTML-Parser-3.43
        >=dev-perl/Mail-DKIM-0.37
        >=dev-perl/Net-DNS-0.53
        dev-perl/Digest-SHA1
        dev-perl/libwww-perl
        >=virtual/perl-Archive-Tar-1.23
        app-crypt/gnupg
        >=virtual/perl-IO-Zlib-1.04
        >=dev-util/re2c-0.12.0
        dev-perl/Mail-SPF
        >=dev-perl/NetAddr-IP-4.0.1
        dev-perl/Geo-IP
        dev-perl/Encode-Detect
        dev-perl/Net-Patricia
        ssl? (
                dev-perl/IO-Socket-SSL
                dev-libs/openssl
        )
        berkdb? (
                virtual/perl-DB_File
        )
        ldap? ( dev-perl/perl-ldap )
        mysql? (
                dev-perl/DBI
                dev-perl/DBD-mysql
        )
        postgres? (
                dev-perl/DBI
                dev-perl/DBD-Pg
        )
        sqlite? (
                dev-perl/DBI
                dev-perl/DBD-SQLite
        )
        ipv6? (
                || ( dev-perl/IO-Socket-INET6
                        dev-perl/IO-Socket-IP )
        )"
RDEPEND="${DEPEND}"

SRC_TEST="do"

src_configure() {
        # - 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=${EPREFIX}/etc 
DATADIR=${EPREFIX}/usr/share/spamassassin"

        # If ssl is enabled, spamc can be built with ssl support
        if use ssl; then
                myconf+=" ENABLE_SSL=yes"
        else
                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
        # <http://bugs.gentoo.org/show_bug.cgi?id=62276>
        myconf+=" PERL_BIN=${EPREFIX}/usr/bin/perl"

        # Add Gentoo tag to make it easy 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.
        perl-module_src_configure
        # Configure spamc
        emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
}

src_compile() {
        export PERL_MM_USE_DEFAULT=1

        # Now compile all the stuff selected.
        perl-module_src_compile

        if use qmail; then
                emake spamc/qmail-spamc
        fi

}

src_install () {
        perl-module_src_install

        # Create the stub dir used by sa-update and friends
        keepdir /var/lib/spamassassin

        # Move spamd to sbin where it belongs.
        dodir /usr/sbin
        mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd 
failed"

        if use qmail; then
                dobin spamc/qmail-spamc
        fi

        ln -s mail/spamassassin "${ED}"/etc/spamassassin || die

        # Disable plugin by default
        sed -i -e 's/^loadplugin/\#loadplugin/g' 
"${ED}"/etc/mail/spamassassin/init.pre || die

        # Add the init and config scripts.
        newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
        newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd

        systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
        systemd_install_serviced "${FILESDIR}"/${PN}.service.conf

        if use postgres; then
                sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd" || die

                dodoc sql/*_pg.sql
        else
                sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd" || die
        fi

        if use mysql; then
                sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd" || die

                dodoc sql/*_mysql.sql
        else
                sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd" || die
        fi

        dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
                sql/README.bayes sql/README.awl procmailrc.example 
sample-nonspam.txt \
                sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
                spamd-apache2/README.apache

        # Rename some docu files so they don't clash with others
        newdoc spamd/README README.spamd
        newdoc sql/README README.sql
        newdoc ldap/README README.ldap

        if use qmail; then
                dodoc spamc/README.qmail
        fi

        cp "${FILESDIR}"/secrets.cf 
"${ED}"/etc/mail/spamassassin/secrets.cf.example || die
        fperms 0400 /etc/mail/spamassassin/secrets.cf.example

        cat <<-EOF > "${T}/local.cf.example"
                # Sensitive data, such as database connection info, should be 
stored in
                # /etc/mail/spamassassin/secrets.cf with appropriate permissions
EOF

        insinto /etc/mail/spamassassin/
        doins "${T}/local.cf.example"
}

pkg_postinst() {
        perl-module_pkg_postinst
        elog "If you plan on using the -u flag to spamd, please read the notes"
        elog "in /etc/conf.d/spamd regarding the location of the pid file.\n"
        elog "If you build ${PN} with optional dependancy support,"
        elog "you can enable them in /etc/mail/spamassassin/init.pre\n"
        elog "You need to configure your database to be able to use Bayes 
filter"
        elog "with database backend, otherwise it will still use (and need) the"
        elog "Berkeley DB support."
        elog "Look at the sql/README.bayes file in the documentation directory"
        elog "for how to configure it.\n"
        elog "If you plan to use Vipul's Razor, note that versions up to and"
        elog "including version 2.82 include a bug that will slow down the 
entire"
        elog "perl interpreter.  Version 2.83 or later fixes this."
        elog "If you do not plan to use this plugin, be sure to comment out"
        elog "its loadplugin line in /etc/mail/spamassassin/v310.pre.\n"
        elog "The DKIM plugin is now enabled by default for new installs,"
        elog "if the perl module Mail::DKIM is installed."
        elog "However, installation of SpamAssassin will not overwrite existing"
        elog ".pre configuration files, so to use DKIM when upgrading from a"
        elog "previous release that did not use DKIM, a directive:\n"
        elog "loadplugin Mail::SpamAssassin::Plugin::DKIM"
        elog "will need to be uncommented in file 'v312.pre', or added"
        elog "to some other .pre file, such as local.pre.\n"
        ewarn "Rules are no longer included with SpamAssassin out of the box".
        ewarn "You will need to immediately run sa-update, or download"
        ewarn "the additional rules .tgz package and run sa-update --install"
        ewarn "with it, to get a ruleset.\n"
        elog "If you run sa-update and receive a GPG validation error."
        elog "Then you need to import an updated sa-update key."
        elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt\n"
}




Reply via email to