From fb1fcfa9177ab9bdf103636d49d5f3fb84b36534 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 5 Jul 2026 09:24:28 +0200 Subject: [PATCH] mail-client/mutt-2.4.1: version bump Signed-off-by: Fabian Groffen --- mail-client/mutt/Manifest | 2 + mail-client/mutt/mutt-2.4.1.ebuild | 269 +++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 mail-client/mutt/mutt-2.4.1.ebuild diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index cf154a7aa0c78..8115f9e6cb275 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,4 +1,6 @@ DIST mutt-2.3.2.tar.gz 5570204 BLAKE2B 2f256d98e81be88f60543411dd6ebb9f3c640b73503de097acffc5bbcf39c63221dc9c1357288a48af5e9aa1f69b9068698f376f7884d5bd974d717206086376 SHA512 78d7bcce1466bc7e188c579c00df0f308ea73b3f574b6fdecd399dc5f361ced971a6cecb09877b689a15aac8d02271b13d1f61e0d3197d79b6a348e6bf04f3ea DIST mutt-2.3.3.tar.gz 5570769 BLAKE2B bae4cd9173741036d941985822c733f93d25dbacf273188c05503277fc22f7f2a829fe0e121127f1e682cf81be4b0920561666bb899616f95cb928da5e823647 SHA512 80c2e7e9c76d1434df35bad11ccbf4a12b6c00b2fa59c27974bb74605ec23c7a09b25b0b0cc421870e01cef3d1c7b086d45f8c7f8eac93204c2002643a86e3e2 +DIST mutt-2.4.1.tar.gz 5626446 BLAKE2B cc7e32cfe62ceac3c9f4e5ec2200ad6b346cdef7dab814fb039066850cf23337640a4c32ddf9687a3c2edc2dbc1f41bbf2589422fd9861b4ced53e81cfc2b318 SHA512 370e871e1f417038f117883b82381967b82c4fffdc64498aacc115b18d91cdf91731d065c4d93ff2c929aeba73644d052f9e7cd84906a30fee918f2fff01237d DIST mutt-gentoo-2.3.2-patches-r0.tar.xz 22360 BLAKE2B da82417e3e229abdd916bb7797bedb7e9f541530507a954a1e344e7174d3b570e5ae6232ad79d5f852621e775d6fce6c2364a954a9dfec5129f09ba2d6460109 SHA512 13a97bfbae25d4243e83a6d6e6e032c96d55d82887b8c1d4b35310219cffdd4be6be0a81e38512077baac29295244a32cce2a361652f63b001cf8a28ad03ed9e DIST mutt-gentoo-2.3.3-patches-r0.tar.xz 22352 BLAKE2B 2a430232fa0faf00b75dad41ca76c52e27dbe9fdf906176fc6d5ecfb2cbe29d0fb6f8b97e123da7f098363db0e67f23c8b1b289e0d606133eafea1f5c2e12bd2 SHA512 90b90887aa7fbbfef8a69356844d920aa4cf2af8a95599a404b9897ec0b6ad4cb77604e8b409d38bde71db4dc9e1f12c2cc265cc8429e0b0698e303f67b7b33f +DIST mutt-gentoo-2.4.1-patches-r0.tar.xz 22016 BLAKE2B 8b01d278ea1031613c2ead8d333faa1eb2bbc6b56173ccc3d0e79a018f36b43eadb39b0486954947ceefaeac785a7297ddb3c0e632647241763e6e7b47815756 SHA512 13c03c951df98c262bc0923569a47ed70fffeb160544b7618d10bbd21cdffd68f2ba607b3b01bd091df6d33086a274e206a1bc678acf2e8bb378879003c43fe7 diff --git a/mail-client/mutt/mutt-2.4.1.ebuild b/mail-client/mutt/mutt-2.4.1.ebuild new file mode 100644 index 0000000000000..9851c13967d75 --- /dev/null +++ b/mail-client/mutt/mutt-2.4.1.ebuild @@ -0,0 +1,269 @@ +# 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 +}