1 |
commit: 4ed08d8150e512a92931542844b963a0739cfd28 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 30 07:17:20 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 30 07:17:36 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed08d81 |
7 |
|
8 |
mail-client/mutt-1.13.5: version bump |
9 |
|
10 |
- new release addresses security bug |
11 |
- invalid USE-flags pgp_classic and smime_classic are removed |
12 |
|
13 |
Bug: https://bugs.gentoo.org/715352 |
14 |
Bug: https://bugs.gentoo.org/695078 |
15 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
16 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
17 |
|
18 |
mail-client/mutt/Manifest | 2 + |
19 |
mail-client/mutt/mutt-1.13.5.ebuild | 268 ++++++++++++++++++++++++++++++++++++ |
20 |
2 files changed, 270 insertions(+) |
21 |
|
22 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
23 |
index 2a726abed65..3c1a869e3d5 100644 |
24 |
--- a/mail-client/mutt/Manifest |
25 |
+++ b/mail-client/mutt/Manifest |
26 |
@@ -1,6 +1,8 @@ |
27 |
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726 |
28 |
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd |
29 |
DIST mutt-1.13.4.tar.gz 4901222 BLAKE2B 70ab2dcd93d860a2a1bc31059230f034bc87780e423f6a7ccd3b464d67c59d0f547ad2ae2ddfa42f07dc3d5ec9dea2e7302f92eeb2f5b9f722798ea80bf2fe1d SHA512 59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3 |
30 |
+DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a |
31 |
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5 |
32 |
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701 |
33 |
DIST mutt-gentoo-1.13.4-patches-r0.tar.xz 36084 BLAKE2B 80f508d55199b036d7ba2a5b848dc99a4d60acea5edbc5b582472ee61c89f477fe613c043c6abf6fd4c9ef6c70acc0c656c2e93430b2fbce0aa39a8e0a0ef480 SHA512 775b22b667d67d1ddc9b2c15d208c52f00bc8e42cabc2985eb5f2983589476d5fc6eaab38230aeafd7e4dbcb6165eef33ea2d5721cc973d406ca4f736afd4c32 |
34 |
+DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9 |
35 |
|
36 |
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild |
37 |
new file mode 100644 |
38 |
index 00000000000..ad8d65ddb60 |
39 |
--- /dev/null |
40 |
+++ b/mail-client/mutt/mutt-1.13.5.ebuild |
41 |
@@ -0,0 +1,268 @@ |
42 |
+# Copyright 1999-2020 Gentoo Authors |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI="6" |
46 |
+ |
47 |
+inherit eutils flag-o-matic autotools |
48 |
+ |
49 |
+PATCHREV="r0" |
50 |
+PATCHSET="gentoo-${PVR}/${PATCHREV}" |
51 |
+ |
52 |
+DESCRIPTION="A small but very powerful text-based mail client" |
53 |
+HOMEPAGE="http://www.mutt.org/" |
54 |
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" |
55 |
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
56 |
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
57 |
+ https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
58 |
+IUSE="berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" |
59 |
+# hcache: allow multiple, bug #607360 |
60 |
+REQUIRED_USE=" |
61 |
+ hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
62 |
+ imap? ( ssl ) |
63 |
+ pop? ( ssl ) |
64 |
+ smime-classic? ( ssl !gnutls ) |
65 |
+ smtp? ( ssl sasl ) |
66 |
+ sasl? ( || ( imap pop smtp ) ) |
67 |
+ kerberos? ( || ( imap pop smtp ) )" |
68 |
+SLOT="0" |
69 |
+LICENSE="GPL-2" |
70 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
71 |
+# yes, we overdepend on the backend impls here, hopefully one day we can |
72 |
+# have REQUIRED_USE do what it is made for again. bug #607360 |
73 |
+CDEPEND=" |
74 |
+ app-misc/mime-types |
75 |
+ virtual/libiconv |
76 |
+ |
77 |
+ berkdb? ( >=sys-libs/db-4:= ) |
78 |
+ gdbm? ( sys-libs/gdbm ) |
79 |
+ lmdb? ( dev-db/lmdb:= ) |
80 |
+ qdbm? ( dev-db/qdbm ) |
81 |
+ tokyocabinet? ( dev-db/tokyocabinet ) |
82 |
+ |
83 |
+ ssl? ( |
84 |
+ gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
85 |
+ !gnutls? ( |
86 |
+ libressl? ( dev-libs/libressl:= ) |
87 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= ) |
88 |
+ ) |
89 |
+ ) |
90 |
+ |
91 |
+ nls? ( virtual/libintl ) |
92 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
93 |
+ kerberos? ( virtual/krb5 ) |
94 |
+ idn? ( net-dns/libidn2 ) |
95 |
+ gpgme? ( >=app-crypt/gpgme-0.9.0:= ) |
96 |
+ slang? ( sys-libs/slang ) |
97 |
+ !slang? ( >=sys-libs/ncurses-5.2:0= ) |
98 |
+" |
99 |
+DEPEND="${CDEPEND} |
100 |
+ net-mail/mailbase |
101 |
+ doc? ( |
102 |
+ dev-libs/libxml2 |
103 |
+ dev-libs/libxslt |
104 |
+ app-text/docbook-xsl-stylesheets |
105 |
+ || ( www-client/lynx www-client/w3m www-client/elinks ) |
106 |
+ )" |
107 |
+RDEPEND="${CDEPEND} |
108 |
+ selinux? ( sec-policy/selinux-mutt ) |
109 |
+ smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) |
110 |
+ pgp-classic? ( app-crypt/gnupg ) |
111 |
+" |
112 |
+ |
113 |
+src_prepare() { |
114 |
+ local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} |
115 |
+ |
116 |
+ if use !vanilla ; then |
117 |
+ # apply patches |
118 |
+ export EPATCH_FORCE="yes" |
119 |
+ export EPATCH_SUFFIX="patch" |
120 |
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 |
121 |
+ local patches=( |
122 |
+ patches-mutt |
123 |
+ bugs-gentoo |
124 |
+ features-common |
125 |
+ features-extra |
126 |
+ gentoo |
127 |
+ ) |
128 |
+ local patchset |
129 |
+ for patchset in "${patches[@]}" ; do |
130 |
+ [[ -d "${PATCHDIR}/${patchset}" ]] || continue |
131 |
+ einfo "Patches for ${PATCHSET} patchset ${patchset}" |
132 |
+ EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ |
133 |
+ || die "patchset ${patchset} failed" |
134 |
+ done |
135 |
+ # add some explanation as to why not to go upstream |
136 |
+ sed -i \ |
137 |
+ -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\\' \ |
138 |
+ main.c || die "Failed to add bug instructions" |
139 |
+ fi |
140 |
+ |
141 |
+ local upatches= |
142 |
+ # allow user patches |
143 |
+ eapply_user && upatches=" with user patches" |
144 |
+ |
145 |
+ # patch version string for bug reports |
146 |
+ local patchset= |
147 |
+ use vanilla || patchset=", ${PATCHSET}" |
148 |
+ sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ |
149 |
+ muttlib.c || die "failed patching in Gentoo version" |
150 |
+ |
151 |
+ # many patches touch the buildsystem, we always need this |
152 |
+ AT_M4DIR="m4" eautoreconf |
153 |
+ |
154 |
+ # the configure script contains some "cleverness" whether or not to setgid |
155 |
+ # the dotlock program, resulting in bugs like #278332 |
156 |
+ sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" |
157 |
+} |
158 |
+ |
159 |
+src_configure() { |
160 |
+ local myconf=( |
161 |
+ # signing and encryption |
162 |
+ $(use_enable pgp-classic pgp) |
163 |
+ $(use_enable smime-classic smime) |
164 |
+ $(use_enable gpgme) |
165 |
+ |
166 |
+ # features |
167 |
+ $(use_enable debug) |
168 |
+ $(use_enable doc) |
169 |
+ $(use_enable nls) |
170 |
+ |
171 |
+ # protocols |
172 |
+ $(use_enable imap) |
173 |
+ $(use_enable pop) |
174 |
+ $(use_enable smtp) |
175 |
+ |
176 |
+ $(use ssl && use gnutls && echo --with-gnutls --without-ssl) |
177 |
+ $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) |
178 |
+ $(use !ssl && echo --without-gnutls --without-ssl) |
179 |
+ |
180 |
+ $(use_with sasl) |
181 |
+ $(use_with idn idn2) --without-idn # avoid automagic libidn dep |
182 |
+ $(use_with kerberos gss) |
183 |
+ "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" |
184 |
+ "$(use_with !slang curses "${EPREFIX}"/usr)" |
185 |
+ |
186 |
+ "--enable-compressed" |
187 |
+ "--enable-external-dotlock" |
188 |
+ "--enable-iconv" |
189 |
+ "--enable-nfs-fix" |
190 |
+ "--enable-sidebar" |
191 |
+ "--sysconfdir=${EPREFIX}/etc/${PN}" |
192 |
+ "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
193 |
+ "--without-bundled-regex" # use the implementation from libc |
194 |
+ "--with-exec-shell=${EPREFIX}/bin/sh" |
195 |
+ ) |
196 |
+ |
197 |
+ if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then |
198 |
+ # arrows in index view do not show when using wchar_t |
199 |
+ # or misalign due to wrong computations |
200 |
+ myconf+=( "--without-wc-funcs" ) |
201 |
+ fi |
202 |
+ |
203 |
+ # note: REQUIRED_USE should have selected only one of these, but for |
204 |
+ # bug #607360 we're forced to allow multiple. For that reason, this |
205 |
+ # list is ordered to preference, and only the first is taken. |
206 |
+ local hcaches=( |
207 |
+ "lmdb" |
208 |
+ "qdbm" |
209 |
+ "tokyocabinet" |
210 |
+ "gdbm" |
211 |
+ "berkdb:bdb" |
212 |
+ ) |
213 |
+ local ucache hcache lcache |
214 |
+ for hcache in "${hcaches[@]}" ; do |
215 |
+ if use ${hcache%%:*} ; then |
216 |
+ ucache=${hcache} |
217 |
+ break |
218 |
+ fi |
219 |
+ done |
220 |
+ if [[ -n ${ucache} ]] ; then |
221 |
+ myconf+=( "--enable-hcache" ) |
222 |
+ else |
223 |
+ myconf+=( "--disable-hcache" ) |
224 |
+ fi |
225 |
+ for hcache in "${hcaches[@]}" ; do |
226 |
+ [[ ${hcache} == ${ucache} ]] \ |
227 |
+ && myconf+=( "--with-${hcache#*:}" ) \ |
228 |
+ || myconf+=( "--without-${hcache#*:}" ) |
229 |
+ done |
230 |
+ |
231 |
+ if use mbox; then |
232 |
+ myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) |
233 |
+ else |
234 |
+ myconf+=( "--with-homespool=Maildir" ) |
235 |
+ fi |
236 |
+ |
237 |
+ econf "${myconf[@]}" |
238 |
+} |
239 |
+ |
240 |
+src_install() { |
241 |
+ emake DESTDIR="${D}" install |
242 |
+ insinto /etc/${PN} |
243 |
+ if use mbox; then |
244 |
+ newins "${FILESDIR}"/Muttrc.mbox Muttrc |
245 |
+ else |
246 |
+ doins "${FILESDIR}"/Muttrc |
247 |
+ fi |
248 |
+ |
249 |
+ # include attachment settings, it's mandatory and shouldn't harm |
250 |
+ # when not being referenced (index_format using %X) |
251 |
+ { |
252 |
+ echo |
253 |
+ echo "# mandatory attachments settings, not setting these is a BUG!" |
254 |
+ echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" |
255 |
+ grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist |
256 |
+ } >> "${ED}"/etc/${PN}/Muttrc |
257 |
+ |
258 |
+ # add setting to actually enable gpgme usage |
259 |
+ if use gpgme ; then |
260 |
+ { |
261 |
+ echo |
262 |
+ echo "# this setting enables the gpgme backend (via USE=gpgme)" |
263 |
+ # https is broken due to a certificate mismatch :( |
264 |
+ echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" |
265 |
+ echo "set crypt_use_gpgme = yes" |
266 |
+ } >> "${ED}"/etc/${PN}/Muttrc |
267 |
+ fi |
268 |
+ |
269 |
+ # A newer file is provided by app-misc/mime-types. So we link it. |
270 |
+ rm "${ED}"/etc/${PN}/mime.types |
271 |
+ dosym ../mime.types /etc/${PN}/mime.types |
272 |
+ |
273 |
+ # nuke manpages that should be provided by an MTA, bug #177605 |
274 |
+ rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
275 |
+ || ewarn "failed to remove files, please file a bug" |
276 |
+ |
277 |
+ if use !prefix ; then |
278 |
+ fowners root:mail /usr/bin/mutt_dotlock |
279 |
+ fperms g+s /usr/bin/mutt_dotlock |
280 |
+ fi |
281 |
+ |
282 |
+ dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
283 |
+} |
284 |
+ |
285 |
+pkg_postinst() { |
286 |
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then |
287 |
+ echo |
288 |
+ elog "If you are new to mutt you may want to take a look at" |
289 |
+ elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
290 |
+ elog " https://wiki.gentoo.org/wiki/Mutt" |
291 |
+ echo |
292 |
+ else |
293 |
+ ewarn "The nntp and notmuch patches were dropped from this release." |
294 |
+ echo |
295 |
+ elog "Due to too much maintenance cost, the nntp and notmuch patches" |
296 |
+ elog "were dropped from this release. If you need support for any" |
297 |
+ elog "of these features, please consider using mail-client/neomutt." |
298 |
+ echo |
299 |
+ fi |
300 |
+ # try to warn user in case none of the crypto flags appear enabled |
301 |
+ if use !pgp-classic && use !smime-classic && use !gpgme ; then |
302 |
+ ewarn "Please note that crypto related USE-flags of Mutt have changed." |
303 |
+ ewarn "To comply with PMS, the following USE-flags were renamed:" |
304 |
+ ewarn "(see https://bugs.gentoo.org/695078)" |
305 |
+ ewarn " pgp_classic -> pgp-classic" |
306 |
+ ewarn " smime_classic -> smime-classic" |
307 |
+ echo |
308 |
+ fi |
309 |
+} |