[gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/files/, x11-plugins/enigmail/

[Thomas Deutschmann]

commit:     dd248156c41449aa28145b16db3c8a9255ff47d7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 12:54:06 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May 26 12:54:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd248156

x11-plugins/enigmail: Use correct mdcError string

Closes: https://bugs.gentoo.org/656292
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --force

 ...gmail-2.0.5.ebuild => enigmail-2.0.5-r1.ebuild} |  1 +
 ...nigmail-2.0.5-fix-missing-missingMdcError.patch | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/x11-plugins/enigmail/enigmail-2.0.5.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
similarity index 97%
rename from x11-plugins/enigmail/enigmail-2.0.5.ebuild
rename to x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
index 8d6d09bb3f6..37315308808 100644
--- a/x11-plugins/enigmail/enigmail-2.0.5.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
@@ -23,6 +23,7 @@ else
 		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
 		KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	fi
+	PATCHES=( "${FILESDIR}"/${P}-fix-missing-missingMdcError.patch )
 	S="${WORKDIR}/${PN}"
 fi
 

diff --git a/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch b/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
new file mode 100644
index 00000000000..8b7a1fb54de
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
@@ -0,0 +1,30 @@
+https://gitlab.com/enigmail/enigmail/commit/f196a31a9e56b8a0bd7b4ebe9af08f6e78d78e2d
+
+From 94fb482e3463e756d76f9309cdc2fb7560822eb0 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@×××××××××××××.net>
+Date: Mon, 21 May 2018 15:55:03 -0400
+Subject: [PATCH] Use correct mdcError string
+
+Without this change, the build process fails with:
+
+MISSING PROPERTY: missingMdcError
+---
+ package/errorHandling.jsm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/errorHandling.jsm b/package/errorHandling.jsm
+index 8173fa72..bc8bdcb3 100644
+--- a/package/errorHandling.jsm
++++ b/package/errorHandling.jsm
+@@ -309,7 +309,7 @@ function decryptionInfo(c) {
+       c.statusFlags |= EnigmailConstants.DECRYPTION_FAILED; // be sure to fail
+       c.flag = EnigmailConstants.MISSING_MDC;
+       EnigmailLog.DEBUG("errorHandling.jsm: missing MDC!\n");
+-      c.retStatusObj.statusMsg += EnigmailLocale.getString("missingMdcError") + "\n";
++      c.retStatusObj.statusMsg += EnigmailLocale.getString("mdcError") + "\n";
+     }
+   }
+ }
+-- 
+2.16.3
+