From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5107F1396D0 for ; Wed, 23 Aug 2017 12:20:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2A4DE0C9A; Wed, 23 Aug 2017 12:20:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 722A7E0C9A for ; Wed, 23 Aug 2017 12:20:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 319093416A9 for ; Wed, 23 Aug 2017 12:20:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD9FD7FC1 for ; Wed, 23 Aug 2017 12:20:01 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1503490759.8fcc0c740d42cfd9ad0d2b0c0865ebda8ce768b2.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/, mail-filter/spamassassin/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/spamassassin/files/spamassassin-3.4.1-bug_627678.patch mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild profiles/package.mask X-VCS-Directories: profiles/ mail-filter/spamassassin/ mail-filter/spamassassin/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 8fcc0c740d42cfd9ad0d2b0c0865ebda8ce768b2 X-VCS-Branch: master Date: Wed, 23 Aug 2017 12:20:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e9ba50c1-e6d3-4e43-9f50-1953eaf903e6 X-Archives-Hash: 802c35a2ae28e0439218980c6ae31900 commit: 8fcc0c740d42cfd9ad0d2b0c0865ebda8ce768b2 Author: Philippe Chaintreuil parallaxshift com> AuthorDate: Wed Aug 23 11:55:16 2017 +0000 Commit: Michael Orlitzky gentoo 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 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 (20 Aug 2017) # Masked for removal in 30 days. Use kde-apps/kio-extras[mtp,slp] instead.