1 |
commit: 4fe3a103d10d596c5cf3abefb1c826667f2d1b06 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 11 11:52:19 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 11 11:52:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe3a103 |
7 |
|
8 |
x11-plugins/enigmail: security cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
x11-plugins/enigmail/Manifest | 2 - |
13 |
x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild | 84 ---------------------- |
14 |
x11-plugins/enigmail/enigmail-2.0.7.ebuild | 83 --------------------- |
15 |
...nigmail-2.0.5-fix-missing-missingMdcError.patch | 30 -------- |
16 |
4 files changed, 199 deletions(-) |
17 |
|
18 |
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest |
19 |
index 7c3f894f635..670f7b7853b 100644 |
20 |
--- a/x11-plugins/enigmail/Manifest |
21 |
+++ b/x11-plugins/enigmail/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b |
24 |
-DIST enigmail-2.0.7.tar.gz 2537431 BLAKE2B 44088c12afaf285a8a1d735e02b54998af14b9990f1ab75b9f20a63c3b6fcd5b115bad18601876bd00d6910fa6da5d37e41c4b9a34102f5c1f4157bc7929d3bd SHA512 37572dbc2d5df549c3e1d5bbb8a78ce41af66072eabf4d340d98656e89be6fa1bd68fc2591827ec13cb0e32333f2e54f16b08f28dca5d7b576f9c16701f6f960 |
25 |
DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305 |
26 |
|
27 |
diff --git a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 6b528c6bff4..00000000000 |
30 |
--- a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,84 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-PYTHON_COMPAT=( python2_7 ) |
38 |
- |
39 |
-inherit python-any-r1 |
40 |
- |
41 |
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients" |
42 |
-HOMEPAGE="http://www.enigmail.net/" |
43 |
- |
44 |
-SLOT="0" |
45 |
-LICENSE="MPL-2.0 GPL-3" |
46 |
-IUSE="" |
47 |
-if [[ ${PV} == *9999 ]]; then |
48 |
- inherit git-r3 |
49 |
- EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source" |
50 |
- S="${WORKDIR}/${P}" |
51 |
-else |
52 |
- if [[ ${PV} = *_beta* ]] ; then |
53 |
- SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz" |
54 |
- else |
55 |
- SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" |
56 |
- KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
57 |
- fi |
58 |
- PATCHES=( "${FILESDIR}"/${P}-fix-missing-missingMdcError.patch ) |
59 |
- S="${WORKDIR}/${PN}" |
60 |
-fi |
61 |
- |
62 |
-RDEPEND="|| ( |
63 |
- ( >=app-crypt/gnupg-2.0 |
64 |
- || ( |
65 |
- app-crypt/pinentry[gtk(-)] |
66 |
- app-crypt/pinentry[qt4(-)] |
67 |
- app-crypt/pinentry[qt5(-)] |
68 |
- ) |
69 |
- ) |
70 |
- =app-crypt/gnupg-1.4* |
71 |
- ) |
72 |
- !<mail-client/thunderbird-52.5.0 |
73 |
- !<www-client/seamonkey-2.49.5.0_p0 |
74 |
-" |
75 |
-DEPEND="${RDEPEND} |
76 |
- ${PYTHON_DEPS} |
77 |
- app-arch/zip |
78 |
- dev-lang/perl |
79 |
- " |
80 |
- |
81 |
-src_compile() { |
82 |
- emake ipc public ui package lang stdlib |
83 |
- emake xpi |
84 |
- |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf) |
89 |
- [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" |
90 |
- |
91 |
- mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |
92 |
- |
93 |
- # thunderbird |
94 |
- insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}" |
95 |
- doins build/"${emid}.xpi" |
96 |
- |
97 |
- # seamonkey |
98 |
- insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}" |
99 |
- doins build/"${emid}.xpi" |
100 |
-} |
101 |
- |
102 |
-pkg_postinst() { |
103 |
- local peimpl=$(eselect --brief --colour=no pinentry show) |
104 |
- case "${peimpl}" in |
105 |
- *gtk*|*qt*) ;; |
106 |
- *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." |
107 |
- ewarn "You may be prompted for your password in an inaccessible shell!!" |
108 |
- ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" |
109 |
- ;; |
110 |
- esac |
111 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
112 |
- elog |
113 |
- elog "Please restart thunderbird and/or seamonkey in order for them to use" |
114 |
- elog "the newly installed version of enigmail." |
115 |
- fi |
116 |
-} |
117 |
|
118 |
diff --git a/x11-plugins/enigmail/enigmail-2.0.7.ebuild b/x11-plugins/enigmail/enigmail-2.0.7.ebuild |
119 |
deleted file mode 100644 |
120 |
index 9e8d0cbb395..00000000000 |
121 |
--- a/x11-plugins/enigmail/enigmail-2.0.7.ebuild |
122 |
+++ /dev/null |
123 |
@@ -1,83 +0,0 @@ |
124 |
-# Copyright 1999-2018 Gentoo Foundation |
125 |
-# Distributed under the terms of the GNU General Public License v2 |
126 |
- |
127 |
-EAPI=6 |
128 |
-PYTHON_COMPAT=( python2_7 ) |
129 |
- |
130 |
-inherit python-any-r1 |
131 |
- |
132 |
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients" |
133 |
-HOMEPAGE="http://www.enigmail.net/" |
134 |
- |
135 |
-SLOT="0" |
136 |
-LICENSE="MPL-2.0 GPL-3" |
137 |
-IUSE="" |
138 |
-if [[ ${PV} == *9999 ]]; then |
139 |
- inherit git-r3 |
140 |
- EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source" |
141 |
- S="${WORKDIR}/${P}" |
142 |
-else |
143 |
- if [[ ${PV} = *_beta* ]] ; then |
144 |
- SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz" |
145 |
- else |
146 |
- SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz" |
147 |
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
148 |
- fi |
149 |
- S="${WORKDIR}/${PN}" |
150 |
-fi |
151 |
- |
152 |
-RDEPEND="|| ( |
153 |
- ( >=app-crypt/gnupg-2.0 |
154 |
- || ( |
155 |
- app-crypt/pinentry[gtk(-)] |
156 |
- app-crypt/pinentry[qt4(-)] |
157 |
- app-crypt/pinentry[qt5(-)] |
158 |
- ) |
159 |
- ) |
160 |
- =app-crypt/gnupg-1.4* |
161 |
- ) |
162 |
- !<mail-client/thunderbird-52.5.0 |
163 |
- !<www-client/seamonkey-2.49.5.0_p0 |
164 |
-" |
165 |
-DEPEND="${RDEPEND} |
166 |
- ${PYTHON_DEPS} |
167 |
- app-arch/zip |
168 |
- dev-lang/perl |
169 |
- " |
170 |
- |
171 |
-src_compile() { |
172 |
- emake ipc public ui package lang stdlib |
173 |
- emake xpi |
174 |
- |
175 |
-} |
176 |
- |
177 |
-src_install() { |
178 |
- local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf) |
179 |
- [[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" |
180 |
- |
181 |
- mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |
182 |
- |
183 |
- # thunderbird |
184 |
- insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}" |
185 |
- doins build/"${emid}.xpi" |
186 |
- |
187 |
- # seamonkey |
188 |
- insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}" |
189 |
- doins build/"${emid}.xpi" |
190 |
-} |
191 |
- |
192 |
-pkg_postinst() { |
193 |
- local peimpl=$(eselect --brief --colour=no pinentry show) |
194 |
- case "${peimpl}" in |
195 |
- *gtk*|*qt*) ;; |
196 |
- *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." |
197 |
- ewarn "You may be prompted for your password in an inaccessible shell!!" |
198 |
- ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" |
199 |
- ;; |
200 |
- esac |
201 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
202 |
- elog |
203 |
- elog "Please restart thunderbird and/or seamonkey in order for them to use" |
204 |
- elog "the newly installed version of enigmail." |
205 |
- fi |
206 |
-} |
207 |
|
208 |
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 |
209 |
deleted file mode 100644 |
210 |
index 8b7a1fb54de..00000000000 |
211 |
--- a/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch |
212 |
+++ /dev/null |
213 |
@@ -1,30 +0,0 @@ |
214 |
-https://gitlab.com/enigmail/enigmail/commit/f196a31a9e56b8a0bd7b4ebe9af08f6e78d78e2d |
215 |
- |
216 |
-From 94fb482e3463e756d76f9309cdc2fb7560822eb0 Mon Sep 17 00:00:00 2001 |
217 |
-From: Daniel Kahn Gillmor <dkg@×××××××××××××.net> |
218 |
-Date: Mon, 21 May 2018 15:55:03 -0400 |
219 |
-Subject: [PATCH] Use correct mdcError string |
220 |
- |
221 |
-Without this change, the build process fails with: |
222 |
- |
223 |
-MISSING PROPERTY: missingMdcError |
224 |
---- |
225 |
- package/errorHandling.jsm | 2 +- |
226 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
227 |
- |
228 |
-diff --git a/package/errorHandling.jsm b/package/errorHandling.jsm |
229 |
-index 8173fa72..bc8bdcb3 100644 |
230 |
---- a/package/errorHandling.jsm |
231 |
-+++ b/package/errorHandling.jsm |
232 |
-@@ -309,7 +309,7 @@ function decryptionInfo(c) { |
233 |
- c.statusFlags |= EnigmailConstants.DECRYPTION_FAILED; // be sure to fail |
234 |
- c.flag = EnigmailConstants.MISSING_MDC; |
235 |
- EnigmailLog.DEBUG("errorHandling.jsm: missing MDC!\n"); |
236 |
-- c.retStatusObj.statusMsg += EnigmailLocale.getString("missingMdcError") + "\n"; |
237 |
-+ c.retStatusObj.statusMsg += EnigmailLocale.getString("mdcError") + "\n"; |
238 |
- } |
239 |
- } |
240 |
- } |
241 |
--- |
242 |
-2.16.3 |
243 |
- |