commit: 8fcc0c740d42cfd9ad0d2b0c0865ebda8ce768b2 Author: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com> AuthorDate: Wed Aug 23 11:55:16 2017 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Wed Aug 23 12:19:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcc0c74
mail-filter/spamassassin: Tweaks requested by @orlitzky - Add upstream bug URL to patch ( https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7462 ) - Removed -r15 from package.mask - Unrequested: Renamed patch file now that there is an upstream bug to match the naming convention of the other patches Gentoo-Bug: 627678 Package-Manager: Portage-2.3.6, Repoman-2.3.1 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> ...ssassin-3.4.1-bug_627678.patch => spamassassin-3.4.1-bug_7462.patch} | 1 + mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild | 2 +- profiles/package.mask | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_627678.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch similarity index 99% rename from mail-filter/spamassassin/files/spamassassin-3.4.1-bug_627678.patch rename to mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch index 73765a939b0..bf4dc111acb 100644 --- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_627678.patch +++ b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch @@ -1,3 +1,4 @@ +https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7462 https://bugs.gentoo.org/show_bug.cgi?id=627678 --- Mail-SpamAssassin-3.4.1/t/basic_meta.t 2015-04-28 15:56:59.000000000 -0400 +++ Mail-SpamAssassin-3.4.1/t/basic_meta.t 2017-08-20 21:29:44.000000000 -0400 diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild index a926f296f96..47d77f361f7 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild @@ -84,8 +84,8 @@ PATCHES=( "${FILESDIR}/spamassassin-3.4.1-bug_7265.patch" "${FILESDIR}/spamassassin-3.4.1-bug_7231-extra.patch" "${FILESDIR}/spamassassin-3.4.1-bug_7404.patch" + "${FILESDIR}/spamassassin-3.4.1-bug_7462.patch" "${FILESDIR}/spamassassin-3.4.1-perl526.patch" - "${FILESDIR}/spamassassin-3.4.1-bug_627678.patch" ) src_prepare() { diff --git a/profiles/package.mask b/profiles/package.mask index e875e4fd55d..373da90a718 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -46,7 +46,6 @@ app-arch/unrar-gpl # Masked until somebody who uses systemd tells me # I didn't break the service file or configuration. =mail-filter/spamassassin-3.4.1-r14 -=mail-filter/spamassassin-3.4.1-r15 # Andreas Sturmlechner <[email protected]> (20 Aug 2017) # Masked for removal in 30 days. Use kde-apps/kio-extras[mtp,slp] instead.
