diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
| commit | d4bd6695641f6d2ec7ff8681913d304e995902f5 (patch) | |
| tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /x11-plugins/enigmail | |
| parent | 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (diff) | |
gentoo resync : 29.05.2018
Diffstat (limited to 'x11-plugins/enigmail')
| -rw-r--r-- | x11-plugins/enigmail/Manifest | 3 | ||||
| -rw-r--r-- | x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild (renamed from x11-plugins/enigmail/enigmail-2.0.5.ebuild) | 3 | ||||
| -rw-r--r-- | x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch | 30 |
3 files changed, 34 insertions, 2 deletions
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest index 578dd08d7403..923090d2f48f 100644 --- a/x11-plugins/enigmail/Manifest +++ b/x11-plugins/enigmail/Manifest @@ -1,8 +1,9 @@ +AUX enigmail-2.0.5-fix-missing-missingMdcError.patch 1059 BLAKE2B 70b247f23be20df0dc9b5edb77eb48f56a2538f53af50f29b11ef0ca5c0b196e80b7adb3f1687d6ee3a1246935cc0d299f4c2f74f5a6fab89be5620ade66da1d SHA512 fa7ec8a1390636af1380a9a25f4b8b8cf23c13f82fe5bd1ad555d4a88b5cbef28d89e8dc706d738a5ec54d1d4fc439f630aa660e91509efb7709e6b2ce3013ff DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb DIST enigmail-2.0.4.tar.gz 2533719 BLAKE2B 9c3a38233df2c05e4bbbdfa2fd762b6362cc0bbc143b7a417cdabee44b3873bd73747a7b8d50317987f5d1750acf7badfae631cc2827718ed5702c5df2d10709 SHA512 eadcd6bfe42c43d8dd569a8085d82b7acf94f77e5fc2c7632e4148b9cc21389552de687a81a3e88e9b2639adad677c85d6db9b14a39f994f79c0524500de0b3b DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba EBUILD enigmail-2.0.4.ebuild 2174 BLAKE2B 8a2cc0d181c27dc6dfdfaf5e0d51983fe290b8b4fdaf7e3dcaba6401a1c874ff20d363a2b13ac14fac225c3d9aeb904e529de5945112a158ac6b32db37690e6c SHA512 be8c9b87f459bf006a2455d492190f5a4ad7a38ef3369c8408cb27fa65cfe36208175df1752cd5715c6f4592cafeec80b8f1e9535158cac771d74823d0d31afa -EBUILD enigmail-2.0.5.ebuild 2175 BLAKE2B dfa49006af6629de4eebd328e552bf2b3f2fd31a1f849d8ad03a15826f5e6a3a117febf39d51dc58dc8f39c7efdef9d3be3f9289bb54e4238e4db19199762937 SHA512 61c86e0891c3dc92f09891c82ab515af584029b1c77592dee0d04e8297484b5a516eacc8a75d943ad3e60b772537b50c4cafaa5f621a3a09c376e8a1c22a4e5f +EBUILD enigmail-2.0.5-r1.ebuild 2240 BLAKE2B 7a9cba65cf9cc571d6052e0bcdb474915614f2bfbc0a24c85df56979290fe7d51d96d9baa7d3faead6d20b21877021a93eac0b05971f02b97ee468632f6541b6 SHA512 72e9eccc842581b7b3c6827f57059919624535a804b265704f37b074dfcd853049a0384b91fa94f9fe3a1494defc8fabc3d64ef357e9c44ebe829e42d43bb40a EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b diff --git a/x11-plugins/enigmail/enigmail-2.0.5.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild index 8d6d09bb3f6a..60cce5b8c71e 100644 --- a/x11-plugins/enigmail/enigmail-2.0.5.ebuild +++ b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild @@ -21,8 +21,9 @@ else SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz" 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" + 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 000000000000..8b7a1fb54de5 --- /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@fifthhorseman.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 + |