Update mail/mutt to 1.5.24.
Update compressed patch to follow suit. Remove x-label option since patch hasn't been updated since 1.5.17 (2007). Comment out sidebar option since patch hasn't been updated yet. Changes: 1.5.24 contains several new features in addition to bug fixes, perhaps hinting it's past time to release 1.6.0. At the very least, the Mutt team would like to encourage everyone to consider this release as "very close to stable" and suggest anyone still using the 1.4 series please upgrade. A few changes were made to the suggested GPG and S/MIME configuration settings. Please take the time to review the UPDATING file, as well as the sample gpg.rc and smime.rc files under the contrib subdirectory. We'd like to thank everyone who contributed patches, bug reports, translation, feedback, documentation updates, and testing. We're grateful for all of your help in making this release happen.
This commit is contained in:
wiz
parent
085dd3d1d9
commit
09bb848fd3
8 changed files with 42 additions and 78 deletions
|
|
@ -1,13 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.172 2015/09/03 14:49:02 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.173 2015/09/03 21:04:34 wiz Exp $
|
||||
|
||||
DISTNAME= mutt-1.5.23
|
||||
PKGREVISION= 7
|
||||
DISTNAME= mutt-1.5.24
|
||||
CATEGORIES= mail
|
||||
MUTT_SITES= ftp://ftp.mutt.org/mutt/ \
|
||||
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
|
||||
ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
|
||||
ftp://ftp.fu-berlin.de/unix/mail/mutt/
|
||||
MASTER_SITES= ${MUTT_SITES:=devel/}
|
||||
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/
|
||||
|
||||
MAINTAINER= tonio@NetBSD.org
|
||||
HOMEPAGE= http://www.mutt.org/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.16 2015/09/03 14:49:02 wiz Exp $
|
||||
@comment $NetBSD: PLIST,v 1.17 2015/09/03 21:04:34 wiz Exp $
|
||||
bin/flea
|
||||
bin/mutt
|
||||
bin/mutt_dotlock
|
||||
|
|
@ -28,7 +28,6 @@ share/doc/mutt/README.SSL
|
|||
share/doc/mutt/TODO
|
||||
share/doc/mutt/advancedusage.html
|
||||
share/doc/mutt/applying-patches.txt
|
||||
${PLIST.compressed}share/doc/mutt/compressed-folders.html
|
||||
share/doc/mutt/configuration.html
|
||||
share/doc/mutt/devel-notes.txt
|
||||
share/doc/mutt/gettingstarted.html
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
$NetBSD: distinfo,v 1.37 2015/09/03 14:49:02 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.38 2015/09/03 21:04:34 wiz Exp $
|
||||
|
||||
SHA1 (mutt-1.5.23.tar.gz) = 8ac821d8b1e25504a31bf5fda9c08d93a4acc862
|
||||
RMD160 (mutt-1.5.23.tar.gz) = 2476a9e202ab1cd20a512253246e37538e0aad5a
|
||||
Size (mutt-1.5.23.tar.gz) = 3782032 bytes
|
||||
SHA1 (mutt-1.5.24.tar.gz) = 38a2da5eb01ff83a90a2caee28fa2e95dbfe6898
|
||||
RMD160 (mutt-1.5.24.tar.gz) = 7fe7e653c27c9b580f958493638c1248d0ad5591
|
||||
Size (mutt-1.5.24.tar.gz) = 3897115 bytes
|
||||
SHA1 (patch-1.5.24.rr.compressed.gz) = 8da54323dfc9c1049bf0411db2f552593793e99f
|
||||
RMD160 (patch-1.5.24.rr.compressed.gz) = 2bf71a26de195ce11ed4ffa25403363cab7c9b72
|
||||
Size (patch-1.5.24.rr.compressed.gz) = 10019 bytes
|
||||
SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
|
||||
SHA1 (patch-ab) = 857799206db0784672ad9042799eb12703711a31
|
||||
SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
|
||||
SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
|
||||
SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
|
||||
SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
|
||||
SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
|
||||
SHA1 (patch-af) = edc107c535789919ba2cda5f81a4b640b6100b91
|
||||
SHA1 (patch-ag) = 6633e7485c948433f9122a649fdf3a548197eced
|
||||
SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
|
||||
SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
|
||||
SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
|
||||
SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
|
||||
|
|
@ -17,5 +20,3 @@ SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
|
|||
SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
|
||||
SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
|
||||
SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
|
||||
SHA1 (patch-sendlib.c) = 7394a7814f3986d5fc82c6a5dab76d9b85212c0b
|
||||
SHA1 (patch-1.5.23.rr.compressed.gz) = 59cfc764e2878efafb0fa16ae17e6a733efac958
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.14 2015/09/03 14:49:02 wiz Exp $
|
||||
# $NetBSD: options.mk,v 1.15 2015/09/03 21:04:34 wiz Exp $
|
||||
|
||||
# Global and legacy options
|
||||
|
||||
|
|
@ -9,9 +9,11 @@ PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
|
|||
PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
|
||||
PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
|
||||
PKG_SUPPORTED_OPTIONS+= mutt-sidebar
|
||||
# Comment the following line out on updates.
|
||||
#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
|
||||
PKG_SUGGESTED_OPTIONS= ssl smime curses
|
||||
# un-comment out the following lines whenever updating distinfo
|
||||
# and patches are up-to-date
|
||||
#PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox
|
||||
#PKG_SUGGESTED_OPTIONS+= mutt-sidebar
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
|
|
@ -115,7 +117,6 @@ CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
|
|||
CONFIGURE_ARGS+= --disable-hcache
|
||||
.endif
|
||||
|
||||
PLIST_VARS+= compressed
|
||||
###
|
||||
### Compressed mail boxes
|
||||
###
|
||||
|
|
@ -131,7 +132,6 @@ SUBST_FILES.compress= Makefile.in
|
|||
SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
|
||||
SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,'
|
||||
SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
|
||||
PLIST.compressed= yes
|
||||
# add xsltproc to be able to regenerate the documentation
|
||||
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
|
||||
.endif
|
||||
|
|
@ -149,21 +149,13 @@ CONFIGURE_ARGS+= --disable-smtp
|
|||
### Sidebar support
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Mmutt-sidebar)
|
||||
# http://www.lunar-linux.org/mutt-sidebar/
|
||||
PATCH_SITES+= http://lunar-linux.org/~tchan/mutt/
|
||||
PATCHFILES+= patch-1.5.23.sidebar.20140412.txt
|
||||
PATCH_DIST_STRIP= -p1
|
||||
PATCH_FUZZ_FACTOR= -F1
|
||||
.endif
|
||||
|
||||
###
|
||||
### X-Label header support
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Mmutt-xlabel)
|
||||
PATCH_SITES= http://home.uchicago.edu/~dgc/sw/mutt/
|
||||
PATCHFILES+= patch-1.5.17.dgc.xlabel_ext.9
|
||||
PATCH_DIST_STRIP= -p1
|
||||
.endif
|
||||
|
||||
###
|
||||
### Internationalized Domain Names
|
||||
###
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ab,v 1.16 2015/09/03 14:49:02 wiz Exp $
|
||||
$NetBSD: patch-ab,v 1.17 2015/09/03 21:04:34 wiz Exp $
|
||||
|
||||
--- Makefile.in.orig 2013-10-18 06:49:17.000000000 +0100
|
||||
+++ Makefile.in 2013-10-18 10:50:46.000000000 +0100
|
||||
@@ -109,7 +109,7 @@
|
||||
--- Makefile.in.orig 2015-08-30 17:24:26.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -110,7 +110,7 @@ CONFIG_CLEAN_FILES = intl/Makefile hcach
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
|
||||
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.16 2015/09/03 14:49:02 wiz Exp $
|
|||
base64.$(OBJEXT) browser.$(OBJEXT) buffy.$(OBJEXT) \
|
||||
color.$(OBJEXT) crypt.$(OBJEXT) cryptglue.$(OBJEXT) \
|
||||
commands.$(OBJEXT) complete.$(OBJEXT) compose.$(OBJEXT) \
|
||||
@@ -325,7 +325,7 @@
|
||||
@@ -329,7 +329,7 @@ DATADIRNAME = @DATADIRNAME@
|
||||
DBX = @DBX@
|
||||
DEBUGGER = @DEBUGGER@
|
||||
DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
|
|
@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.16 2015/09/03 14:49:02 wiz Exp $
|
|||
-DHAVE_CONFIG_H=1
|
||||
|
||||
DEPDIR = @DEPDIR@
|
||||
@@ -786,6 +786,7 @@
|
||||
@@ -799,6 +799,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2231.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc3676.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822.Po@am__quote@
|
||||
|
|
@ -28,15 +28,15 @@ $NetBSD: patch-ab,v 1.16 2015/09/03 14:49:02 wiz Exp $
|
|||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_asprintf.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/score.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
|
||||
@@ -1313,11 +1314,6 @@
|
||||
@@ -1338,11 +1339,6 @@ install-exec-hook:
|
||||
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
|
||||
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
|
||||
fi
|
||||
- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
|
||||
- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
|
||||
- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
|
||||
- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
|
||||
- chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
|
||||
- chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
|
||||
- { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
|
||||
- fi
|
||||
|
||||
install-data-local:
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
|
||||
$(MKDIR_P) $(DESTDIR)$(sysconfdir)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-ad,v 1.10 2015/09/03 14:49:02 wiz Exp $
|
||||
$NetBSD: patch-ad,v 1.11 2015/09/03 21:04:34 wiz Exp $
|
||||
|
||||
--- contrib/Makefile.in.orig 2006-08-14 16:09:28.000000000 +0200
|
||||
--- contrib/Makefile.in.orig 2015-08-30 17:24:26.000000000 +0000
|
||||
+++ contrib/Makefile.in
|
||||
@@ -365,21 +365,20 @@ uninstall-am: uninstall-info-am uninstal
|
||||
@@ -459,21 +459,20 @@ uninstall-am: uninstall-local
|
||||
|
||||
|
||||
install-data-local:
|
||||
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv
|
||||
- $(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
|
||||
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv
|
||||
for f in $(SAMPLES) ; do \
|
||||
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \
|
||||
+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(sysconfdir); \
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
$NetBSD: patch-ag,v 1.8 2015/09/03 14:49:02 wiz Exp $
|
||||
$NetBSD: patch-ag,v 1.9 2015/09/03 21:04:34 wiz Exp $
|
||||
|
||||
--- doc/Makefile.in.orig 2010-08-25 16:31:48.000000000 +0000
|
||||
--- doc/Makefile.in.orig 2015-08-30 17:24:26.000000000 +0000
|
||||
+++ doc/Makefile.in
|
||||
@@ -532,8 +532,8 @@ install-data-local: makedoc-all instdoc
|
||||
test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
|
||||
@@ -642,8 +642,8 @@ install-data-local: makedoc-all instdoc
|
||||
test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \
|
||||
$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
|
||||
./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
|
||||
- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
|
||||
- ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
|
||||
+ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
|
||||
+ ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
|
||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
|
||||
$(MKDIR_P) $(DESTDIR)$(docdir)
|
||||
for f in $(topsrcdir_DOCFILES) ; do \
|
||||
$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
$NetBSD: patch-sendlib.c,v 1.1 2015/09/03 14:49:02 wiz Exp $
|
||||
|
||||
Fix CVE-2014-9116 using the upstream patch from
|
||||
http://dev.mutt.org/trac/changeset/0aebf1df43598b442ac75ae4fe17875351854db0
|
||||
|
||||
--- sendlib.c.orig 2014-03-12 16:03:45.000000000 +0000
|
||||
+++ sendlib.c
|
||||
@@ -1814,7 +1814,14 @@ static int write_one_header (FILE *fp, i
|
||||
{
|
||||
tagbuf = mutt_substrdup (start, t);
|
||||
/* skip over the colon separating the header field name and value */
|
||||
- t = skip_email_wsp(t + 1);
|
||||
+ ++t;
|
||||
+
|
||||
+ /* skip over any leading whitespace (WSP, as defined in RFC5322)
|
||||
+ * NOTE: skip_email_wsp() does the wrong thing here.
|
||||
+ * See tickets 3609 and 3716. */
|
||||
+ while (*t == ' ' || *t == '\t')
|
||||
+ t++;
|
||||
+
|
||||
valbuf = mutt_substrdup (t, end);
|
||||
}
|
||||
dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
|
||||
Loading…
Reference in a new issue