x11-plugins/enigmail: security cleanup
authorThomas Deutschmann <whissi@gentoo.org>
Tue, 11 Sep 2018 11:52:19 +0000 (13:52 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Tue, 11 Sep 2018 11:52:19 +0000 (13:52 +0200)
Package-Manager: Portage-2.3.49, Repoman-2.3.10

x11-plugins/enigmail/Manifest
x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild [deleted file]
x11-plugins/enigmail/enigmail-2.0.7.ebuild [deleted file]
x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch [deleted file]

index 7c3f894f6356559f7029fbbef5e1ce68155128f5..670f7b7853b51bba624e13dcc31cff50eaea9cfc 100644 (file)
@@ -1,3 +1 @@
-DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
-DIST enigmail-2.0.7.tar.gz 2537431 BLAKE2B 44088c12afaf285a8a1d735e02b54998af14b9990f1ab75b9f20a63c3b6fcd5b115bad18601876bd00d6910fa6da5d37e41c4b9a34102f5c1f4157bc7929d3bd SHA512 37572dbc2d5df549c3e1d5bbb8a78ce41af66072eabf4d340d98656e89be6fa1bd68fc2591827ec13cb0e32333f2e54f16b08f28dca5d7b576f9c16701f6f960
 DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
diff --git a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
deleted file mode 100644 (file)
index 6b528c6..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://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="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"
-       fi
-       PATCHES=( "${FILESDIR}"/${P}-fix-missing-missingMdcError.patch )
-       S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-               ( >=app-crypt/gnupg-2.0
-                       || (
-                               app-crypt/pinentry[gtk(-)]
-                               app-crypt/pinentry[qt4(-)]
-                               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
-       "
-
-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/enigmail-2.0.7.ebuild b/x11-plugins/enigmail/enigmail-2.0.7.ebuild
deleted file mode 100644 (file)
index 9e8d0cb..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://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="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"
-       fi
-       S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-               ( >=app-crypt/gnupg-2.0
-                       || (
-                               app-crypt/pinentry[gtk(-)]
-                               app-crypt/pinentry[qt4(-)]
-                               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
-       "
-
-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-2.0.5-fix-missing-missingMdcError.patch b/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
deleted file mode 100644 (file)
index 8b7a1fb..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-