commit: 68fc4385c792dd15b53c29355943fd94e1ef801f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jul 29 00:19:28 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 29 00:19:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fc4385
mail-client/neomutt: security cleanup Bug: https://bugs.gentoo.org/728302 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Sam James <sam <AT> gentoo.org> mail-client/neomutt/Manifest | 3 - mail-client/neomutt/metadata.xml | 4 - mail-client/neomutt/neomutt-20180716.ebuild | 130 ---------------------------- mail-client/neomutt/neomutt-20200501.ebuild | 128 --------------------------- mail-client/neomutt/neomutt-20200619.ebuild | 128 --------------------------- 5 files changed, 393 deletions(-) diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index 9aaa4419b40..10ccd55623e 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,4 +1 @@ -DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae -DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670 -DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml index 1f7c112a0b2..eca0e6b3489 100644 --- a/mail-client/neomutt/metadata.xml +++ b/mail-client/neomutt/metadata.xml @@ -20,14 +20,10 @@ backend for header caching</flag> <flag name="tokyocabinet">Enable Tokyo Cabinet database backend for header caching</flag> - <flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME - and traditional/inline PGP</flag> <flag name="pgp-classic">Build classic_pgp backend to support PGP/MIME and traditional/inline PGP</flag> <flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP</flag> - <flag name="smime_classic">Build classic_smime backend to support - S/MIME</flag> <flag name="smime-classic">Build classic_smime backend to support S/MIME</flag> </use> diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild deleted file mode 100644 index e29f859a066..00000000000 --- a/mail-client/neomutt/neomutt-20180716.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic - -if [[ ${PV} =~ 99999999$ ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"; - EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"; - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="https://neomutt.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl - lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic - ssl tokyocabinet" - -CDEPEND=" - app-misc/mime-types - berkdb? ( - || ( - sys-libs/db:6.2 - sys-libs/db:5.3 - sys-libs/db:4.8 - ) - <sys-libs/db-6.3:= - ) - gdbm? ( sys-libs/gdbm ) - kyotocabinet? ( dev-db/kyotocabinet ) - lmdb? ( dev-db/lmdb ) - nls? ( virtual/libintl ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - gnutls? ( >=net-libs/gnutls-1.0.17 ) - gpgme? ( >=app-crypt/gpgme-0.9.0 ) - idn? ( net-dns/libidn:= ) - kerberos? ( virtual/krb5 ) - notmuch? ( net-mail/notmuch ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - !slang? ( sys-libs/ncurses:0 ) - slang? ( sys-libs/slang ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) - ) -" -DEPEND="${CDEPEND} - dev-lang/tcl - net-mail/mailbase - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - || ( www-client/lynx www-client/w3m www-client/elinks ) - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-mutt ) -" - -S="${WORKDIR}/${PN}-${P}" - -src_configure() { - local myconf=( - "$(use_enable doc)" - "$(use_enable nls)" - "$(use_enable notmuch)" - - "$(use_enable gpgme)" - "$(use_enable pgp_classic pgp)" - "$(use_enable smime_classic smime)" - - # Database backends. - "$(use_enable berkdb bdb)" - "$(use_enable gdbm)" - "$(use_enable kyotocabinet)" - "$(use_enable qdbm)" - "$(use_enable tokyocabinet)" - - "$(use_enable idn)" - "$(use_enable kerberos gss)" - "$(use_enable lmdb)" - "$(use_enable sasl)" - "--with-ui=$(usex slang slang ncurses)" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "$(use_enable ssl)" - "$(use_enable gnutls)" - ) - - econf CCACHE=none "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - # A man-page is always handy, so fake one – here neomuttrc.5 - # (neomutt.1 already exists) - if use !doc; then - sed -n \ - -e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \ - -e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \ - -e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \ - Makefile > doc/Makefile.fakedoc || die - sed -n \ - -e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \ - -e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \ - doc/Makefile.autosetup >> doc/Makefile.fakedoc || die - emake -f doc/Makefile.fakedoc doc/neomutt.1 - emake -f doc/Makefile.fakedoc doc/neomuttrc.5 - doman doc/neomutt.1 doc/neomuttrc.5 - fi - - dodoc LICENSE* ChangeLog* README* -} - -pkg_postinst() { - if use gpgme && ( use pgp_classic || use smime_classic ); then - ewarn " Note that gpgme (old gpg) includes both pgp and smime" - ewarn " support. You can probably remove pgp_classic (old crypt)" - ewarn " and smime_classic (old smime) from your USE-flags and" - ewarn " only enable gpgme." - fi -} diff --git a/mail-client/neomutt/neomutt-20200501.ebuild b/mail-client/neomutt/neomutt-20200501.ebuild deleted file mode 100644 index 169bb2a3aa6..00000000000 --- a/mail-client/neomutt/neomutt-20200501.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic - -if [[ ${PV} =~ 99999999$ ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"; - EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="https://neomutt.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl - lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic - ssl tokyocabinet" - -CDEPEND=" - app-misc/mime-types - berkdb? ( - || ( - sys-libs/db:6.2 - sys-libs/db:5.3 - sys-libs/db:4.8 - ) - <sys-libs/db-6.3:= - ) - gdbm? ( sys-libs/gdbm ) - kyotocabinet? ( dev-db/kyotocabinet ) - lmdb? ( dev-db/lmdb ) - nls? ( virtual/libintl ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - gnutls? ( >=net-libs/gnutls-1.0.17 ) - gpgme? ( >=app-crypt/gpgme-0.9.0 ) - idn? ( net-dns/libidn:= ) - kerberos? ( virtual/krb5 ) - notmuch? ( net-mail/notmuch ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - !slang? ( sys-libs/ncurses:0 ) - slang? ( sys-libs/slang ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) - ) -" -DEPEND="${CDEPEND} - dev-lang/tcl - net-mail/mailbase - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - || ( www-client/lynx www-client/w3m www-client/elinks ) - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-mutt ) -" - -src_configure() { - local myconf=( - "$(usex doc --full-doc --disable-doc)" - "$(use_enable nls)" - "$(use_enable notmuch)" - - "$(use_enable gpgme)" - "$(use_enable pgp-classic pgp)" - "$(use_enable smime-classic smime)" - - # Database backends. - "$(use_enable berkdb bdb)" - "$(use_enable gdbm)" - "$(use_enable kyotocabinet)" - "$(use_enable qdbm)" - "$(use_enable tokyocabinet)" - - "$(use_enable idn)" - "$(use_enable kerberos gss)" - "$(use_enable lmdb)" - "$(use_enable sasl)" - "--with-ui=$(usex slang slang ncurses)" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "$(use_enable ssl)" - "$(use_enable gnutls)" - ) - - econf CCACHE=none "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - # A man-page is always handy, so fake one – here neomuttrc.5 - # (neomutt.1 already exists) - if use !doc; then - sed -n \ - -e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \ - -e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \ - -e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \ - Makefile > docs/Makefile.fakedoc || die - sed -n \ - -e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \ - -e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \ - docs/Makefile.autosetup >> docs/Makefile.fakedoc || die - emake -f docs/Makefile.fakedoc docs/neomutt.1 - emake -f docs/Makefile.fakedoc docs/neomuttrc.5 - doman docs/neomutt.1 docs/neomuttrc.5 - fi - - dodoc LICENSE* ChangeLog* README* -} - -pkg_postinst() { - if use gpgme && ( use pgp-classic || use smime-classic ); then - ewarn " Note that gpgme (old gpg) includes both pgp and smime" - ewarn " support. You can probably remove pgp-classic (old crypt)" - ewarn " and smime-classic (old smime) from your USE-flags and" - ewarn " only enable gpgme." - fi -} diff --git a/mail-client/neomutt/neomutt-20200619.ebuild b/mail-client/neomutt/neomutt-20200619.ebuild deleted file mode 100644 index 169bb2a3aa6..00000000000 --- a/mail-client/neomutt/neomutt-20200619.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic - -if [[ ${PV} =~ 99999999$ ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"; - EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="https://neomutt.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl - lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic - ssl tokyocabinet" - -CDEPEND=" - app-misc/mime-types - berkdb? ( - || ( - sys-libs/db:6.2 - sys-libs/db:5.3 - sys-libs/db:4.8 - ) - <sys-libs/db-6.3:= - ) - gdbm? ( sys-libs/gdbm ) - kyotocabinet? ( dev-db/kyotocabinet ) - lmdb? ( dev-db/lmdb ) - nls? ( virtual/libintl ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - gnutls? ( >=net-libs/gnutls-1.0.17 ) - gpgme? ( >=app-crypt/gpgme-0.9.0 ) - idn? ( net-dns/libidn:= ) - kerberos? ( virtual/krb5 ) - notmuch? ( net-mail/notmuch ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - !slang? ( sys-libs/ncurses:0 ) - slang? ( sys-libs/slang ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) - ) -" -DEPEND="${CDEPEND} - dev-lang/tcl - net-mail/mailbase - doc? ( - dev-libs/libxml2 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - || ( www-client/lynx www-client/w3m www-client/elinks ) - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-mutt ) -" - -src_configure() { - local myconf=( - "$(usex doc --full-doc --disable-doc)" - "$(use_enable nls)" - "$(use_enable notmuch)" - - "$(use_enable gpgme)" - "$(use_enable pgp-classic pgp)" - "$(use_enable smime-classic smime)" - - # Database backends. - "$(use_enable berkdb bdb)" - "$(use_enable gdbm)" - "$(use_enable kyotocabinet)" - "$(use_enable qdbm)" - "$(use_enable tokyocabinet)" - - "$(use_enable idn)" - "$(use_enable kerberos gss)" - "$(use_enable lmdb)" - "$(use_enable sasl)" - "--with-ui=$(usex slang slang ncurses)" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "$(use_enable ssl)" - "$(use_enable gnutls)" - ) - - econf CCACHE=none "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - # A man-page is always handy, so fake one – here neomuttrc.5 - # (neomutt.1 already exists) - if use !doc; then - sed -n \ - -e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \ - -e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \ - -e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \ - Makefile > docs/Makefile.fakedoc || die - sed -n \ - -e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \ - -e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \ - docs/Makefile.autosetup >> docs/Makefile.fakedoc || die - emake -f docs/Makefile.fakedoc docs/neomutt.1 - emake -f docs/Makefile.fakedoc docs/neomuttrc.5 - doman docs/neomutt.1 docs/neomuttrc.5 - fi - - dodoc LICENSE* ChangeLog* README* -} - -pkg_postinst() { - if use gpgme && ( use pgp-classic || use smime-classic ); then - ewarn " Note that gpgme (old gpg) includes both pgp and smime" - ewarn " support. You can probably remove pgp-classic (old crypt)" - ewarn " and smime-classic (old smime) from your USE-flags and" - ewarn " only enable gpgme." - fi -}
