From 8fc08491f26431ec46b36d6ebef9551f3773b96f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2023 23:17:55 +0000 Subject: gentoo auto-resync : 09:12:2023 - 23:17:54 --- mail-client/Manifest.gz | Bin 3393 -> 3393 bytes mail-client/mutt/Manifest | 2 + .../mutt/files/mutt-2.2.12-configure-c99.patch | 30 +++ mail-client/mutt/mutt-2.2.12-r1.ebuild | 275 +++++++++++++++++++++ 4 files changed, 307 insertions(+) create mode 100644 mail-client/mutt/files/mutt-2.2.12-configure-c99.patch create mode 100644 mail-client/mutt/mutt-2.2.12-r1.ebuild (limited to 'mail-client') diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz index cc1fb05afb88..a2d0470e7e1e 100644 Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index d4c571070bc9..f6425e65c8b6 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,6 +1,8 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 +AUX mutt-2.2.12-configure-c99.patch 962 BLAKE2B 7a3312f7edf131d1b9b0ad868d330d91542fcc112a615b120ac6423d78c527a2b6797db4ecca018ab89df34fcdbebd85bd5339a997fed69abf181ecc025c41cb SHA512 48c703bcf0e5fa59588156fa6407026f7fd2aa619297133286993041b46688fb5473e16c1fcc3d82b65a6cf039ed12b0e1b3c952ce6265c0efc89f51a96bbd2f DIST mutt-2.2.12.tar.gz 5539244 BLAKE2B f17811a37804221fbb351083a25fa8b67511b7a11220e82ab6ce971fc9a0627ec9bcd8df6095e525dacda347aac51b9671cc8e6f8a3fdd8920b44fbcbc61189e SHA512 75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006 DIST mutt-gentoo-2.2.12-patches-r0.tar.xz 22444 BLAKE2B 9c973cb0fe4705dda9e601d18b05d1385df6914af5928bfdba2ad196113a973dccac0f46373c3709654d1fc077aedd6e776c4c57803c095622a70807dafe2cc2 SHA512 3857d10055e98360d31d9ed2010e0d75db6fd0c0887e770f6b098869b25f72f5dc594a646b6fdf86cf6b24694e13965f82b8d8a4cb8b65a5e030f628a16b930d +EBUILD mutt-2.2.12-r1.ebuild 8269 BLAKE2B f2dfebe046772c292e74be31ba2c0bb9d0a22eea45beaefbd20f88290878437d412770f3d62f59d4905554663ef9ba6fd51c54e2c8e37357e638785f845171bc SHA512 615a522f9932c332575959c3ba09e7158265127923d560204db17b08ed32e6c2c04966451a7141f7bf85a82647a93592e2b93ebb12ffd58a577f5dfbd750aa00 EBUILD mutt-2.2.12.ebuild 8207 BLAKE2B 19f8cd6721d1485c083bfaa70357b2b8bc8e4dccae74b91345c51fc1764a518db04aab95fa65ff72052cb3d1de5602ff178d8d30871dc655134c8c8bfd0ba14f SHA512 c2d00c707fc2f8d3d955fa50d327b33d103279d41115c13ed6f61f985d124af18152c6032d6fadd65e28941a644f6b784648cfc969db524e2a028140db68d074 MISC metadata.xml 1413 BLAKE2B b48f350744607d739c38cc54e42abce66e485f1f65fafaa5f4a668f07da70fff0f917f1d67cab621c9e267052fdb958476292fe5222738e7bca59502f560078c SHA512 c9b4c3a9ac62c04be1ef8dc894754334f35fb79d6365360212805e9f9f2c2dca18e1d03c76bb887e81b4fbb2199fdf8fe4341ebc2059f5961184562ee549df65 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 +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 +} -- cgit v1.2.3