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