* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/
@ 2018-09-11 11:55 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2018-09-11 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 4fe3a103d10d596c5cf3abefb1c826667f2d1b06
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 11:52:19 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 11:52:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe3a103
x11-plugins/enigmail: security cleanup
Package-Manager: Portage-2.3.49, Repoman-2.3.10
x11-plugins/enigmail/Manifest | 2 -
x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild | 84 ----------------------
x11-plugins/enigmail/enigmail-2.0.7.ebuild | 83 ---------------------
...nigmail-2.0.5-fix-missing-missingMdcError.patch | 30 --------
4 files changed, 199 deletions(-)
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 7c3f894f635..670f7b7853b 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -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
index 6b528c6bff4..00000000000
--- a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
+++ /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
index 9e8d0cbb395..00000000000
--- a/x11-plugins/enigmail/enigmail-2.0.7.ebuild
+++ /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
index 8b7a1fb54de..00000000000
--- a/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
+++ /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
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/
@ 2018-11-06 20:52 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-11-06 20:52 UTC (permalink / raw
To: gentoo-commits
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 <dkg@fifthhorseman.net>
+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);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/
@ 2020-03-25 16:41 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-03-25 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 3fe9da9fdba4143d89df7f86898af4e12fd779c2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 16:40:49 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 16:41:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe9da9f
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 <AT> gentoo.org>
x11-plugins/enigmail/Manifest | 3 -
x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild | 84 ---------------------
x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild | 83 ---------------------
x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild | 85 ----------------------
x11-plugins/enigmail/enigmail-2.1.2.ebuild | 84 ---------------------
.../enigmail-2.0.12-enable_seamonkey_support.patch | 20 -----
.../enigmail/files/enigmail-2.1.2-mimeverify.patch | 44 -----------
7 files changed, 403 deletions(-)
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index f443290159d..56484559736 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,4 +1 @@
-DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
-DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
-DIST enigmail-2.1.2.tar.gz 2819073 BLAKE2B 335c7569e2c46dde645c8992cd7017dc57a0174e109ddada2719cb60de010c8ca3691c1d31e8435986b459936bd1602153e462fb5f93d7ffd1244ea867d8d3bc SHA512 c76dcdb0561ee6e94ab19c2ed8cddac71297ffc9ad14ac3d37cd8966cc4111cbc74d1b01ccaa044acef699de27a2cc7ba1ade7a31db8ab930095722ffc62be93
DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
deleted file mode 100644
index 231c774dd69..00000000000
--- a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.0.12-enable_seamonkey_support.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/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
deleted file mode 100644
index 0840602005e..00000000000
--- a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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}/${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/enigmail-2.1.2-r1.ebuild b/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild
deleted file mode 100644
index 596a0852928..00000000000
--- a/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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/enigmail-2.1.2.ebuild b/x11-plugins/enigmail/enigmail-2.1.2.ebuild
deleted file mode 100644
index 934957dbee7..00000000000
--- a/x11-plugins/enigmail/enigmail-2.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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 )
-
-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.0.12-enable_seamonkey_support.patch b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
deleted file mode 100644
index 11d9702eb97..00000000000
--- 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 8d3830c1458..00000000000
--- 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
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/
@ 2020-03-25 18:18 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-03-25 18:18 UTC (permalink / raw
To: gentoo-commits
commit: d1ac19fd9458d60493f13daf7f58ff57856dbb2f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 18:17:17 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 18:18:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ac19fd
Partially revert "x11-plugins/enigmail: security cleanup (bug #706134)"
www-client/seamonkey only supports <=x11-plugins/enigmail-2.1.0.
Bug: https://bugs.gentoo.org/706134
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
x11-plugins/enigmail/Manifest | 1 +
x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild | 84 ++++++++++++++++++++++
.../enigmail-2.0.12-enable_seamonkey_support.patch | 20 ++++++
3 files changed, 105 insertions(+)
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 56484559736..02a6fd22192 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1 +1,2 @@
+DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
new file mode 100644
index 00000000000..be2ff9a0c6a
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 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.0.12-enable_seamonkey_support.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-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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/
@ 2022-07-16 6:19 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2022-07-16 6:19 UTC (permalink / raw
To: gentoo-commits
commit: 07dbc61b41aa6fdde0953db9e5fa1411d110ae40
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:47:12 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 05:38:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dbc61b
x11-plugins/enigmail: remove 2.0.12-r1
Closes: https://bugs.gentoo.org/758344
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-plugins/enigmail/Manifest | 1 -
x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild | 84 ----------------------
.../enigmail-2.0.12-enable_seamonkey_support.patch | 20 ------
3 files changed, 105 deletions(-)
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index b9b811817e9a..bcd0c9596dd3 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,2 +1 @@
-DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
deleted file mode 100644
index be2ff9a0c6a1..000000000000
--- a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 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.0.12-enable_seamonkey_support.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-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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/
@ 2023-10-21 12:04 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2023-10-21 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 9b9ecd3a1659ab916315d9aa46b7811c646f0e16
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 12:01:35 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 12:03:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9ecd3a
x11-plugins/enigmail: treeclean
Bug: https://bugs.gentoo.org/914486
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-plugins/enigmail/Manifest | 1 -
x11-plugins/enigmail/enigmail-2.2.4.ebuild | 78 ----------------------
.../files/enigmail-no_pEp_auto_download.patch | 33 ---------
x11-plugins/enigmail/metadata.xml | 8 ---
4 files changed, 120 deletions(-)
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
deleted file mode 100644
index bcd0c9596dd3..000000000000
--- a/x11-plugins/enigmail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d
diff --git a/x11-plugins/enigmail/enigmail-2.2.4.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
deleted file mode 100644
index c9283c4c4b69..000000000000
--- a/x11-plugins/enigmail/enigmail-2.2.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-
-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-78
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-arch/zip
- dev-lang/perl
- "
-
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
-
-src_prepare() {
- default
-
- export MAKEOPTS=-j1
-}
-
-src_install() {
- local build_dir=build-tb
- local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
- [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
- mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
- # thunderbird
- insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
- doins ${build_dir}/"${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 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
deleted file mode 100644
index 086e00e649ae..000000000000
--- a/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-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);
diff --git a/x11-plugins/enigmail/metadata.xml b/x11-plugins/enigmail/metadata.xml
deleted file mode 100644
index aef898a0bf82..000000000000
--- a/x11-plugins/enigmail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>mozilla@gentoo.org</email>
- <name>Gentoo Mozilla Team</name>
-</maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-21 12:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-16 6:19 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/, x11-plugins/enigmail/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-10-21 12:04 Joonas Niilola
2020-03-25 18:18 Thomas Deutschmann
2020-03-25 16:41 Thomas Deutschmann
2018-11-06 20:52 Lars Wendler
2018-09-11 11:55 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox