summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Veller <tove@gentoo.org>2010-10-26 07:33:59 +0000
committerTorsten Veller <tove@gentoo.org>2010-10-26 07:33:59 +0000
commit2aa836517df365f98530e637883e718021a35c98 (patch)
tree8bc87de03b68042358e32de7e12f1557d750c4db /mail-filter
parentVersion bump for bug #340204. Add pcre USE flag and dependencies, alter spaci... (diff)
downloadhistorical-2aa836517df365f98530e637883e718021a35c98.tar.gz
historical-2aa836517df365f98530e637883e718021a35c98.tar.bz2
historical-2aa836517df365f98530e637883e718021a35c98.zip
Avoid undef warning: Use of uninitialized value $opt{"syslog-socket"} in spamd. Thanks to Toralf Förster and David Abbott (#342591)
Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/spamassassin/ChangeLog10
-rw-r--r--mail-filter/spamassassin/Manifest4
-rw-r--r--mail-filter/spamassassin/files/spamassassin-3.3.1-uninitialized_value.patch18
-rw-r--r--mail-filter/spamassassin/spamassassin-3.3.1-r4.ebuild204
4 files changed, 234 insertions, 2 deletions
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 3f3aee5caf16..bc029d6ddabd 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for mail-filter/spamassassin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.190 2010/10/23 19:09:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.191 2010/10/26 07:33:59 tove Exp $
+
+*spamassassin-3.3.1-r4 (26 Oct 2010)
+
+ 26 Oct 2010; Torsten Veller <tove@gentoo.org>
+ +spamassassin-3.3.1-r4.ebuild,
+ +files/spamassassin-3.3.1-uninitialized_value.patch:
+ Avoid undef warning: Use of uninitialized value $opt{"syslog-socket"} in
+ spamd. Thanks to Toralf Förster and David Abbott (#342591)
23 Oct 2010; Brent Baude <ranger@gentoo.org> spamassassin-3.3.1-r3.ebuild:
Marking spamassassin-3.3.1-r3 ppc for bug 338233
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 4e59ff386849..4a0488f1a5c0 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -5,6 +5,7 @@ AUX FH_DATE_PAST_20XX.patch 416 RMD160 85ccd5fce6faa70ceb16bbdc98cf0c710dd15847
AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342ba5569c8c SHA1 045a446362b8b0491164a53cff18391c49fe6786 SHA256 f73e3d63b7fd79c364799cd1e3525369ac483019e55c079f33529b6ce81c9264
AUX spamassassin-3.3.1-PERL-5-12.patch 8952 RMD160 f748f6568adeedd9db7b6302cd9f484cc9882599 SHA1 fd2b8f081d26c062a1e21f4ccf90b2b4079f89e1 SHA256 6054e7ac297e22c0f24ca524169140526e4d036dc0c11bedf4e64e30c6cbb593
+AUX spamassassin-3.3.1-uninitialized_value.patch 754 RMD160 0dea62c4b2a716557d4dd485336d60a885a0108e SHA1 6fb6781deb9f8e3344930e755baaeb3c387c7a52 SHA256 b393684a626240bf75e2c6fe7fe56bedc4b64c59220d7129ee0b1d99381493be
DIST Mail-SpamAssassin-3.2.1.tar.bz2 981918 RMD160 508e9aae2705d1caaeba78720ba78b6385a6e237 SHA1 3095b38d90d0362c4e47e117fb612778a2ac362b SHA256 bccd0ecf00c3bc6bbcbe4a5eaa486e0db7dc755076130a66c935ec50b3fa8b3c
DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34c81e3e521144 SHA1 32b701ffc68f7975eded107c456b902bc710d8b2 SHA256 baaab5e4da7d3b0e04c0db579bdb44bbd6be916d29540682346eccead23f6c8a
DIST Mail-SpamAssassin-3.3.1.tar.bz2 1015008 RMD160 b681fc60292cd30efd405585aad70f39c9633260 SHA1 f5748043eb286b1acb456093039a55db00c6f25e SHA256 4c348cd951fc2c5688e9713fcbc6ba453df51d32a1ab332a63800d20ff18bdb4
@@ -12,5 +13,6 @@ EBUILD spamassassin-3.2.1-r2.ebuild 8078 RMD160 05527bb9d179b8a1d6c2b11bee8f9728
EBUILD spamassassin-3.2.5-r2.ebuild 8086 RMD160 6256a7d4bcb166ce185e33c4a5421bb33f2dc14c SHA1 50aca493f070c924c05c7db26967529b6918ba87 SHA256 1c950c1edade9d4e036e4c3d82dcf9fed4a73d8d3594142a365ae246370a229c
EBUILD spamassassin-3.3.1-r2.ebuild 6663 RMD160 5bebdcf53a4ae008a924732cddf6aeed3f4915ff SHA1 5f2b41e2990259981524846772b45fdad59a3a36 SHA256 44494d3cd28b66302b8d7ec45f35a95131dacebc1e374023086e5d6dfd6d0c6c
EBUILD spamassassin-3.3.1-r3.ebuild 6777 RMD160 1af1ebba73939b2a336476c3a982fcaae55f639d SHA1 2a5ed0f57e3dd475779322c0565bf9c4897781cc SHA256 adeabe44062dbc7ed6028bc02b68053015949c954d9f5241f85556a0c19981b0
-MISC ChangeLog 38840 RMD160 b4ff220cf6f3c260d7e897e254f276469f0ab7e7 SHA1 dea7548c41e5115f001b213abdebf05abdbec5bc SHA256 7f9f5e3fe6640c61356ddb1eee1aa06b98ef662eff59aa99a3f97e41eed20a26
+EBUILD spamassassin-3.3.1-r4.ebuild 6829 RMD160 3713f04823ad2501026ede9249a8ca035f025731 SHA1 8fd9502de4a1462759b2bb9798298bf482fc252f SHA256 88d1366aaca13f7308e0a4413be82e3a97da6bb8c414e17904f8c08c8fad43b1
+MISC ChangeLog 39150 RMD160 6f42ba92e9873e6e8e628616674087be1ca4554f SHA1 e212b3b976b69b0c025d7ce2de513f6ac1a6f48f SHA256 5176ff4dec693151ebfb41abde70fe817db79e36e42091c344790ab7c780b272
MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/files/spamassassin-3.3.1-uninitialized_value.patch b/mail-filter/spamassassin/files/spamassassin-3.3.1-uninitialized_value.patch
new file mode 100644
index 000000000000..4cd51294b036
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.3.1-uninitialized_value.patch
@@ -0,0 +1,18 @@
+http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?r1=950076&r2=950216&pathrev=950216
+https://bugs.gentoo.org/show_bug.cgi?id=342591
+--- a/Mail-SpamAssassin-3.3.1/spamd/spamd.raw 2010-03-16 10:49:25.000000000 -0400
++++ b/Mail-SpamAssassin-3.3.1/spamd/spamd.raw 2010-10-25 16:21:02.000000000 -0400
+@@ -443,10 +443,12 @@
+ # socket of 'none' means as much as --syslog=null. Sounds complicated? It is.
+ # But it works.
+ # )
+-my $log_socket = lc($opt{'syslog-socket'});
++my $log_socket = $opt{'syslog-socket'};
+
+ if (!defined $log_socket || $log_socket eq '') {
+ $log_socket = am_running_on_windows() ? 'none' : 'unix';
++} else {
++ $log_socket = lc $log_socket;
+ }
+
+ # This is the default log file; it can be changed on the command line
diff --git a/mail-filter/spamassassin/spamassassin-3.3.1-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.3.1-r4.ebuild
new file mode 100644
index 000000000000..18ca9e312101
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.3.1-r4.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.1-r4.ebuild,v 1.1 2010/10/26 07:33:59 tove Exp $
+
+EAPI="2"
+
+inherit perl-module toolchain-funcs eutils
+
+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://apache.osuosl.org/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# 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
+ )"
+
+PATCHES=( "${FILESDIR}/${P}-PERL-5-12.patch"
+ "${FILESDIR}"/${P}-uninitialized_value.patch )
+
+RDEPEND="${DEPEND}"
+
+# - Disable tests as they will fail
+# - Please see http://www.cpantesters.org/distro/M/Mail-SpamAssassin.html#Mail-SpamAssassin-3.3.1
+# - for more info, upstream problem not specific to Gentoo
+SRC_TEST="skip"
+
+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=/etc DATADIR=/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=/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 || die "emake failed"
+}
+
+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 || die "building qmail-spamc emake failed"
+ fi
+
+}
+
+src_install () {
+ perl-module_src_install
+
+ # Create the stub dir used by sa-update and friends
+ dodir /var/lib/spamassassin || die
+
+ # Move spamd to sbin where it belongs.
+ dodir /usr/sbin
+ mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd || die "move spamd failed"
+
+ if use qmail; then
+ dobin spamc/qmail-spamc || die
+ fi
+
+ dosym /etc/mail/spamassassin /etc/spamassassin || die
+
+ # Disable plugin by default
+ sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre || die
+
+ # Add the init and config scripts.
+ newinitd "${FILESDIR}"/3.3.1-spamd.init spamd || die
+ newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd || die
+
+ use postgres && \
+ sed -i -e 's:@USEPOSTGRES@::' "${D}/etc/init.d/spamd" || \
+ sed -i -e '/@USEPOSTGRES@/d' "${D}/etc/init.d/spamd"
+
+ use mysql && \
+ sed -i -e 's:@USEMYSQL@::' "${D}/etc/init.d/spamd" || \
+ sed -i -e '/@USEMYSQL@/d' "${D}/etc/init.d/spamd"
+
+ dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
+ sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
+ sample-spam.txt spamassassin.spec spamd/PROTOCOL spamd/README.vpopmail \
+ spamd-apache2/README.apache || die
+
+ # Rename some docu files so they don't clash with others
+ newdoc spamd/README README.spamd || die
+ newdoc sql/README README.sql || die
+ newdoc ldap/README README.ldap || die
+
+ if use qmail; then
+ dodoc spamc/README.qmail || die
+ fi
+
+ cp "${FILESDIR}"/secrets.cf "${D}"/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" || die
+}
+
+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"
+}