public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/files/, mail-client/mutt/
@ 2016-06-15 18:17 Fabian Groffen
  0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2016-06-15 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b4c8f87dcc9137396cd30ca1a079ee7ec99e1129
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 18:14:49 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 18:14:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c8f87d

mail-client/mutt: add patch to fix drawing glitch in index view

Package-Manager: portage-2.2.28-prefix

 ...1-neomutt-index_format_truncation_problem.patch | 32 ++++++++++++++++++++++
 mail-client/mutt/mutt-1.6.1-r2.ebuild              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch b/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch
new file mode 100644
index 0000000..3798b35
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch
@@ -0,0 +1,32 @@
+From 099af5ae3e21bdceb3baf871e4b0a8926205e707 Mon Sep 17 00:00:00 2001
+From: Richard Russon <rich@flatcap.org>
+Date: Wed, 15 Jun 2016 16:47:22 +0100
+Subject: [PATCH] fix index_format truncation problem
+
+mutt_wstr_trunc() didn't take index coloring into account when measuring a
+string's length.  When combined with a soft-fill '%* ' in the index_format it
+lead to formatting problems.
+
+Fixes: #51
+---
+ curs_lib.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/curs_lib.c b/curs_lib.c
+index ce4e56d..9a3f5e5 100644
+--- a/curs_lib.c
++++ b/curs_lib.c
+@@ -1201,7 +1201,12 @@ size_t mutt_wstr_trunc (const char *src, size_t maxlen, size_t maxwid, size_t *w
+     cw = wcwidth (wc);
+     /* hack because MUTT_TREE symbols aren't turned into characters
+      * until rendered by print_enriched_string (#3364) */
+-    if (cw < 0 && cl == 1 && src[0] && src[0] < MUTT_TREE_MAX)
++    if ((cw < 0) && (src[0] == MUTT_SPECIAL_INDEX))
++    {
++      cl = 2; /* skip the index coloring sequence */
++      cw = 0;
++    }
++    else if (cw < 0 && cl == 1 && src[0] && src[0] < MUTT_TREE_MAX)
+       cw = 1;
+     else if (cw < 0)
+       cw = 0;			/* unprintable wchar */

diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
index 897993e..4188245 100644
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -106,6 +106,7 @@ src_prepare() {
 		-e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
 		version.c || die "Failed to add bug instructions"
 
+	epatch "${FILESDIR}"/mutt-1.6.1-neomutt-index_format_truncation_problem.patch
 	local upatches=
 	# allow user patches
 	eapply_user && upatches=" with user patches"


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/files/, mail-client/mutt/
@ 2020-06-21  7:47 Fabian Groffen
  0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2020-06-21  7:47 UTC (permalink / raw
  To: gentoo-commits

commit:     a760a283613c47ac37b31c6394f89a431e823ca8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 07:44:41 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 07:44:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a760a283

mail-client/mutt-1.14.4-r1: yet another security bump

Bug: https://bugs.gentoo.org/728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-client/mutt/Manifest                          |  2 --
 .../mutt-1.14.4-no-imap-preauth-with-tunnel.patch  | 30 ++++++++++++++++++++++
 .../{mutt-1.14.2.ebuild => mutt-1.14.4-r1.ebuild}  |  3 +++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 59e1934cdb4..53bf8d6a901 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,6 @@
 DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-DIST mutt-1.14.2.tar.gz 5222938 BLAKE2B e59dd4e1e61380a3c49fce8d722e7a263e81713208660e28629f428bc13724ccc80cffb3345ec1b8dd0a8aefa32ccdea94b8098b826268ce0fe64f6a11bdfec5 SHA512 b18b0bc52341d31a60558ca9b11545f5352e89bf7c215b10061efcd382af287416299f7efa017e3a03937a11fd630330ff8389dbe80fae2e6437297687653cb8
 DIST mutt-1.14.3.tar.gz 5003987 BLAKE2B 43e9be05e3da6f3c257bc405fdf45b87114efdeece169d2919390b5cf35a935d1c2798b0ab7eb213eb25eed3008e452fc4c9f02ca8fdb209dce8d9655fe7fb84 SHA512 d7ac53cd383e7491666aeb0b33703dee47cfb9a8671484b713f3b5051227ca2fa618320df0267b7d4eb43a22f9fc9d20d457ddb3f98f907ce49fe7f2915a865e
 DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
 DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
-DIST mutt-gentoo-1.14.2-patches-r0.tar.xz 31076 BLAKE2B 31bb4efd03f45b4b79ed325471166e91f0e419318f3cf1e5426a627e2557bf19fbe03ae2c19cc97719c574b6a8df19b96955429651bffb41d5220888553b86a9 SHA512 5a0ddf0242caed5bed19700904b0fd91883542b9b12f0b16c1b4f7f39944d0737429991cca7cbf4f9932deada8b7fd71caff284775ddfcf3ec283554d3e727a9
 DIST mutt-gentoo-1.14.3-patches-r0.tar.xz 31148 BLAKE2B 49f5f7b446d635de31e5280bad09422bcf27543b58e2eade6ddec35524e9c49083fe59224e6103d6992f53571d77c606c6280e58d05606900ed01ccbd4c4d697 SHA512 444f6456b3c1eb423cd990c3f5a7f4f6ce7f0706f461ca507846ce6ee855e32331720bc7c0fa2cb834d5433d9e7a0d7d2d90c5b8c0ac917dbd3c63a622ae6ce5
 DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc

diff --git a/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch b/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch
new file mode 100644
index 00000000000..d4d2104db08
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch
@@ -0,0 +1,30 @@
+From dc909119b3433a84290f0095c0f43a23b98b3748 Mon Sep 17 00:00:00 2001
+From: Kevin McCarthy <kevin@8t8.us>
+Date: Sat, 20 Jun 2020 06:35:35 -0700
+Subject: [PATCH] Don't check IMAP PREAUTH encryption if $tunnel is in use.
+
+$tunnel is used to create an external encrypted connection.  The
+default of $ssl_starttls is yes, meaning those kinds of connections
+will be broken by the CVE-2020-14093 fix.
+---
+ imap/imap.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imap.c b/imap/imap.c
+index 3ca10df4..78d75b07 100644
+--- a/imap/imap.c
++++ b/imap/imap.c
+@@ -532,8 +532,8 @@ int imap_open_connection (IMAP_DATA* idata)
+   {
+ #if defined(USE_SSL)
+     /* An unencrypted PREAUTH response is most likely a MITM attack.
+-     * Require a confirmation. */
+-    if (!idata->conn->ssf)
++     * Require a confirmation unless using $tunnel. */
++    if (!idata->conn->ssf && !Tunnel)
+     {
+       if (option(OPTSSLFORCETLS) ||
+           (query_quadoption (OPT_SSLSTARTTLS,
+-- 
+GitLab
+

diff --git a/mail-client/mutt/mutt-1.14.2.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-1.14.2.ebuild
rename to mail-client/mutt/mutt-1.14.4-r1.ebuild
index 655ecdfe2af..7703c01f823 100644
--- a/mail-client/mutt/mutt-1.14.2.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -74,6 +74,9 @@ RDEPEND="${CDEPEND}
 src_prepare() {
 	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
 
+	# really unfortunate security fix of the day ...
+	eapply "${FILESDIR}"/${P}-no-imap-preauth-with-tunnel.patch
+
 	if use !vanilla ; then
 		# apply patches
 		export EPATCH_FORCE="yes"


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/files/, mail-client/mutt/
@ 2023-12-09 18:11 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-12-09 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     952a08ffd248d64b44f3c61322e67d9297dc25c5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 18:02:13 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 18:06:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952a08ff

mail-client/mutt: fix modern C issue in configure

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../mutt/files/mutt-2.2.12-configure-c99.patch     |  30 +++
 mail-client/mutt/mutt-2.2.12-r1.ebuild             | 275 +++++++++++++++++++++
 2 files changed, 305 insertions(+)

diff --git a/mail-client/mutt/files/mutt-2.2.12-configure-c99.patch b/mail-client/mutt/files/mutt-2.2.12-configure-c99.patch
new file mode 100644
index 000000000000..d8837706d15f
--- /dev/null
+++ b/mail-client/mutt/files/mutt-2.2.12-configure-c99.patch
@@ -0,0 +1,30 @@
+https://gitlab.com/muttmua/mutt/-/merge_requests/175
+
+From 563c5f60521f1541b739480a5e242f6cd3a450ef Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 7 Dec 2023 19:39:06 +0100
+Subject: [PATCH] configure.ac: Fix ICONV_NONTRANS probe
+
+The standard iconv function uses char ** even for its input argument.
+With a const char ** argument, ICONV_NONTRANS is incorrectly set to 1
+if the compiler produces an error for such incompatible pointer types.
+
+Although as far as I can see, the only thing that accomplishes is
+disabling an assert, so it probably does not matter much.
+--- a/configure.ac
++++ b/configure.ac
+@@ -1325,10 +1325,10 @@ AC_CACHE_CHECK([whether iconv is non-transcribing], mutt_cv_iconv_nontrans,
+ int main()
+ {
+   iconv_t cd;
+-  const char *ib;
++  char *ib;
+   char *ob;
+   size_t ibl, obl;
+-  const char *s = "\304\211";
++  char *s = (char *) "\304\211";
+ changequote(, )dnl
+   char t[3];
+ changequote([, ])dnl
+-- 
+GitLab

diff --git a/mail-client/mutt/mutt-2.2.12-r1.ebuild b/mail-client/mutt/mutt-2.2.12-r1.ebuild
new file mode 100644
index 000000000000..ecc7b4636faf
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.12-r1.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+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="ftp://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}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	gsasl?            ( sasl )
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+# 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 )
+	smime-classic? ( >=dev-libs/openssl-0.9.6:0 )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		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 https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.2.12-configure-c99.patch
+
+	# 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)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic 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
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-12-09 18:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-15 18:17 [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/files/, mail-client/mutt/ Fabian Groffen
  -- strict thread matches above, loose matches on Subject: below --
2020-06-21  7:47 Fabian Groffen
2023-12-09 18:11 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox