diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2009-07-30 17:49:59 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2009-07-30 17:49:59 +0000 |
| commit | 38b2223015830e728ee3a21107e9685d3871d41b (patch) | |
| tree | b2fc4edea3563c658c9213092aa07f50788d3c2a /mail-filter | |
| parent | Fix conf.d file. (diff) | |
| download | gentoo-2-38b2223015830e728ee3a21107e9685d3871d41b.tar.gz gentoo-2-38b2223015830e728ee3a21107e9685d3871d41b.tar.bz2 gentoo-2-38b2223015830e728ee3a21107e9685d3871d41b.zip | |
Revbump, fix startup failure w/ antispam disabled, #277363
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/amavisd-new/ChangeLog | 9 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild (renamed from mail-filter/amavisd-new/amavisd-new-2.6.3-r1.ebuild) | 3 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch | 12 |
3 files changed, 22 insertions, 2 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog index 6b7883e20404..0430ad7efbe9 100644 --- a/mail-filter/amavisd-new/ChangeLog +++ b/mail-filter/amavisd-new/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-filter/amavisd-new # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.145 2009/07/19 17:52:28 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.146 2009/07/30 17:49:59 dertobi123 Exp $ + +*amavisd-new-2.6.3-r2 (30 Jul 2009) + + 30 Jul 2009; Tobias Scherbaum <dertobi123@gentoo.org> + -amavisd-new-2.6.3-r1.ebuild, +amavisd-new-2.6.3-r2.ebuild, + +files/amavisd-new-2.6.3-startup.patch: + Revbump, fix startup failure w/ antispam disabled, #277363 19 Jul 2009; Torsten Veller <tove@gentoo.org> amavisd-new-2.6.1-r1.ebuild, amavisd-new-2.6.3-r1.ebuild, amavisd-new-2.6.4.ebuild: diff --git a/mail-filter/amavisd-new/amavisd-new-2.6.3-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild index 760bbb50687b..ba1c90a069ec 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.6.3-r1.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.6.3-r1.ebuild,v 1.7 2009/07/19 17:52:28 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild,v 1.1 2009/07/30 17:49:59 dertobi123 Exp $ inherit eutils @@ -66,6 +66,7 @@ src_unpack() { fi epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" + epatch "${FILESDIR}/${P}-startup.patch" if ! use dkim ; then epatch "${FILESDIR}/${P}-dkimconf.patch" diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch new file mode 100644 index 000000000000..7d3aa1c3452e --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch @@ -0,0 +1,12 @@ +--- amavisd.orig 2009-07-30 19:30:22.707549708 +0200 ++++ amavisd 2009-07-30 19:29:08.000000000 +0200 +@@ -13649,7 +13649,9 @@ + my(%spam_scanners_used); + my($bpscm) = ca('bypass_spam_checks_maps'); + if (!@{ca('spam_scanners')}) { ++ undef $extra_code_antispam; + } elsif (@$bpscm && !ref($bpscm->[0]) && $bpscm->[0]) { # simple-minded ++ undef $extra_code_antispam; + } else { + eval $extra_code_antispam or die "Problem in antispam code: $@"; + $extra_code_antispam = 1; # release memory occupied by the source code |