Bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 230 insertions, 12 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 03da22135ec2..2c9ba55b6649 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.266 2015/04/26 17:16:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.267 2015/05/11 16:42:23 robbat2 Exp $
+
+*spamassassin-3.4.1 (11 May 2015)
+
+  11 May 2015; Robin H. Johnson <robbat2@gentoo.org> +spamassassin-3.4.1.ebuild:
+  Bump.
 
   26 Apr 2015; Pacho Ramos <pacho@gentoo.org> spamassassin-3.4.0.ebuild:
   ppc stable wrt bug #537464
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 1a9c34d98d22..c043c707271a 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.0.0-spamd.conf 1523 SHA256 02e2625617215f61909bbac603e1aa4846d8a99cc93d14cbf0f5212f9809159f SHA512 224d72d0ca118d419d8c2af7b00cd16c76896ebcff1860bcdc7172d104a9be419adc09fd25ef7ce76e2bc0a0411ef9c46ed9cdee405ad9222dee4ca2e6fe6388 WHIRLPOOL 977a5075298728b3022604fd24fe41649e29f7fc4a0391c819608c8acfbcd9f79f7d15f24c069eae2b334fd570fe6abe0b0c8c8ce877244727bef84e908d9094
 AUX 3.3.1-spamd.init 1076 SHA256 6d7fc294587625cd6f790dacede74cbafd6d86dbefbe4fcf33bfa40e8e918678 SHA512 1596199958b170b48c344324412f835e45e1a48e17be66a1e383c7cd2d906d17f80d906b51b3d09035ce9849e4090fce9ce58f42937738995d91dec64415a820 WHIRLPOOL 3dd0767ba317fc499c9b1ba234223456a6d9375f1dec0c13911ed66b4594aa79bd50271fdb922c364d3f7fb72da01555b5adae2acbe991d2b9d6b4773954566b
 AUX net-dns-0.76_compatibility.patch 1958 SHA256 bb328f92e6bec18bd351fc52e711c9d23b09911592ddeaed43601c4ce5c46445 SHA512 ea1eb17255accbca2a1280e94dbe5853886f6bf9ca9e41546c2425921586fc6cd05b043ddd312fd3d9c105902d3817ca304a4c8cee443da4bdff0abf20f67069 WHIRLPOOL 832f63e742639233e77a9afd334053ba6c32a40c7d855ecc36a6db1d6ac4f871a23bd0e398d73b6e9b7ee6ff48ee319110751d8174e0462942ff70c407189268
@@ -14,15 +11,10 @@ AUX spamassassin.service-r1 323 SHA256 960eb0115ac4e70981f9a4350767e001cdabb244f
 AUX spamassassin.service.conf 333 SHA256 b6f942eb15f2476dbd161db92b8dacec43f2a0664b45405f3e4396f23ab8b18d SHA512 d818e0ca5bfa9dadb94f99351a307f41c05bc46b89f55a03b9ba2fba0bd06fada06adf1a3eff949f3a04151f3680b279d78fba08c8f28873d17e4a4aa55edca4 WHIRLPOOL 9b5e5674223f99df7afb48482f12f4fa307677290833dd6d3285cdcb94bea1a632c76e8a99e7e38b556a61c20375389d5a370105d2d8c2d4f1de445340ab429d
 DIST Mail-SpamAssassin-3.3.2.tar.bz2 1006577 SHA256 c7239b4b4ef04ba5e2d5aedb9156850146ed3fa47c88f0a0757f08e22f93a205 SHA512 3baabfacd2f3ac1debc2bbcdc0b2109ad51f6b176b9a6d037e14999c430150f0922469f777e7d35311ab819eb20905b55c00aa58f1c3c8d5f881d173dd441cbd WHIRLPOOL 5751d7285ffd29c041056f15ff6c85f66ecf6b9e806558623716ad8826124e1f92096f0e8b00016158b4a965927bde7e9e5ed48984ee956906175431e8a45ee5
 DIST Mail-SpamAssassin-3.4.0.tar.bz2 1065544 SHA256 553b39bae969b4ba20854c0a0fa1eba2a6aa0f4e103b530e0da4e152cdce4714 SHA512 4a04604a0331a9c23cd10d4fb58e5ca5d3e592bbeffacf0f89b379e5b46118f8b1500d671606a2407115f90fb633a713c8ed557f0db155f4645e263175b0946c WHIRLPOOL 401d61a0ab8bd906b14effb0125aeb3b1a87cdd115484b0787410a03208208e6dfb3c7a440c82ff2334c093555ac7e4eae8b9fc735de5e503f1396a172cec927
+DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 SHA256 a0c1c9808f0684b389594eb8b2ccbace6486546593493f9308c9554563d14651 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af WHIRLPOOL 1465fcbc0456c9a671087d395c2a9998e3852a47153a0f6770158a2a311196490274c620aab89e2a6ff163defa72b8e785032f9450e7903df355544d957e8908
 EBUILD spamassassin-3.3.2-r5.ebuild 7256 SHA256 c0fe3ae4dfb105f1a569edc4dfd17b2f067469ff8535a3bc51707516565ecb17 SHA512 a5302b95cbeabffa8372cea671718a3829761eeda7a5e4ee07f82987d356993d37efb48cd4389fe0ebd8ea745f119427c0b8fa5ef0e98a7d0498f792f55ef553 WHIRLPOOL a31a700d58922a4edbe14b65ad61d2f1ea5c3939b832ae4cd7e95462af621fce1dc995bdbe3933bf9674dd9675eb6a83b2417170635faa92d507aa73719c4227
 EBUILD spamassassin-3.4.0-r1.ebuild 6668 SHA256 0733b7052fb5fd9f8b546b7d668c39473091d3ad22e546dbf3c22bfb8c825af8 SHA512 dc4da41f272a50c547ecfd31d0f1bb418d4096edea6546505a6514a6b292f83c05a7c66ec533062bba8ecd222a8a600d91c9dfee9b18435277ed0fc2bd51bb92 WHIRLPOOL 1f84bda1afddcac60809dba493bee707fc2b68bdf01fb504ce7fd7e0a845efaccec9c250ea58e65dabd31ead7f889a94cc4ae2d7c22b348273d357608642542c
 EBUILD spamassassin-3.4.0.ebuild 6808 SHA256 1e4e01e427548824121d4d7350c564eed279e8d354e2897e8de59cd75b8bf7a9 SHA512 af72bce6421fb195a7944ee192ab0521f668aec3b1f22da9605706abd80fac67eed70319268a27d112d6c785907fba4fc8dad00ad0fc0dd9473896e54f900edc WHIRLPOOL 592f509a4f4e8467555730a47538835661273cea38a29d2aeef987dcd917dcfa6fbdc59faefd08229d6be1e16c1cee5d04463262f5d7fce71601f528b19d131c
-MISC ChangeLog 49631 SHA256 30f0efa29c3aa009c6e6d26cef84599cfb8ae5063fb9f4154f2b626288ab59de SHA512 e84845c1bb0a926d2df41e87734ca8923eced20daf4b561f9748b0ad3f5b1bc01ad7337dab42ea7602443cd0ba2ee21cce6326463a076433a6c522eec6fe98c6 WHIRLPOOL 142beed376da7cc09843a77b6bb73f80fd612fde7bbdf4a8320238a0953f9601c8c104a8c3525c06992a897f850fe9ffd8c2064d118eca7c0b3262a55aed39be
+EBUILD spamassassin-3.4.1.ebuild 6714 SHA256 40c5a38005f0383ec00e9aee6edf753442264d9f5cb566fe80fb1197dd8e8519 SHA512 f7231761d4148cfba828bd7cc1bfc7c474ab944743f1e1ad9d46d108d02629204420929f4d4ecdd396fdd1f7dd87b49a327ee1df05737af352426ebea8cbb22c WHIRLPOOL 3d32ae53585efe89dd70a1f3ebfcb7262bf926ac1dc45f8f9098d75b83553ddd138d2cd1537203c37832befa2c645f4f3896d15232c26fef585afebdbabd6c90
+MISC ChangeLog 49758 SHA256 133f597d95f4186116c7c42db52d7ca39de97db3f18c1675546ae714f9327bed SHA512 d10dc4c9de3e11eea66fbb9605699e8faf10963d2cf5b6d188c52ab49d6412b272ea6c9fe906099392474ae913f80c74565584dfbb4806618634480f0c8a0e19 WHIRLPOOL 23728d00fb23c27988bd7a4295a808e304887068116a2bfc999b47b96ffbfda090a15a7b1b7a3be80ea04a9023de5aa22005e85196459beeac79e608570e1617
 MISC metadata.xml 441 SHA256 473af2c203113f5a0d3278b0463629db003fd3f8ae35b0a7bb4708da70ddb8d3 SHA512 00da607df1ad621ae35b2e9f6b4578c20a5e5ee359485fd4e47de4ad043ecda2505e9d57bdb26e608f2134f83e60e43855acb53aae91c0b909fa1087383c9134 WHIRLPOOL ecc66cb8342ef2d7d734d51ee42bcb1a00e795d0a4a28b2d616fe0d0991eb7b399b19b090d6e641fb72351dd8b2f5d45d239bb5a9adedefdd1882c1ec418e302
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlU9HWsACgkQCaWpQKGI+9SKNgCdGQy5D9JIcsTEVQyBDsFyBngG
-oTYAnRge/xxar3HovNdhE/hEoGI30HsH
-=pFUN
------END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1.ebuild
new file mode 100644
index 000000000000..b23f354e6894
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.1.ebuild,v 1.1 2015/05/11 16:42:23 robbat2 Exp $
+
+EAPI=5
+
+inherit perl-module toolchain-funcs eutils systemd readme.gentoo
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An extensible mail filter which can identify and tag 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="+bayes berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
+
+# You can do without a database unless you need the Bayes features.
+REQUIRED_USE="bayes? ( || ( berkdb mysql postgres sqlite ) )"
+
+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
+			virtual/perl-IO-Socket-IP )
+	)"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+
+src_prepare() {
+	# Merged upstream
+	#epatch "${FILESDIR}/net-dns-0.76_compatibility.patch"
+	perl-module_src_prepare
+}
+
+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"
+	myconf+=" 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"
+
+	# 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 "failed to disable plugins by default"
+
+	# 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
+
+	insinto /etc/mail/spamassassin/
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf 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
+
+	insopts -m0644
+	doins "${T}/local.cf.example"
+}
+
+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."
+	elog
+	elog "If you build ${PN} with optional dependancy support,"
+	elog "you can enable them in /etc/mail/spamassassin/init.pre"
+	elog
+	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."
+	elog
+	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."
+	elog
+	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:"
+	elog
+	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."
+	elog
+	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."
+	elog
+	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"
+	elog
+}