commit: fdbc92c73affef75a85f0099fd133ad76672ee4c Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Nov 6 20:52:16 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Nov 6 20:52:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbc92c7
x11-plugins/enigmail: Revbump to not auto-download pEp binaries. Bug: https://bugs.gentoo.org/669174 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild | 86 ++++++++++++++++++++++ .../files/enigmail-no_pEp_auto_download.patch | 33 +++++++++ 2 files changed, 119 insertions(+) diff --git a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild new file mode 100644 index 00000000000..e716fbf703a --- /dev/null +++ b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2018 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 ~x86-fbsd ~amd64-linux ~x86-linux" + fi + S="${WORKDIR}/${PN}" +fi + +RDEPEND="|| ( + ( >=app-crypt/gnupg-2.0 + || ( + app-crypt/pinentry[gtk(-)] + app-crypt/pinentry[qt5(-)] + ) + ) + =app-crypt/gnupg-1.4* + ) + !<mail-client/thunderbird-52.5.0 + !<www-client/seamonkey-2.49.5.0_p0 +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + app-arch/zip + dev-lang/perl + " + +PATCHES=( + "${FILESDIR}/${PN}-no_pEp_auto_download.patch" +) + +src_compile() { + emake ipc public ui package lang stdlib + emake xpi + +} + +src_install() { + local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf) + [[ -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-no_pEp_auto_download.patch b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch new file mode 100644 index 00000000000..086e00e649a --- /dev/null +++ b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch @@ -0,0 +1,33 @@ +From: Daniel Kahn Gillmor <[email protected]> +Date: Wed, 7 Mar 2018 11:31:50 +0100 +Subject: Avoid auto-download of pEpEngine (Closes: #891882) + +When pEpEngine is available in debian, enigmail should Depend: or +Recommend: it. In the meantime, we should disable auto-download of +the pEp engine and prefer enigmail. +--- + package/prefs/defaultPrefs.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js +index a1f031e..10f2c25 100755 +--- a/package/prefs/defaultPrefs.js ++++ b/package/prefs/defaultPrefs.js +@@ -14,7 +14,7 @@ + // 0: force using Enigmail + // 1: automatic mode (use pEp if Enigmail and S/MIME are not configured for any identity) + // 2: force using pEp +-pref("extensions.enigmail.juniorMode", 1); ++pref("extensions.enigmail.juniorMode", 0); + + // the last configured Enigmail version + pref("extensions.enigmail.configuredVersion", ""); +@@ -204,7 +204,7 @@ pref("extensions.enigmail.warnDownloadContactKeys", true); + pref("extensions.enigmail.wrapHtmlBeforeSend", true); + + // automatically download pepmda if it is available (without askin user) +-pref("extensions.enigmail.pEpAutoDownload", true); ++pref("extensions.enigmail.pEpAutoDownload", false); + + // holds the last result of the last check for pEp updates + pref("extensions.enigmail.pEpLastUpdate", 0);
