From c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 May 2021 01:33:16 +0100 Subject: gentoo resync : 07.05.2021 --- mail-client/neomutt/Manifest | 2 + ...x-seqset-iterator-when-it-ends-in-a-comma.patch | 37 +++++ mail-client/neomutt/neomutt-20210205-r1.ebuild | 156 +++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch create mode 100644 mail-client/neomutt/neomutt-20210205-r1.ebuild (limited to 'mail-client/neomutt') diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index 372ef4b3e596..db160726d565 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,8 +1,10 @@ +AUX 0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch 1175 BLAKE2B a01218e92fb230f7adeacec1803acf80d8e2c44494109deae9b261012c84e1b8eda160f2e663504d30f0d67a52ab39be206b18b04d35a5da3d0b8f29f0ed7f34 SHA512 6bfeb433b5d9ff16e70b7765efd537cb6cb27c5fab9396fed88f1ba3d683a90308afd1a6c7b25af44c5b3d53f54138d6bd671d8330999b402dc887a5af7ca424 DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3 EBUILD neomutt-20201127-r1.ebuild 4093 BLAKE2B b6a2458b59f4940062a927eed3a0c383581237d72e5b021302a395ae03cf6c1dd9a950237694f2b8aced60366617ad0b901c3044ccca6421f888dcea9afd3555 SHA512 c7e6e7abe55929a6b418ead558d614c68716fb80d87859d4dc75e2049be2eb8d6e00b0c86159137ef7dedcd604c7fce848998078de807a324893068c7efa6138 EBUILD neomutt-20201127.ebuild 4083 BLAKE2B 854a44e9b0183e5983ded197d7c02606cda10ab986dc5b999c96c5fb89947ab56452a091e43a08723cc594ecb391eccd60db238bf8f2d526bcf05e15f5886caf SHA512 59095fc0c1b0a1a9d9031cb35d748bd65bdd0bb506bb93b12dbd937f4ae169a94aca1b393102e49a17fb3d498fb6ee8eca06ff528cfc469e1709bf2ea3ac42c2 +EBUILD neomutt-20210205-r1.ebuild 4176 BLAKE2B 2d7ac5402671bbea6ae09bc7989d7795958ffdeb707b4743a7a300a0795e6dd01ba8b273165d4047245f128334d2e1647a3eafc7dfee99b3cb5456ba74b3ecdf SHA512 735886a4ca59abbb8451db73560f4efa37a62ee0ecdcfeea56ba2f68c178dfea163b210dc3f0b173ae085f237e36fd021866b974e5fb400638421588884e7f1f EBUILD neomutt-20210205.ebuild 4092 BLAKE2B 29fa2d58b63af96c7834adfe22a997a795d7105d5b7365ff94869bf67d19e3a37d926b46096f89a772a9e91eadb7a7dc71080f3ed62dccaf0541044ebf9fb95b SHA512 9b62861decf5bae8a5b51ed64f211f3ea513a487cdf2fabae4d32198fb8e2b1d203e3039264f3a28406b4b82182a9208841789a4a41cfcf064d4c5c829c4f3a3 EBUILD neomutt-99999999.ebuild 4092 BLAKE2B 29fa2d58b63af96c7834adfe22a997a795d7105d5b7365ff94869bf67d19e3a37d926b46096f89a772a9e91eadb7a7dc71080f3ed62dccaf0541044ebf9fb95b SHA512 9b62861decf5bae8a5b51ed64f211f3ea513a487cdf2fabae4d32198fb8e2b1d203e3039264f3a28406b4b82182a9208841789a4a41cfcf064d4c5c829c4f3a3 MISC metadata.xml 1348 BLAKE2B b48dbbae622e7bf2bf2662256564748017713980111a69291b9e3b02e261145c2eac5afd2994ba35d5c18bb9ec6a73ac0018347452a6c9b91d45a49da845ab90 SHA512 215c1b961ee853156e2d7f840cde54f584df868b6d5913fba8ef377b63248d05e1b31a1c024ed1d7a86c05c4362faf77fcca32880cd093fe78d9b404bd7f139e diff --git a/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch b/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch new file mode 100644 index 000000000000..06f31ffeb46b --- /dev/null +++ b/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch @@ -0,0 +1,37 @@ +From fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Mon, 3 May 2021 13:11:30 -0700 +Subject: [PATCH] Fix seqset iterator when it ends in a comma + +If the seqset ended with a comma, the substr_end marker would be just +before the trailing nul. In the next call, the loop to skip the +marker would iterate right past the end of string too. + +The fix is simple: place the substr_end marker and skip past it +immediately. +--- + imap/util.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/imap/util.c b/imap/util.c +index 52aff7da0..27fb86295 100644 +--- a/imap/util.c ++++ b/imap/util.c +@@ -1119,13 +1119,11 @@ int mutt_seqset_iterator_next(struct SeqsetIterator *iter, unsigned int *next) + if (iter->substr_cur == iter->eostr) + return 1; + +- while (!*(iter->substr_cur)) +- iter->substr_cur++; + iter->substr_end = strchr(iter->substr_cur, ','); + if (!iter->substr_end) + iter->substr_end = iter->eostr; + else +- *(iter->substr_end) = '\0'; ++ *(iter->substr_end++) = '\0'; + + char *range_sep = strchr(iter->substr_cur, ':'); + if (range_sep) +-- +2.30.2 + diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild new file mode 100644 index 000000000000..3c05cf9fd231 --- /dev/null +++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} =~ 99999999$ ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/neomutt/neomutt.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64 ~s390 ~x86" +fi + +TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75 +SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )" + +DESCRIPTION="A small but very powerful text-based mail client" +HOMEPAGE="https://neomutt.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet + lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic + ssl tokyocabinet test" +REQUIRED_USE=" + autocrypt? ( gpgme )" + +CDEPEND=" + app-misc/mime-types + berkdb? ( + || ( + sys-libs/db:6.2 + sys-libs/db:5.3 + sys-libs/db:4.8 + ) + =net-libs/gnutls-1.0.17:= ) + gpgme? ( >=app-crypt/gpgme-1.13.1:= ) + autocrypt? ( >=dev-db/sqlite-3 ) + 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? ( >=dev-libs/openssl-1.0.2u:0= ) +" +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 ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch" +) + +src_configure() { + local myconf=( + "$(usex doc --full-doc --disable-doc)" + "$(use_enable nls)" + "$(use_enable notmuch)" + + "$(use_enable autocrypt)" + "$(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)" + + "$(usex test --testing --disable-testing)" + ) + + econf CCACHE=none "${myconf[@]}" +} + +src_test() { + local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + pushd ${test_dir} || die "Could not cd into test_dir" + NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \ + || die "Failed to run the setup.sh script" + popd || die "Could not cd back" + NEOMUTT_TEST_DIR="${test_dir}" emake test +} + +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 + + if use autocrypt && ! use idn; then + ewarn " It is highly recommended that NeoMutt be also configured" + ewarn " with idn when autocrypt is enabled." + fi +} -- cgit v1.2.3