1 |
idl0r 11/11/27 19:44:24 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: spamassassin-3.3.2-r1.ebuild |
5 |
Removed: spamassassin-3.3.2.ebuild |
6 |
Log: |
7 |
Rev bump. Add some patches for MySQL, see ebuild for further details. |
8 |
|
9 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
10 |
|
11 |
Revision Changes Path |
12 |
1.203 mail-filter/spamassassin/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin/ChangeLog?rev=1.203&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin/ChangeLog?rev=1.203&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin/ChangeLog?r1=1.202&r2=1.203 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v |
21 |
retrieving revision 1.202 |
22 |
retrieving revision 1.203 |
23 |
diff -u -r1.202 -r1.203 |
24 |
--- ChangeLog 14 Sep 2011 23:00:38 -0000 1.202 |
25 |
+++ ChangeLog 27 Nov 2011 19:44:24 -0000 1.203 |
26 |
@@ -1,6 +1,14 @@ |
27 |
# ChangeLog for mail-filter/spamassassin |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.202 2011/09/14 23:00:38 polynomial-c Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.203 2011/11/27 19:44:24 idl0r Exp $ |
31 |
+ |
32 |
+*spamassassin-3.3.2-r1 (27 Nov 2011) |
33 |
+ |
34 |
+ 27 Nov 2011; Christian Ruppert <idl0r@g.o> -spamassassin-3.3.2.ebuild, |
35 |
+ +spamassassin-3.3.2-r1.ebuild, +files/spamassassin-3.3.2-binary_token.patch, |
36 |
+ +files/spamassassin-3.3.2-innodb.patch, |
37 |
+ +files/spamassassin-3.3.2-mysql_count_rows.patch: |
38 |
+ Rev bump. Add some patches for MySQL, see ebuild for further details. |
39 |
|
40 |
14 Sep 2011; Lars Wendler <polynomial-c@g.o> files/3.3.1-spamd.init: |
41 |
non-maintainer commit: Moved reload option from extra_commands to |
42 |
|
43 |
|
44 |
|
45 |
1.1 mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: spamassassin-3.3.2-r1.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2011 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild,v 1.1 2011/11/27 19:44:24 idl0r Exp $ |
55 |
|
56 |
EAPI=4 |
57 |
|
58 |
inherit perl-module toolchain-funcs eutils |
59 |
|
60 |
MY_P=Mail-SpamAssassin-${PV//_/-} |
61 |
S=${WORKDIR}/${MY_P} |
62 |
DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam" |
63 |
HOMEPAGE="http://spamassassin.apache.org/" |
64 |
SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" |
65 |
|
66 |
LICENSE="Apache-2.0" |
67 |
SLOT="0" |
68 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
69 |
# need keyword request for Mail-SPF ppc ppc64 |
70 |
IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite ipv6" |
71 |
|
72 |
DEPEND=">=dev-lang/perl-5.8.8-r8 |
73 |
virtual/perl-MIME-Base64 |
74 |
>=virtual/perl-PodParser-1.32 |
75 |
virtual/perl-Storable |
76 |
virtual/perl-Time-HiRes |
77 |
>=dev-perl/HTML-Parser-3.43 |
78 |
>=dev-perl/Mail-DKIM-0.37 |
79 |
>=dev-perl/Net-DNS-0.53 |
80 |
dev-perl/Digest-SHA1 |
81 |
dev-perl/libwww-perl |
82 |
>=virtual/perl-Archive-Tar-1.26 |
83 |
app-crypt/gnupg |
84 |
>=virtual/perl-IO-Zlib-1.04 |
85 |
>=dev-util/re2c-0.12.0 |
86 |
dev-perl/Mail-SPF |
87 |
dev-perl/NetAddr-IP |
88 |
ssl? ( |
89 |
dev-perl/IO-Socket-SSL |
90 |
dev-libs/openssl |
91 |
) |
92 |
berkdb? ( |
93 |
virtual/perl-DB_File |
94 |
) |
95 |
ldap? ( dev-perl/perl-ldap ) |
96 |
mysql? ( |
97 |
dev-perl/DBI |
98 |
dev-perl/DBD-mysql |
99 |
) |
100 |
postgres? ( |
101 |
dev-perl/DBI |
102 |
dev-perl/DBD-Pg |
103 |
) |
104 |
sqlite? ( |
105 |
dev-perl/DBI |
106 |
dev-perl/DBD-SQLite |
107 |
) |
108 |
ipv6? ( |
109 |
dev-perl/IO-Socket-INET6 |
110 |
)" |
111 |
RDEPEND="${DEPEND}" |
112 |
|
113 |
SRC_TEST="do" |
114 |
|
115 |
src_prepare() { |
116 |
# http://old.nabble.com/Migrating-bayes-to-mysql-fails-with-parsing-errors-td31889789i20.html |
117 |
|
118 |
# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6624 |
119 |
epatch "${FILESDIR}/${P}-mysql_count_rows.patch" |
120 |
|
121 |
#https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6625 |
122 |
epatch "${FILESDIR}/${P}-binary_token.patch" |
123 |
|
124 |
# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626 |
125 |
epatch "${FILESDIR}/${P}-innodb.patch" |
126 |
} |
127 |
|
128 |
src_configure() { |
129 |
# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again |
130 |
# (just to be sure, nobody knows how it could happen in the first place). |
131 |
myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin" |
132 |
|
133 |
# If ssl is enabled, spamc can be built with ssl support |
134 |
if use ssl; then |
135 |
myconf+=" ENABLE_SSL=yes" |
136 |
else |
137 |
myconf+=" ENABLE_SSL=no" |
138 |
fi |
139 |
|
140 |
# Set the path to the Perl executable explictly. This will be used to |
141 |
# create the initial sharpbang line in the scripts and might cause |
142 |
# a versioned app name end in there, see |
143 |
# <http://bugs.gentoo.org/show_bug.cgi?id=62276> |
144 |
myconf+=" PERL_BIN=/usr/bin/perl" |
145 |
|
146 |
# Add Gentoo tag to make it easy for the upstream devs to spot |
147 |
# possible modifications or patches. |
148 |
#version_tag="g${PV:6}${PR}" |
149 |
#version_str="${PV//_/-}-${version_tag}" |
150 |
|
151 |
# Create the Gentoo config file before Makefile.PL is called so it |
152 |
# is copied later on. |
153 |
#echo "version_tag ${version_tag}" > rules/11_gentoo.cf |
154 |
|
155 |
# Setting the following env var ensures that no questions are asked. |
156 |
perl-module_src_configure |
157 |
# Configure spamc |
158 |
emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile |
159 |
} |
160 |
|
161 |
src_compile() { |
162 |
export PERL_MM_USE_DEFAULT=1 |
163 |
|
164 |
# Now compile all the stuff selected. |
165 |
perl-module_src_compile |
166 |
|
167 |
if use qmail; then |
168 |
emake spamc/qmail-spamc |
169 |
fi |
170 |
|
171 |
} |
172 |
|
173 |
src_install () { |
174 |
perl-module_src_install |
175 |
|
176 |
# Create the stub dir used by sa-update and friends |
177 |
dodir /var/lib/spamassassin |
178 |
|
179 |
# Move spamd to sbin where it belongs. |
180 |
dodir /usr/sbin |
181 |
mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd || die "move spamd failed" |
182 |
|
183 |
if use qmail; then |
184 |
dobin spamc/qmail-spamc |
185 |
fi |
186 |
|
187 |
ln -s mail/spamassassin "${D}"/etc/spamassassin || die |
188 |
|
189 |
# Disable plugin by default |
190 |
sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre || die |
191 |
|
192 |
# Add the init and config scripts. |
193 |
newinitd "${FILESDIR}"/3.3.1-spamd.init spamd |
194 |
newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd |
195 |
|
196 |
if use postgres; then |
197 |
sed -i -e 's:@USEPOSTGRES@::' "${D}/etc/init.d/spamd" |
198 |
|
199 |
dodoc sql/*_pg.sql |
200 |
else |
201 |
sed -i -e '/@USEPOSTGRES@/d' "${D}/etc/init.d/spamd" |
202 |
fi |
203 |
|
204 |
if use mysql; then |
205 |
sed -i -e 's:@USEMYSQL@::' "${D}/etc/init.d/spamd" |
206 |
|
207 |
dodoc sql/*_mysql.sql |
208 |
else |
209 |
sed -i -e '/@USEMYSQL@/d' "${D}/etc/init.d/spamd" |
210 |
fi |
211 |
|
212 |
dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \ |
213 |
sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \ |
214 |
sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \ |
215 |
spamd-apache2/README.apache |
216 |
|
217 |
# Rename some docu files so they don't clash with others |
218 |
newdoc spamd/README README.spamd |
219 |
newdoc sql/README README.sql |
220 |
newdoc ldap/README README.ldap |
221 |
|
222 |
if use qmail; then |
223 |
dodoc spamc/README.qmail |
224 |
fi |
225 |
|
226 |
cp "${FILESDIR}"/secrets.cf "${D}"/etc/mail/spamassassin/secrets.cf.example || die |
227 |
fperms 0400 /etc/mail/spamassassin/secrets.cf.example |
228 |
|
229 |
cat <<-EOF > "${T}/local.cf.example" |
230 |
# Sensitive data, such as database connection info, should be stored in |
231 |
# /etc/mail/spamassassin/secrets.cf with appropriate permissions |
232 |
EOF |
233 |
|
234 |
insinto /etc/mail/spamassassin/ |
235 |
doins "${T}/local.cf.example" |
236 |
} |
237 |
|
238 |
pkg_postinst() { |
239 |
perl-module_pkg_postinst |
240 |
elog "If you plan on using the -u flag to spamd, please read the notes" |
241 |
elog "in /etc/conf.d/spamd regarding the location of the pid file.\n" |
242 |
elog "If you build ${PN} with optional dependancy support," |
243 |
elog "you can enable them in /etc/mail/spamassassin/init.pre\n" |
244 |
elog "You need to configure your database to be able to use Bayes filter" |
245 |
elog "with database backend, otherwise it will still use (and need) the" |
246 |
elog "Berkeley DB support." |
247 |
elog "Look at the sql/README.bayes file in the documentation directory" |
248 |
elog "for how to configure it.\n" |
249 |
elog "If you plan to use Vipul's Razor, note that versions up to and" |
250 |
elog "including version 2.82 include a bug that will slow down the entire" |
251 |
elog "perl interpreter. Version 2.83 or later fixes this." |
252 |
elog "If you do not plan to use this plugin, be sure to comment out" |
253 |
elog "its loadplugin line in /etc/mail/spamassassin/v310.pre.\n" |
254 |
elog "The DKIM plugin is now enabled by default for new installs," |
255 |
elog "if the perl module Mail::DKIM is installed." |
256 |
elog "However, installation of SpamAssassin will not overwrite existing" |
257 |
elog ".pre configuration files, so to use DKIM when upgrading from a" |
258 |
elog "previous release that did not use DKIM, a directive:\n" |
259 |
elog "loadplugin Mail::SpamAssassin::Plugin::DKIM" |
260 |
elog "will need to be uncommented in file 'v312.pre', or added" |
261 |
elog "to some other .pre file, such as local.pre.\n" |
262 |
ewarn "Rules are no longer included with SpamAssassin out of the box". |
263 |
ewarn "You will need to immediately run sa-update, or download" |
264 |
ewarn "the additional rules .tgz package and run sa-update --install" |
265 |
ewarn "with it, to get a ruleset.\n" |
266 |
elog "If when you run sa-update and receive a GPG validation error." |
267 |
elog "Then you need to import an updated sa-update key." |
268 |
elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt\n" |
269 |
} |