revbump: change PIDFILE directory wrt bug #472742

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0xC42EB5D6

5 files changed, 240 insertions, 13 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index f190eecd836c..ce66574b4d5e 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.224 2013/10/13 08:41:28 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.225 2013/10/17 11:44:13 zlogene Exp $
+
+*spamassassin-3.3.2-r3 (17 Oct 2013)
+
+  17 Oct 2013; Mikle Kolyada <zlogene@gentoo.org> +spamassassin-3.3.2-r3.ebuild,
+  files/3.0.0-spamd.conf, files/3.3.1-spamd.init:
+  revbump: change PIDFILE directory wrt bug #472742
 
   13 Oct 2013; Mikle Kolyada <zlogene@gentoo.org> spamassassin-3.3.2-r2.ebuild:
   use keepdir instead of dodir wrt bug #299313
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index dad9d390bccb..7e24da4e8193 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 3.0.0-spamd.conf 1527 SHA256 ea61041e8b6b1616ec096cc42245ab8442b962f72c318695f5acff1fd794ee34 SHA512 4b820bfa56d565844298be9c9ba888847d7835afb218b7b95317d2fe078407b0776003bacda577e0789344070cfd3e1726115a0945e3c1400626d376197d2055 WHIRLPOOL 97571ccbcffe79e71dba041be6713cc9916240f3ea90807cf112f1c32008ca0e0c6857d13fb90d43672e4f81f0caa343893bcde245b5a7e987d4d2e8c2c6a3ed
-AUX 3.3.1-spamd.init 1081 SHA256 6b17ad376fd734ad3081c731a7ee9c0756e1d026671232b752234717236b55b9 SHA512 d76108dc502c24e076e3df66a7f9569e7303cc0a7885db3827805578c006b28e8a3305695e40d7f5a95742e639272e5b6ba085d4ae524c30bc660237d7b7d3e0 WHIRLPOOL b30da58df75cfaf1bb2ab1587b1e8e4a2646f526a1d4d72438179d284e6557f38d728f335198ee9445a52df2d253197a272fbaa3a4ce9a76f14884e4dfe6c44e
+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 secrets.cf 664 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139 SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb WHIRLPOOL 1eccfd765106199312fb23581612b810b92fe8cc3e94b9c4964bcf550ac68bab1e88af07d5324a2be11111cf04f941f4bcfe5482bc71c72ef5ab35be53512ebc
 AUX spamassassin-3.3.2-binary_token.patch 465 SHA256 170ffed8831f7e45d7e50fda774dccd2482f4652c733e419c664d04b3208f37f SHA512 0e101c9792bc1cc6123fa1546e2d412b23bd9811541f18454182871995ad4436916e038be2352774c313e61c6decf99c7b378b3e107dfd05fbeedb75a65ce6ad WHIRLPOOL 88739e51bba39242dfba9adc437a06922f1c9f43e7bc5988c3e6cccc3da937949b634567824587c5c366ff0a4f30b68631f14faf0425f05cd068380d87c83dbc
 AUX spamassassin-3.3.2-innodb.patch 4749 SHA256 d40a72692f9b7161f2a332189e68cfd5486b69a4d2e9fdea9d23d6ae7bd7fd10 SHA512 8d72542f1853eee35a9fb8a3127bd8a3a3aeb2ee0b30e1f15a7c45f7a1d81054c50c57a9b8109c9348dbdbe1a084a0932bc9efa8a5516da92142bd8371ed2ecd WHIRLPOOL 7f58df175bb6cef1d970577960e29077ae2172d74bda30dd7c47283df4e7dfbbe8f44045259531659f2eddc748b3f05853aca5c62f90949c6a22d3287a90495c
@@ -11,14 +11,15 @@ AUX spamassassin.service 290 SHA256 c9c9e7aa13a47e05063a9e3b686d5e00fee34dba2983
 DIST Mail-SpamAssassin-3.3.2.tar.bz2 1006577 SHA256 c7239b4b4ef04ba5e2d5aedb9156850146ed3fa47c88f0a0757f08e22f93a205 SHA512 3baabfacd2f3ac1debc2bbcdc0b2109ad51f6b176b9a6d037e14999c430150f0922469f777e7d35311ab819eb20905b55c00aa58f1c3c8d5f881d173dd441cbd WHIRLPOOL 5751d7285ffd29c041056f15ff6c85f66ecf6b9e806558623716ad8826124e1f92096f0e8b00016158b4a965927bde7e9e5ed48984ee956906175431e8a45ee5
 EBUILD spamassassin-3.3.2-r1.ebuild 6986 SHA256 8a6e461ef59bc4da883a54cecb57be69797b08f68f35deb61f739e44178e9f47 SHA512 d9c62cedbb9f6194f8ee87ffaadebac0b18ec202f0986cf3d93b8e1e2f4b70f7e5fdfc23eb2fd2e5df8a14a3a86a98167bcc391aef1912882bb6cf4a6ac9856f WHIRLPOOL 6814a5fbd830579a9c88fcaa51e9e57c124fd1436cd3ba2423224930e7c7f07bb2b91ec60e8542958abe2605b92c56d024767633d3c78fac83b3c2d177f7c969
 EBUILD spamassassin-3.3.2-r2.ebuild 7046 SHA256 1c9c2b93e1f2a3e0be80bdb41332feeb3877001b5373049d11f80a335512a449 SHA512 b010fa93f29ae868dc258a2eef2cc53e65d99764175a4086cda2aaa45f3276b5103ff84b2958254a0b16db5155cfbc38fcfae053b04a0cc31e79acabca852d16 WHIRLPOOL 6bcc29871f18eece0852c779cbea4aa4d5ee5de3746cc0a00f3d362be1ebf183125fbc8d53f559811526f2e68192bbc64e4c23d751a176a298fde8b3c1dfcd56
-MISC ChangeLog 43739 SHA256 1b1771815118233178c2f455767dd00f060aa5b98588896c74eebdab50036451 SHA512 eb22c486c1eaf18d844326c517e925b653ae8b0e3425a3e8541b0bf5c05a1ca7f13e374b69a21a21ace8b6534760d99dad652c9d1a70dc9c46fbb292856e6c33 WHIRLPOOL 9fbf193fcfcbb5538c027f6a85c669631cb6929948b038b11c593b2d649f9974b61a270bcf293c53ec4936a7ef86c193a494a68ad454c6de44fcf8559dda152f
+EBUILD spamassassin-3.3.2-r3.ebuild 7049 SHA256 6479df4c06d4a987ef429fc12bdc05958fd4abf2f7e835b8e94dfb1665806a0d SHA512 76d26efdf88c47911c11623ae576c384661fc5a3b1f4095d92c4869f325cc6f792f24aee82ba4f89044ca4478bc22988c50f3d491416a4458c2cb66e94ec8d09 WHIRLPOOL 06e3d57c0e015dc22c180f8d310a3b095315941773ab391ada19d90fa82faf770dde8a0a94dfe755c87c50e40adfa759ef77dd72f8cf84cb1dcab310d6d6ab32
+MISC ChangeLog 43961 SHA256 f097b35bc4e60f83cc048dc303f33ae9e0ffd7535f1d9887ed1b6569ac83c3ad SHA512 524b71fa030b30c9357425ec8d81bb5b7bf9a4462607111d3c62a063609ddb6ab84ef2d052790b5c435c5968c61bc5b0cc9bac5a46323ebeb71851f5eb095978 WHIRLPOOL b445f3e0348510bf4dd0b958f0028cbb2d4b4b183642218b65f63a8295c758b2153a3089cc0856f2acc7e0840ae45e466da27fa073601ee2a3a233d8f06bde9d
 MISC metadata.xml 233 SHA256 2c234ebf47c0de34ea504b0342e8eca756fb7d77a6ac82cadb15fe5ba11e8beb SHA512 26f4aee998e006f276bd381132a5449fe3d8de3fe17610aab068873b1e0273d9f37b7171777e205b8ec3eabb53fcbce1eb4d45db7710fae41674b3fabca2eefa WHIRLPOOL 7992869e2f4237d58b3ea97c8b9fe61e90ec523d3fe81cbe14601841908ccf251d064aa53930ad73b61d5dfb7546995ea41491bfbad1542e18f9c5f9994f9153
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlJaXYkACgkQG9wOWsQutdYDVwP7B/sSnVmiIY1CJ0O2WK2UnSeT
-k2Y+X/yx3q38xb9xM7dW6OsAaqB1VbwtTCcxCx5/6g5uToyexrTR+xyny4fXAdWV
-PAVfYDoXZc9asbAlKLDJ2NrOj020nvxENG4LfVl/2KM1PgQRUPTNFcamCzBf1Ngt
-6aRmCBpAoua0JFNGKlY=
-=GHaA
+iJwEAQEIAAYFAlJfzmcACgkQG9wOWsQutdbsWgQArZbpyy9kBj/mFJ0zHdLCoj19
+srLY5R29VKo3n/vb0mj5p3DrHV8j9xH8Os5lS3deNKSjhTCAl80EQ+RBB/WYnORN
+kaxMY915FNgZ2k+A+HbEjyGNol0j+KMOAjizOvM6vqVK6Q9W3QLWdMT5vcPnJEm8
+yNXK2+dwAt7loN0JdmQ=
+=8paD
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.conf b/mail-filter/spamassassin/files/3.0.0-spamd.conf
index b6fca036f2e5..b3cd1acd8fa3 100644
--- a/mail-filter/spamassassin/files/3.0.0-spamd.conf
+++ b/mail-filter/spamassassin/files/3.0.0-spamd.conf
@@ -38,7 +38,7 @@ SPAMD_OPTS="-m 5 -c -H"
 # spamd stores its pid in this file. If you use the -u option to
 # run spamd under another user, you might need to adjust it.
 
-PIDFILE="/var/run/spamd.pid"
+PIDFILE="/run/spamd.pid"
 
 # SPAMD_NICELEVEL lets you set the 'nice'ness of the running 
 # spamd process
diff --git a/mail-filter/spamassassin/files/3.3.1-spamd.init b/mail-filter/spamassassin/files/3.3.1-spamd.init
index 4c0b72a0fb92..98ac8ae6e663 100644
--- a/mail-filter/spamassassin/files/3.3.1-spamd.init
+++ b/mail-filter/spamassassin/files/3.3.1-spamd.init
@@ -1,12 +1,12 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.5 2012/08/29 09:32:52 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.6 2013/10/17 11:44:12 zlogene Exp $
 
 # NB: Config is in /etc/conf.d/spamd
 
 # Provide a default location if they haven't in /etc/conf.d/spamd
-PIDFILE=${PIDFILE:-/var/run/spamd.pid}
+PIDFILE=${PIDFILE:-/run/spamd.pid}
 
 extra_started_commands="reload"
 
diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild
new file mode 100644
index 000000000000..e2fca2a7a6a7
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild,v 1.1 2013/10/17 11:44:13 zlogene Exp $
+
+EAPI=4
+
+inherit perl-module toolchain-funcs eutils systemd
+
+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"
+# need keyword request for Mail-SPF ppc ppc64
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
+
+DEPEND=">=dev-lang/perl-5.8.8-r8
+	virtual/perl-MIME-Base64
+	>=virtual/perl-PodParser-1.32
+	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.26
+	app-crypt/gnupg
+	>=virtual/perl-IO-Zlib-1.04
+	>=dev-util/re2c-0.12.0
+	dev-perl/Mail-SPF
+	dev-perl/NetAddr-IP
+	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
+	)"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+
+src_prepare() {
+	# http://old.nabble.com/Migrating-bayes-to-mysql-fails-with-parsing-errors-td31889789i20.html
+
+	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6624
+	epatch "${FILESDIR}/${P}-mysql_count_rows.patch"
+
+	#https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6625
+	epatch "${FILESDIR}/${P}-binary_token.patch"
+
+	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626
+	epatch "${FILESDIR}/${P}-innodb.patch"
+}
+
+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_dounit "${FILESDIR}"/${PN}.service
+
+	if use postgres; then
+		sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd"
+
+		dodoc sql/*_pg.sql
+	else
+		sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd"
+	fi
+
+	if use mysql; then
+		sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd"
+
+		dodoc sql/*_mysql.sql
+	else
+		sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd"
+	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 when 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"
+}