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

[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@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
+

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

[Lars Wendler]

commit:     034679741886eaa628a9afb3a9c89000aef3e34c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  4 07:37:51 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 07:37:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03467974

x11-plugins/enigmail: Revbump to re-enable seamonkey support

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...gmail-2.0.12.ebuild => enigmail-2.0.12-r1.ebuild} |  5 ++++-
 .../enigmail-2.0.12-enable_seamonkey_support.patch   | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/enigmail/enigmail-2.0.12.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
similarity index 94%
rename from x11-plugins/enigmail/enigmail-2.0.12.ebuild
rename to x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
index 917dd0d55c4..9d4f14dc9cc 100644
--- a/x11-plugins/enigmail/enigmail-2.0.12.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+PATCHES=(
+	"${FILESDIR}"/enigmail-no_pEp_auto_download.patch
+	"${FILESDIR}/${PN}-2.0.12-enable_seamonkey_support.patch"
+)
 
 src_compile() {
 	emake ipc public ui package lang stdlib

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
new file mode 100644
index 00000000000..11d9702eb97
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
@@ -0,0 +1,20 @@
+--- 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>

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

[Jory Pratt]

commit:     477f3f13b9a398476d3deacd835d3dd2f41b3540
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 14:46:07 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 14:46:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477f3f13

x11-plugins/enigmail: Fix incorrect newline treat of PGP/MIME

Closes: https://bugs.gentoo.org/698926
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild      | 85 ++++++++++++++++++++++
 .../enigmail/files/enigmail-2.1.2-mimeverify.patch | 44 +++++++++++
 2 files changed, 129 insertions(+)

diff --git a/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild b/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild
new file mode 100644
index 00000000000..596a0852928
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="https://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="
+	( >=app-crypt/gnupg-2.0
+		|| (
+			app-crypt/pinentry[gtk(-)]
+			app-crypt/pinentry[qt5(-)]
+		)
+	)
+	!<mail-client/thunderbird-52.5.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch"
+	"${FILESDIR}/${PN}-2.1.2-mimeverify.patch" )
+
+src_compile() {
+	# Required or parallel make fails
+	emake -C stdlib createlib
+
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}

diff --git a/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch b/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch
new file mode 100644
index 00000000000..8d3830c1458
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch
@@ -0,0 +1,44 @@
+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
+