From 3bc8a820a86e1c59fe12fb862fefc971d2e2fcbe Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 31 May 2026 13:07:30 +0200 Subject: [PATCH] mail-client/mutt: cleanup vulnerable Signed-off-by: Fabian Groffen --- mail-client/mutt/Manifest | 4 - mail-client/mutt/mutt-2.2.16.ebuild | 269 ---------------------------- mail-client/mutt/mutt-2.3.0.ebuild | 269 ---------------------------- 3 files changed, 542 deletions(-) delete mode 100644 mail-client/mutt/mutt-2.2.16.ebuild delete mode 100644 mail-client/mutt/mutt-2.3.0.ebuild diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 5c2380c5951d9..7aea55bb94717 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,6 +1,2 @@ -DIST mutt-2.2.16.tar.gz 5557080 BLAKE2B 9709265fb2d9653606dda7b41dd99e2be18cd1df943de583e486816ecffc8c0d596452f91b72978f073599f2b5f4ad3eb24a1dc880cbd308773674479e71d6aa SHA512 5048aa9af6d928be59fe42b0bdbf22fc46c1dd47582cc7036782bff5756af2410ba80f2398c1edbf7be59a96eaa6736c8b8eff198f0dfc8841fb744093a39f80 -DIST mutt-2.3.0.tar.gz 5562198 BLAKE2B be11f4da015dbac0e778c402f6d407398c5f3b0af392d1704c984fd4af9959ee0eda9478c6d6bba60fb0ccf4045e0644949ade5729efb64c172e6c6b8af8fcc8 SHA512 8020ccc1c45e407c07c21a4b0df0cb68355f1153356e7b070dd9e967b4e7e47c705e0d3d2fe63168f179d985d324b737cc92f8f0680f7df9e4c0a1efbd8f4930 DIST mutt-2.3.2.tar.gz 5570204 BLAKE2B 2f256d98e81be88f60543411dd6ebb9f3c640b73503de097acffc5bbcf39c63221dc9c1357288a48af5e9aa1f69b9068698f376f7884d5bd974d717206086376 SHA512 78d7bcce1466bc7e188c579c00df0f308ea73b3f574b6fdecd399dc5f361ced971a6cecb09877b689a15aac8d02271b13d1f61e0d3197d79b6a348e6bf04f3ea -DIST mutt-gentoo-2.2.16-patches-r0.tar.xz 22360 BLAKE2B abc6b11b34d8da31a386852d344c8d7e327e1957fdd43a5392ca25f946ed47fc96f08dcceaff6bf5dc2ffbbbe982a7eb359740ee9d2a7cc09e108c8d165cf80d SHA512 79f4bcd0aaaef710129416d2da81f251c1bca2b207d4ab5a8057d01ef45f5ce59a6eeaff249580f08961fb12f2f0a0a198492928a0b89620731560f555c7a67d -DIST mutt-gentoo-2.3.0-patches-r0.tar.xz 22436 BLAKE2B 57dee0a163d7ad77ceb377a4572e29a2b68e66816dc5404cd894f588668fb8169ae41de037405bfb2c022879329abdfb2162c8ca511e5fb1b8c861803b523f94 SHA512 964cb9c8ee27db330251d600489c84e0fcf9b6191c5546a418f5bdbe425c0a5c6aef9137714a3a3bee679be055c5363b8351d3e0c4d2613691fe9fa449c826d3 DIST mutt-gentoo-2.3.2-patches-r0.tar.xz 22360 BLAKE2B da82417e3e229abdd916bb7797bedb7e9f541530507a954a1e344e7174d3b570e5ae6232ad79d5f852621e775d6fce6c2364a954a9dfec5129f09ba2d6460109 SHA512 13a97bfbae25d4243e83a6d6e6e032c96d55d82887b8c1d4b35310219cffdd4be6be0a81e38512077baac29295244a32cce2a361652f63b001cf8a28ad03ed9e diff --git a/mail-client/mutt/mutt-2.2.16.ebuild b/mail-client/mutt/mutt-2.2.16.ebuild deleted file mode 100644 index 323d60cedb089..0000000000000 --- a/mail-client/mutt/mutt-2.2.16.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools branding - -PATCHREV="r0" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/" -MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" -SRC_URI="http://ftp.mutt.org/pub/mutt/${P}.tar.gz - https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pop qdbm +sasl selinux slang +smtp +ssl tokyocabinet vanilla prefix" -# hcache: allow multiple, bug #607360 -REQUIRED_USE=" - gsasl? ( sasl ) - hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - smtp? ( ssl sasl ) - sasl? ( || ( imap pop smtp ) ) - kerberos? ( || ( imap pop smtp ) ) - autocrypt? ( gpgme )" -# yes, we overdepend on the backend impls here, hopefully one day we can -# have REQUIRED_USE do what it is made for again. bug #607360 -CDEPEND=" - app-misc/mime-types - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) - ) - - nls? ( virtual/libintl ) - sasl? ( - gsasl? ( >=net-misc/gsasl-2.0.0 ) - !gsasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn2 ) - gpgme? ( >=app-crypt/gpgme-0.9.0:= ) - autocrypt? ( >=dev-db/sqlite-3 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2:0= ) -" -DEPEND="${CDEPEND} - 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_prepare() { - local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} - - if use !vanilla ; then - # apply patches - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset p - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - einfo "Patches for ${PATCHSET} patchset ${patchset}" - for p in "${PATCHDIR}/${patchset}"/*.patch ; do - eapply "${p}" || die - done - done - # add some explanation as to why not to go upstream - sed -i \ - -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at '"${BRANDING_OS_BUG_REPORT_URL}"'\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ - main.c || die "Failed to add bug instructions" - fi - - # allow user patches - eapply_user - - # patch version string for bug reports - local patchset= - use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" - - # bug 864753: avoid warning about missing tools, currently the order - # is lynx, w3m, elinks, so remove lynx or w3m when not installed, - # elinks should be there via dep. - if use doc ; then - if ! has_version www-client/lynx ; then - sed -i -e '/lynx/d' doc/Makefile.am || die - fi - if ! has_version www-client/w3m ; then - sed -i -e '/w3m/d' doc/Makefile.am || die - fi - fi - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" -} - -src_configure() { - local myconf=( - # signing and encryption - $(use_enable autocrypt) $(use_with autocrypt sqlite3) - --disable-pgp - --disable-smime - $(use_enable gpgme) - - # features - $(use_enable debug) - $(use_enable doc) - $(use_enable nls) - - # protocols - $(use_enable imap) - $(use_enable pop) - $(use_enable smtp) - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - $(use sasl && use gsasl && echo --with-gsasl --without-sasl) - $(use sasl && use !gsasl && echo --without-gsasl --with-sasl ) - $(use !sasl && echo --without-gsasl --without-sasl) - - $(use_with idn idn2) --without-idn # avoid automagic libidn dep - $(use_with kerberos gss) - "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" - "$(use_with !slang curses "${EPREFIX}"/usr)" - - "--enable-compressed" - "--enable-external-dotlock" - "--enable-iconv" - "--enable-nfs-fix" - "--enable-sidebar" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" - "--without-bundled-regex" # use the implementation from libc - "--with-exec-shell=${EPREFIX}/bin/sh" - ) - - # note: REQUIRED_USE should have selected only one of these, but for - # bug #607360 we're forced to allow multiple. For that reason, this - # list is ordered to preference, and only the first is taken. - local hcaches=( - "lmdb" - "qdbm" - "tokyocabinet" - "gdbm" - "berkdb:bdb" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - myconf+=( "--with-homespool=Maildir" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - insinto /etc/${PN} - if use mbox; then - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - doins "${FILESDIR}"/Muttrc - fi - - # include attachment settings, it's mandatory and shouldn't harm - # when not being referenced (index_format using %X) - { - echo - echo "# mandatory attachments settings, not setting these is a BUG!" - echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" - grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist - } >> "${ED}"/etc/${PN}/Muttrc - - # add setting to actually enable gpgme usage - if use gpgme || use autocrypt ; then - { - echo - echo "# this setting enables the gpgme backend (via USE=gpgme)" - # https is broken due to a certificate mismatch :( - echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" - echo "set crypt_use_gpgme = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # similar for autocrypt - if use autocrypt ; then - { - echo - echo "# enables autocrypt (via USE=autocrypt)" - echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" - echo "set autocrypt = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym ../mime.types /etc/${PN}/mime.types - - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " https://wiki.gentoo.org/wiki/Mutt" - echo - fi -} diff --git a/mail-client/mutt/mutt-2.3.0.ebuild b/mail-client/mutt/mutt-2.3.0.ebuild deleted file mode 100644 index 9851c13967d75..0000000000000 --- a/mail-client/mutt/mutt-2.3.0.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools branding - -PATCHREV="r0" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/" -MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" -SRC_URI="http://ftp.mutt.org/pub/mutt/${P}.tar.gz - https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pop qdbm +sasl selinux slang +smtp +ssl tokyocabinet vanilla prefix" -# hcache: allow multiple, bug #607360 -REQUIRED_USE=" - gsasl? ( sasl ) - hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - smtp? ( ssl sasl ) - sasl? ( || ( imap pop smtp ) ) - kerberos? ( || ( imap pop smtp ) ) - autocrypt? ( gpgme )" -# yes, we overdepend on the backend impls here, hopefully one day we can -# have REQUIRED_USE do what it is made for again. bug #607360 -CDEPEND=" - app-misc/mime-types - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( >=dev-libs/openssl-0.9.6:0= ) - ) - - nls? ( virtual/libintl ) - sasl? ( - gsasl? ( >=net-misc/gsasl-2.0.0 ) - !gsasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn2 ) - gpgme? ( >=app-crypt/gpgme-0.9.0:= ) - autocrypt? ( >=dev-db/sqlite-3 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2:0= ) -" -DEPEND="${CDEPEND} - 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_prepare() { - local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} - - if use !vanilla ; then - # apply patches - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset p - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - einfo "Patches for ${PATCHSET} patchset ${patchset}" - for p in "${PATCHDIR}/${patchset}"/*.patch ; do - eapply "${p}" || die - done - done - # add some explanation as to why not to go upstream - sed -i \ - -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at '"${BRANDING_OS_BUG_REPORT_URL}"'\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ - main.c || die "Failed to add bug instructions" - fi - - # allow user patches - eapply_user - - # patch version string for bug reports - local patchset= - use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" - - # bug 864753: avoid warning about missing tools, currently the order - # is lynx, w3m, elinks, so remove lynx or w3m when not installed, - # elinks should be there via dep. - if use doc ; then - if ! has_version www-client/lynx ; then - sed -i -e '/lynx/d' doc/Makefile.am || die - fi - if ! has_version www-client/w3m ; then - sed -i -e '/w3m/d' doc/Makefile.am || die - fi - fi - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" -} - -src_configure() { - local myconf=( - # signing and encryption - $(use_enable autocrypt) $(use_with autocrypt sqlite3) - --disable-pgp - --disable-smime - $(use_enable gpgme) - - # features - $(use_enable debug) - $(use_enable doc) - $(use_enable nls) - - # protocols - $(use_enable imap) - $(use_enable pop) - $(use_enable smtp) - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - $(use sasl && use gsasl && echo --with-gsasl --without-sasl) - $(use sasl && use !gsasl && echo --without-gsasl --with-sasl ) - $(use !sasl && echo --without-gsasl --without-sasl) - - $(use_with idn idn2) --without-idn # avoid automagic libidn dep - $(use_with kerberos gss) - "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" - "$(use_with !slang curses "${EPREFIX}"/usr)" - - "--enable-compressed" - "--enable-external-dotlock" - "--enable-iconv" - "--enable-nfs-fix" - "--enable-sidebar" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" - "--without-bundled-regex" # use the implementation from libc - "--with-exec-shell=${EPREFIX}/bin/sh" - ) - - # note: REQUIRED_USE should have selected only one of these, but for - # bug #607360 we're forced to allow multiple. For that reason, this - # list is ordered to preference, and only the first is taken. - local hcaches=( - "lmdb" - "qdbm" - "tokyocabinet" - "gdbm" - "berkdb:bdb" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - myconf+=( "--with-homespool=Maildir" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - insinto /etc/${PN} - if use mbox; then - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - doins "${FILESDIR}"/Muttrc - fi - - # include attachment settings, it's mandatory and shouldn't harm - # when not being referenced (index_format using %X) - { - echo - echo "# mandatory attachments settings, not setting these is a BUG!" - echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" - grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist - } >> "${ED}"/etc/${PN}/Muttrc - - # add setting to actually enable gpgme usage - if use gpgme || use autocrypt ; then - { - echo - echo "# this setting enables the gpgme backend (via USE=gpgme)" - # https is broken due to a certificate mismatch :( - echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" - echo "set crypt_use_gpgme = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # similar for autocrypt - if use autocrypt ; then - { - echo - echo "# enables autocrypt (via USE=autocrypt)" - echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" - echo "set autocrypt = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym ../mime.types /etc/${PN}/mime.types - - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " https://wiki.gentoo.org/wiki/Mutt" - echo - fi -}