Gentoo Archives: gentoo-commits

From: Austin English <wizardedit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/
Date: Tue, 26 Apr 2016 22:27:22
Message-Id: 1461709592.d08d64145f46fe111b069722b0c5e3496756c3c2.wizardedit@gentoo
1 commit: d08d64145f46fe111b069722b0c5e3496756c3c2
2 Author: Austin English <wizardedit <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 20:58:08 2016 +0000
4 Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 22:26:32 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08d6414
7
8 mail-filter/spamassassin: remove spamassassin-3.4.0 / spamassassin-3.4.1-r1
9
10 Package-Manager: portage-2.2.26
11
12 mail-filter/spamassassin/spamassassin-3.4.0.ebuild | 212 --------------------
13 .../spamassassin/spamassassin-3.4.1-r1.ebuild | 222 ---------------------
14 2 files changed, 434 deletions(-)
15
16 diff --git a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
17 deleted file mode 100644
18 index 4753ea2..0000000
19 --- a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
20 +++ /dev/null
21 @@ -1,212 +0,0 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -
26 -EAPI=5
27 -
28 -inherit perl-module toolchain-funcs eutils systemd readme.gentoo
29 -
30 -MY_P=Mail-SpamAssassin-${PV//_/-}
31 -S=${WORKDIR}/${MY_P}
32 -DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam"
33 -HOMEPAGE="http://spamassassin.apache.org/"
34 -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
35 -
36 -LICENSE="Apache-2.0 GPL-2"
37 -SLOT="0"
38 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
39 -IUSE="+berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
40 -
41 -REQUIRED_USE="|| ( berkdb mysql postgres sqlite )"
42 -
43 -DEPEND=">=dev-lang/perl-5.8.8-r8
44 - virtual/perl-MIME-Base64
45 - >=virtual/perl-Pod-Parser-1.510.0-r2
46 - virtual/perl-Storable
47 - virtual/perl-Time-HiRes
48 - >=dev-perl/HTML-Parser-3.43
49 - >=dev-perl/Mail-DKIM-0.37
50 - >=dev-perl/Net-DNS-0.53
51 - dev-perl/Digest-SHA1
52 - dev-perl/libwww-perl
53 - >=virtual/perl-Archive-Tar-1.23
54 - app-crypt/gnupg
55 - >=virtual/perl-IO-Zlib-1.04
56 - >=dev-util/re2c-0.12.0
57 - dev-perl/Mail-SPF
58 - >=dev-perl/NetAddr-IP-4.0.1
59 - dev-perl/Geo-IP
60 - dev-perl/Encode-Detect
61 - dev-perl/Net-Patricia
62 - ssl? (
63 - dev-perl/IO-Socket-SSL
64 - dev-libs/openssl
65 - )
66 - berkdb? (
67 - virtual/perl-DB_File
68 - )
69 - ldap? ( dev-perl/perl-ldap )
70 - mysql? (
71 - dev-perl/DBI
72 - dev-perl/DBD-mysql
73 - )
74 - postgres? (
75 - dev-perl/DBI
76 - dev-perl/DBD-Pg
77 - )
78 - sqlite? (
79 - dev-perl/DBI
80 - dev-perl/DBD-SQLite
81 - )
82 - ipv6? (
83 - || ( dev-perl/IO-Socket-INET6
84 - virtual/perl-IO-Socket-IP )
85 - )"
86 -RDEPEND="${DEPEND}"
87 -
88 -SRC_TEST="do"
89 -
90 -src_configure() {
91 - # - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
92 - # (just to be sure, nobody knows how it could happen in the first place).
93 - myconf="SYSCONFDIR=${EPREFIX}/etc DATADIR=${EPREFIX}/usr/share/spamassassin"
94 -
95 - # If ssl is enabled, spamc can be built with ssl support
96 - if use ssl; then
97 - myconf+=" ENABLE_SSL=yes"
98 - else
99 - myconf+=" ENABLE_SSL=no"
100 - fi
101 -
102 - # Set the path to the Perl executable explictly. This will be used to
103 - # create the initial sharpbang line in the scripts and might cause
104 - # a versioned app name end in there, see
105 - # <https://bugs.gentoo.org/show_bug.cgi?id=62276>
106 - myconf+=" PERL_BIN=${EPREFIX}/usr/bin/perl"
107 -
108 - # Add Gentoo tag to make it easy for the upstream devs to spot
109 - # possible modifications or patches.
110 - #version_tag="g${PV:6}${PR}"
111 - #version_str="${PV//_/-}-${version_tag}"
112 -
113 - # Create the Gentoo config file before Makefile.PL is called so it
114 - # is copied later on.
115 - #echo "version_tag ${version_tag}" > rules/11_gentoo.cf
116 -
117 - # Setting the following env var ensures that no questions are asked.
118 - perl-module_src_configure
119 - # Configure spamc
120 - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
121 -}
122 -
123 -src_compile() {
124 - export PERL_MM_USE_DEFAULT=1
125 -
126 - # Now compile all the stuff selected.
127 - perl-module_src_compile
128 -
129 - if use qmail; then
130 - emake spamc/qmail-spamc
131 - fi
132 -
133 -}
134 -
135 -src_install () {
136 - perl-module_src_install
137 -
138 - # Create the stub dir used by sa-update and friends
139 - keepdir /var/lib/spamassassin
140 -
141 - # Move spamd to sbin where it belongs.
142 - dodir /usr/sbin
143 - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed"
144 -
145 - if use qmail; then
146 - dobin spamc/qmail-spamc
147 - fi
148 -
149 - ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
150 -
151 - # Disable plugin by default
152 - sed -i -e 's/^loadplugin/\#loadplugin/g' "${ED}"/etc/mail/spamassassin/init.pre || die
153 -
154 - # Add the init and config scripts.
155 - newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
156 - newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
157 -
158 - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
159 - systemd_install_serviced "${FILESDIR}"/${PN}.service.conf
160 -
161 - if use postgres; then
162 - sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd" || die
163 -
164 - dodoc sql/*_pg.sql
165 - else
166 - sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd" || die
167 - fi
168 -
169 - if use mysql; then
170 - sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd" || die
171 -
172 - dodoc sql/*_mysql.sql
173 - else
174 - sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd" || die
175 - fi
176 -
177 - dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
178 - sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
179 - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
180 - spamd-apache2/README.apache
181 -
182 - # Rename some docu files so they don't clash with others
183 - newdoc spamd/README README.spamd
184 - newdoc sql/README README.sql
185 - newdoc ldap/README README.ldap
186 -
187 - if use qmail; then
188 - dodoc spamc/README.qmail
189 - fi
190 -
191 - cp "${FILESDIR}"/secrets.cf "${ED}"/etc/mail/spamassassin/secrets.cf.example || die
192 - fperms 0400 /etc/mail/spamassassin/secrets.cf.example
193 -
194 - cat <<-EOF > "${T}/local.cf.example"
195 - # Sensitive data, such as database connection info, should be stored in
196 - # /etc/mail/spamassassin/secrets.cf with appropriate permissions
197 -EOF
198 -
199 - insinto /etc/mail/spamassassin/
200 - doins "${T}/local.cf.example"
201 -}
202 -
203 -pkg_postinst() {
204 - elog "If you plan on using the -u flag to spamd, please read the notes"
205 - elog "in /etc/conf.d/spamd regarding the location of the pid file.\n"
206 - elog "If you build ${PN} with optional dependancy support,"
207 - elog "you can enable them in /etc/mail/spamassassin/init.pre\n"
208 - elog "You need to configure your database to be able to use Bayes filter"
209 - elog "with database backend, otherwise it will still use (and need) the"
210 - elog "Berkeley DB support."
211 - elog "Look at the sql/README.bayes file in the documentation directory"
212 - elog "for how to configure it.\n"
213 - elog "If you plan to use Vipul's Razor, note that versions up to and"
214 - elog "including version 2.82 include a bug that will slow down the entire"
215 - elog "perl interpreter. Version 2.83 or later fixes this."
216 - elog "If you do not plan to use this plugin, be sure to comment out"
217 - elog "its loadplugin line in /etc/mail/spamassassin/v310.pre.\n"
218 - elog "The DKIM plugin is now enabled by default for new installs,"
219 - elog "if the perl module Mail::DKIM is installed."
220 - elog "However, installation of SpamAssassin will not overwrite existing"
221 - elog ".pre configuration files, so to use DKIM when upgrading from a"
222 - elog "previous release that did not use DKIM, a directive:\n"
223 - elog "loadplugin Mail::SpamAssassin::Plugin::DKIM"
224 - elog "will need to be uncommented in file 'v312.pre', or added"
225 - elog "to some other .pre file, such as local.pre.\n"
226 - ewarn "Rules are no longer included with SpamAssassin out of the box".
227 - ewarn "You will need to immediately run sa-update, or download"
228 - ewarn "the additional rules .tgz package and run sa-update --install"
229 - ewarn "with it, to get a ruleset.\n"
230 - elog "If you run sa-update and receive a GPG validation error."
231 - elog "Then you need to import an updated sa-update key."
232 - elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt\n"
233 -}
234
235 diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r1.ebuild
236 deleted file mode 100644
237 index a1641e7..0000000
238 --- a/mail-filter/spamassassin/spamassassin-3.4.1-r1.ebuild
239 +++ /dev/null
240 @@ -1,222 +0,0 @@
241 -# Copyright 1999-2015 Gentoo Foundation
242 -# Distributed under the terms of the GNU General Public License v2
243 -# $Id$
244 -
245 -EAPI=5
246 -
247 -inherit perl-module toolchain-funcs eutils systemd readme.gentoo
248 -
249 -MY_P=Mail-SpamAssassin-${PV//_/-}
250 -S=${WORKDIR}/${MY_P}
251 -DESCRIPTION="An extensible mail filter which can identify and tag spam"
252 -HOMEPAGE="http://spamassassin.apache.org/"
253 -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
254 -
255 -LICENSE="Apache-2.0 GPL-2"
256 -SLOT="0"
257 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
258 -IUSE="+bayes berkdb libressl qmail ssl doc ldap mysql postgres sqlite ipv6"
259 -
260 -# You can do without a database unless you need the Bayes features.
261 -REQUIRED_USE="bayes? ( || ( berkdb mysql postgres sqlite ) )"
262 -
263 -DEPEND=">=dev-lang/perl-5.8.8-r8
264 - virtual/perl-MIME-Base64
265 - >=virtual/perl-Pod-Parser-1.510.0-r2
266 - virtual/perl-Storable
267 - virtual/perl-Time-HiRes
268 - >=dev-perl/HTML-Parser-3.43
269 - >=dev-perl/Mail-DKIM-0.37
270 - >=dev-perl/Net-DNS-0.53
271 - dev-perl/Digest-SHA1
272 - dev-perl/libwww-perl
273 - >=virtual/perl-Archive-Tar-1.23
274 - app-crypt/gnupg
275 - >=virtual/perl-IO-Zlib-1.04
276 - >=dev-util/re2c-0.12.0
277 - dev-perl/Mail-SPF
278 - >=dev-perl/NetAddr-IP-4.0.1
279 - dev-perl/Geo-IP
280 - dev-perl/Encode-Detect
281 - dev-perl/Net-Patricia
282 - ssl? (
283 - dev-perl/IO-Socket-SSL
284 - !libressl? ( dev-libs/openssl:0 )
285 - libressl? ( dev-libs/libressl )
286 - )
287 - berkdb? (
288 - virtual/perl-DB_File
289 - )
290 - ldap? ( dev-perl/perl-ldap )
291 - mysql? (
292 - dev-perl/DBI
293 - dev-perl/DBD-mysql
294 - )
295 - postgres? (
296 - dev-perl/DBI
297 - dev-perl/DBD-Pg
298 - )
299 - sqlite? (
300 - dev-perl/DBI
301 - dev-perl/DBD-SQLite
302 - )
303 - ipv6? (
304 - || ( dev-perl/IO-Socket-INET6
305 - virtual/perl-IO-Socket-IP )
306 - )"
307 -RDEPEND="${DEPEND}"
308 -
309 -SRC_TEST="do"
310 -
311 -src_prepare() {
312 - # Merged upstream
313 - #epatch "${FILESDIR}/net-dns-0.76_compatibility.patch"
314 - perl-module_src_prepare
315 -}
316 -
317 -src_configure() {
318 - # - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
319 - # (just to be sure, nobody knows how it could happen in the first place).
320 - myconf="SYSCONFDIR=${EPREFIX}/etc"
321 - myconf+=" DATADIR=${EPREFIX}/usr/share/spamassassin"
322 -
323 - # If ssl is enabled, spamc can be built with ssl support.
324 - if use ssl; then
325 - myconf+=" ENABLE_SSL=yes"
326 - else
327 - myconf+=" ENABLE_SSL=no"
328 - fi
329 -
330 - # Set the path to the Perl executable explictly. This will be used to
331 - # create the initial sharpbang line in the scripts and might cause
332 - # a versioned app name end in there, see
333 - # <https://bugs.gentoo.org/show_bug.cgi?id=62276>
334 - myconf+=" PERL_BIN=${EPREFIX}/usr/bin/perl"
335 -
336 - # Setting the following env var ensures that no questions are asked.
337 - perl-module_src_configure
338 - # Configure spamc
339 - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
340 -}
341 -
342 -src_compile() {
343 - export PERL_MM_USE_DEFAULT=1
344 -
345 - # Now compile all the stuff selected.
346 - perl-module_src_compile
347 -
348 - if use qmail; then
349 - emake spamc/qmail-spamc
350 - fi
351 -}
352 -
353 -src_install () {
354 - perl-module_src_install
355 -
356 - # Create the stub dir used by sa-update and friends
357 - keepdir /var/lib/spamassassin
358 -
359 - # Move spamd to sbin where it belongs.
360 - dodir /usr/sbin
361 - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed"
362 -
363 - if use qmail; then
364 - dobin spamc/qmail-spamc
365 - fi
366 -
367 - ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
368 -
369 - # Disable plugin by default
370 - sed -i -e 's/^loadplugin/\#loadplugin/g' \
371 - "${ED}"/etc/mail/spamassassin/init.pre \
372 - || die "failed to disable plugins by default"
373 -
374 - # Add the init and config scripts.
375 - newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
376 - newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
377 -
378 - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
379 - systemd_install_serviced "${FILESDIR}"/${PN}.service.conf
380 -
381 - if use postgres; then
382 - sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd" || die
383 -
384 - dodoc sql/*_pg.sql
385 - else
386 - sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd" || die
387 - fi
388 -
389 - if use mysql; then
390 - sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd" || die
391 -
392 - dodoc sql/*_mysql.sql
393 - else
394 - sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd" || die
395 - fi
396 -
397 - dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
398 - sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
399 - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
400 - spamd-apache2/README.apache
401 -
402 - # Rename some docu files so they don't clash with others
403 - newdoc spamd/README README.spamd
404 - newdoc sql/README README.sql
405 - newdoc ldap/README README.ldap
406 -
407 - if use qmail; then
408 - dodoc spamc/README.qmail
409 - fi
410 -
411 - insinto /etc/mail/spamassassin/
412 - insopts -m0400
413 - newins "${FILESDIR}"/secrets.cf secrets.cf.example
414 -
415 - cat <<-EOF > "${T}/local.cf.example"
416 - # Sensitive data, such as database connection info, should be stored in
417 - # /etc/mail/spamassassin/secrets.cf with appropriate permissions
418 -EOF
419 -
420 - insopts -m0644
421 - doins "${T}/local.cf.example"
422 -}
423 -
424 -pkg_postinst() {
425 - elog "If you plan on using the -u flag to spamd, please read the notes"
426 - elog "in /etc/conf.d/spamd regarding the location of the pid file."
427 - elog
428 - elog "If you build ${PN} with optional dependancy support,"
429 - elog "you can enable them in /etc/mail/spamassassin/init.pre"
430 - elog
431 - elog "You need to configure your database to be able to use Bayes filter"
432 - elog "with database backend, otherwise it will still use (and need) the"
433 - elog "Berkeley DB support."
434 - elog "Look at the sql/README.bayes file in the documentation directory"
435 - elog "for how to configure it."
436 - elog
437 - elog "If you plan to use Vipul's Razor, note that versions up to and"
438 - elog "including version 2.82 include a bug that will slow down the entire"
439 - elog "perl interpreter. Version 2.83 or later fixes this."
440 - elog "If you do not plan to use this plugin, be sure to comment out"
441 - elog "its loadplugin line in /etc/mail/spamassassin/v310.pre."
442 - elog
443 - elog "The DKIM plugin is now enabled by default for new installs,"
444 - elog "if the perl module Mail::DKIM is installed."
445 - elog "However, installation of SpamAssassin will not overwrite existing"
446 - elog ".pre configuration files, so to use DKIM when upgrading from a"
447 - elog "previous release that did not use DKIM, a directive:"
448 - elog
449 - elog "loadplugin Mail::SpamAssassin::Plugin::DKIM"
450 - elog "will need to be uncommented in file 'v312.pre', or added"
451 - elog "to some other .pre file, such as local.pre."
452 - elog
453 - ewarn "Rules are no longer included with SpamAssassin out of the box".
454 - ewarn "You will need to immediately run sa-update, or download"
455 - ewarn "the additional rules .tgz package and run sa-update --install"
456 - ewarn "with it, to get a ruleset."
457 - elog
458 - elog "If you run sa-update and receive a GPG validation error."
459 - elog "Then you need to import an updated sa-update key."
460 - elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt"
461 - elog
462 -}