diff options
Diffstat (limited to 'x11-plugins/enigmail')
| -rw-r--r-- | x11-plugins/enigmail/Manifest | 4 | ||||
| -rw-r--r-- | x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild | 85 | ||||
| -rw-r--r-- | x11-plugins/enigmail/enigmail-2.1.2.ebuild | 2 | ||||
| -rw-r--r-- | x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch | 44 |
4 files changed, 133 insertions, 2 deletions
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest index 4fcb74d01e91..0d3936d549c9 100644 --- a/x11-plugins/enigmail/Manifest +++ b/x11-plugins/enigmail/Manifest @@ -1,10 +1,12 @@ AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851 +AUX enigmail-2.1.2-mimeverify.patch 1581 BLAKE2B 843262a1bfadc1d0eaf6218bb121e4e93c5f21cb7874986951967f6ac7a5181ed48c2757d9e631217999d7adbc4d52002cd3d92334df21ba179dfa6f42b70a5d SHA512 1d09ab0807a776b6f5543359905a6801140a78722e71f70be894f30cc525224a4b99785def6b5b4634a9790c6bde12772006d09aee792ccdf6fe1f90a9cfcee9 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2 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 EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 0150813e0d922005cd14090d8e8d606f97ad221d3edf76735876a035ff83530d4d48ee83231ab5ed59af47eabb116fc2831ca71dbb65e672d37cab3131087b64 SHA512 2161b176ab8969dfdfe0855ecf9c867e0f166eead45babe994c150e3654ae2714763e93729d06e5260dce66f87a2c677d98df44c9e1a70026040c520c9aefc40 EBUILD enigmail-2.0.8-r1.ebuild 2119 BLAKE2B 216169136a95855c09d57aec54cac5b2a68b43690b51465928b60c4908f5e1fa341b0ddc301df6278392d3dfb9a8945923fb602c66eb3871080bcb2d439c42c8 SHA512 a265935f53db8e66e258f8e668f13cea844048f24c21b5992ceb7d3d38be5da31df657e2e9d6fe992b53e3217fec0bb71da72e1f9ebb1017f8cf5dc714ab8546 -EBUILD enigmail-2.1.2.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6 +EBUILD enigmail-2.1.2-r1.ebuild 2232 BLAKE2B 525442d4031db46716f70b2085eecd108a3b296b673dfa88822f891e2252c9ab674062cd9a6c16ae24616ea788c8473da4f7ac6c70cd90c69fb51d25385e6184 SHA512 4dc947b28e5273056a229083dab6bedb08b4215bd2cbce3c3441e0fdd300dd88174d7649f481e662e0e4c132c6abe7c090f9a9340ab8e704facf35cf2b4ffd73 +EBUILD enigmail-2.1.2.ebuild 2185 BLAKE2B 303bed8c906e7b885138458752364ee98ef3e23e0027e6a728099aa8ab5328f1605629d7346c624c18cd767f3441b03d68cc3992ac74d7aae00fc63872368108 SHA512 d7bc008556591ff27645bed196c9a0eba354c01bf79d3f8b7a714ba4aa707192edacdea6cbdbcd4c40716fc9c203bb6daf7b2362a8d30d60946c2e2a0ff39738 EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b 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 000000000000..596a08529286 --- /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/enigmail-2.1.2.ebuild b/x11-plugins/enigmail/enigmail-2.1.2.ebuild index 7369918278b0..873f9b8581c0 100644 --- a/x11-plugins/enigmail/enigmail-2.1.2.ebuild +++ b/x11-plugins/enigmail/enigmail-2.1.2.ebuild @@ -21,7 +21,7 @@ else 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" + KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux" fi S="${WORKDIR}/${PN}" 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 000000000000..8d3830c14586 --- /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 + |