summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-03-25 17:40:49 +0100
committerThomas Deutschmann <whissi@gentoo.org>2020-03-25 17:41:27 +0100
commit3fe9da9fdba4143d89df7f86898af4e12fd779c2 (patch)
treea707b29621a58f9aeb5265d878e46e9a81f697bb /x11-plugins/enigmail/files
parentdev-go/get-ego-vendor: update description (diff)
downloadgentoo-3fe9da9fdba4143d89df7f86898af4e12fd779c2.tar.gz
gentoo-3fe9da9fdba4143d89df7f86898af4e12fd779c2.tar.bz2
gentoo-3fe9da9fdba4143d89df7f86898af4e12fd779c2.zip
x11-plugins/enigmail: security cleanup (bug #706134)
Bug: https://bugs.gentoo.org/706134 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'x11-plugins/enigmail/files')
-rw-r--r--x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch20
-rw-r--r--x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch44
2 files changed, 0 insertions, 64 deletions
diff --git a/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
deleted file mode 100644
index 11d9702eb970..000000000000
--- a/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -19,14 +19,14 @@
- <em:maxVersion>60.*</em:maxVersion>
- </Description>
- </em:targetApplication>
-- <!--em:targetApplication>
-- < ! - - Seamonkey is no longer supported - - >
-+ <em:targetApplication>
-+ <!-- Seamonkey -->
- <Description>
- <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
- <em:minVersion>2.49</em:minVersion>
- <em:maxVersion>2.57</em:maxVersion>
- </Description>
-- </em:targetApplication -->
-+ </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Enigmail</em:name>
diff --git a/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch b/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch
deleted file mode 100644
index 8d3830c14586..000000000000
--- a/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 745d8a0e6929e61a66b0e6c1474175d4b0a84cd6 Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <diabonas@gmx.de>
-Date: Sun, 29 Sep 2019 22:07:52 +0200
-Subject: [PATCH] mimeVerify: fix incorrect newline treatment in PGP/MIME
- messages
-
-RFC 3156 specifies:
-
-Upon receipt of a signed message, an application MUST:
-
-(1) Convert line endings to the canonical <CR><LF> sequence before
- the signature can be verified. This is necessary since the
- local MTA may have converted to a local end of line convention.
-
-The code in this commit was originally added in
-ab1b9a2d1c023c5bdf9c058681b93da99ee95465 to fix SourceForge bugs #209
-and #4, but was later accidentally removed during refactoring. This
-commit restores the previous state so that signed messages created by
-MUAs such as alot or NeoMutt can be verified successfully.
-
-Fixes: c36bef32a70ee9f2eac1b839cb8644e2fddb32ca
-Closes: #1020 (SourceForge)
----
- package/mimeVerify.jsm | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/package/mimeVerify.jsm b/package/mimeVerify.jsm
-index 7cc1b228..a6e01d86 100644
---- a/package/mimeVerify.jsm
-+++ b/package/mimeVerify.jsm
-@@ -497,6 +497,10 @@ MimeVerify.prototype = {
- mimeSignatureFile: sigFileName
- };
- const cApi = EnigmailCryptoAPI();
-+
-+ // ensure all lines end with CRLF as specified in RFC 3156, section 5
-+ this.signedData = this.signedData.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n");
-+
- this.returnStatus = cApi.sync(cApi.verifyMime(this.signedData, options));
- this.exitCode = this.returnStatus.exitCode;
-
---
-2.22.0
-