diff options
author | schnoebe <schnoebe@pkgsrc.org> | 2014-09-06 16:07:43 +0000 |
---|---|---|
committer | schnoebe <schnoebe@pkgsrc.org> | 2014-09-06 16:07:43 +0000 |
commit | 89631dfd572abd4cb7c96b81cf1d1ff13d4bb442 (patch) | |
tree | 6b533ca4f2766b9af23250442e88191ab0e6d40f /mail | |
parent | 5056e9543c17525f1772a7d813ae5ff66c67e04e (diff) | |
download | pkgsrc-89631dfd572abd4cb7c96b81cf1d1ff13d4bb442.tar.gz |
Fixes PR pkg/49166
Contributed by: Leonardo Taccari <iamleot@gmail.com>
Update mail/nmh to 1.6.
Changes:
The biggest changes in this release are in the arena of MIME handling.
Specifically relating to MIME composition and display. On the
composition front, mhbuild(1) will now automatically be run by send(1)
for all drafts. Specifically, mhbuild is now run with the new -auto
flag, which will suppress the processing of mhbuild directives and cause
mhbuild to silently exit if the draft is already MIME-formatted. When
invoking mhbuild manually via the "mime" command at the WhatNow? prompt,
mhbuild will behave as before and process mhbuild directives.
In both cases (automatic and manual invocation) mhbuild will encode email
headers according to RFC-2047 rules. Mhbuild also will use RFC 2231
encoding rules for MIME parameters when appropriate. In addition, the
attach system has been substantially reworked; the new header name is
now "Attach" (to better align with other MUA behavior) and cannot be
changed by the end-user. The existing "attach" command simply adds
the filename(s) to the draft in new Attach: headers, and the actual
file processing is done by mhbuild; this attachment processing will
take place in either automatic or manual mode.
On the display front, mhshow(1) will now automatically convert text
into the user's native character set using iconv, if nmh was built
with iconv support. Also, mhshow will now by default only display
text content that was not marked as an attachment. By default all
displayed content wll be run under one pager, as opposed to individual
pagers for each part as was in the past. Non-displayed parts will be
indicated using a marker string, which can be customized by a new
mh-format(5) string.
All nmh utilites now understand RFC 2231-encoded MIME parameters and
will automatically convert the encoded parameters into the native
character set, when appropriate (again, assuming nmh was built with
iconv support).
In other changes, sequence files are now locked using transactional
locks: locks that are held across sequence file reading, modification,
and writing. The locking algorithm used for spool files and nmh data
files is now runtime configurable.
For people that struggle with mh-format(5) files, a new utility for testing
them has been developed: fmttest(1). It includes the ability to trace the
execution of format instructions.
For users that wish to use Unix utilities on their mail, a new utility
to transform MIME messages to more easily-digestable format is now
available: mhfixmsg(1). It supports a number of options to control
the message transformation.
For users of spost(8), the support for spost has been rolled into post(8)
under a new sendmail/pipe MTS. A shell script emulating the old behavior
of spost has been provided.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/nmh/Makefile | 26 | ||||
-rw-r--r-- | mail/nmh/PLIST | 21 | ||||
-rw-r--r-- | mail/nmh/distinfo | 18 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ba | 10 | ||||
-rw-r--r-- | mail/nmh/patches/patch-bb | 11 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ca | 66 | ||||
-rw-r--r-- | mail/nmh/patches/patch-cd | 8 | ||||
-rw-r--r-- | mail/nmh/patches/patch-uip_folder.c | 26 |
8 files changed, 74 insertions, 112 deletions
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index 3e65e57b619..aab82ba3579 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.83 2014/02/12 23:18:08 tron Exp $ +# $NetBSD: Makefile,v 1.84 2014/09/06 16:07:43 schnoebe Exp $ -DISTNAME= nmh-1.5 -PKGREVISION= 4 +DISTNAME= nmh-1.6 CATEGORIES= mail MASTER_SITES= http://savannah.nongnu.org/download/nmh/ @@ -37,28 +36,9 @@ NMH_MTA?= smtp GNU_CONFIGURE= yes GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/nmh -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --enable-nmh-pop +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q} -.if defined(NMH_EDITOR) -CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR:Q} -.endif - -.if defined(NMH_PAGER) -CONFIGURE_ARGS+= --with-pager=${NMH_PAGER:Q} -.endif - -.if defined(KERBEROS) -PKG_USE_KERBEROS= yes -.if ${OPSYS} == "NetBSD" -LIBS+= -lroken -lcrypt -lcom_err -.endif -CONFIGURE_ARGS+= --with-krb4 -.else -CONFIGURE_ARGS+= --without-krb4 -.endif - DOCDIR= share/doc/nmh EGDIR= ${PREFIX}/share/examples/nmh INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} diff --git a/mail/nmh/PLIST b/mail/nmh/PLIST index 5388bc15fdf..c9ad68ee7bb 100644 --- a/mail/nmh/PLIST +++ b/mail/nmh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2012/07/27 19:28:58 drochner Exp $ +@comment $NetBSD: PLIST,v 1.9 2014/09/06 16:07:43 schnoebe Exp $ bin/ali bin/anno bin/burst @@ -6,6 +6,7 @@ bin/comp bin/dist bin/flist bin/flists +bin/fmttest bin/fnext bin/folder bin/folders @@ -15,6 +16,7 @@ bin/inc bin/install-mh bin/mark bin/mhbuild +bin/mhfixmsg bin/mhlist bin/mhmail bin/mhn @@ -48,6 +50,7 @@ libexec/nmh/dp libexec/nmh/fmtdump libexec/nmh/mhl libexec/nmh/mhtest +libexec/nmh/mkstemp libexec/nmh/post libexec/nmh/rcvdist libexec/nmh/rcvpack @@ -63,6 +66,7 @@ man/man1/comp.1 man/man1/dist.1 man/man1/flist.1 man/man1/flists.1 +man/man1/fmttest.1 man/man1/fnext.1 man/man1/folder.1 man/man1/folders.1 @@ -71,8 +75,9 @@ man/man1/fprev.1 man/man1/inc.1 man/man1/install-mh.1 man/man1/mark.1 -man/man1/mh-chart.1 +man/man1/mh-mkstemp.1 man/man1/mhbuild.1 +man/man1/mhfixmsg.1 man/man1/mhl.1 man/man1/mhlist.1 man/man1/mhmail.1 @@ -85,7 +90,6 @@ man/man1/msgchk.1 man/man1/msh.1 man/man1/new.1 man/man1/next.1 -man/man1/nmh.1 man/man1/packf.1 man/man1/pick.1 man/man1/prev.1 @@ -109,6 +113,7 @@ man/man1/whatnow.1 man/man1/whom.1 man/man5/mh-alias.5 man/man5/mh-draft.5 +man/man5/mh-folders.5 man/man5/mh-format.5 man/man5/mh-mail.5 man/man5/mh-profile.5 @@ -116,6 +121,9 @@ man/man5/mh-sequence.5 man/man5/mh-tailor.5 man/man5/mh_profile.5 man/man5/mts.conf.5 +man/man7/mh-chart.7 +man/man7/mh-mime.7 +man/man7/nmh.7 man/man8/ap.8 man/man8/conflict.8 man/man8/dp.8 @@ -135,6 +143,7 @@ share/doc/nmh/README share/doc/nmh/README-ATTACHMENTS share/doc/nmh/README-HOOKS share/doc/nmh/README-components +share/doc/nmh/README-iCalendar share/doc/nmh/README.SASL share/doc/nmh/README.about share/doc/nmh/README.developers @@ -142,8 +151,9 @@ share/doc/nmh/README.manpages share/doc/nmh/TODO share/doc/nmh/VERSION share/doc/nmh/contrib/build_nmh -share/doc/nmh/contrib/nmh.spec +share/doc/nmh/contrib/ml share/doc/nmh/contrib/replyfilter +share/doc/nmh/contrib/vpick share/examples/nmh/MailAliases share/examples/nmh/components share/examples/nmh/digestcomps @@ -156,6 +166,7 @@ share/examples/nmh/mhl.forward share/examples/nmh/mhl.headers share/examples/nmh/mhl.reply share/examples/nmh/mhn.defaults +share/examples/nmh/mhshow.marker share/examples/nmh/mts.conf share/examples/nmh/rcvdistcomps share/examples/nmh/rcvdistcomps.outbox @@ -163,7 +174,9 @@ share/examples/nmh/replcomps share/examples/nmh/replgroupcomps share/examples/nmh/scan.MMDDYY share/examples/nmh/scan.YYYYMMDD +share/examples/nmh/scan.curses share/examples/nmh/scan.default +share/examples/nmh/scan.highlighted share/examples/nmh/scan.mailx share/examples/nmh/scan.nomime share/examples/nmh/scan.size diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo index 65bd0841d12..bbd403211fb 100644 --- a/mail/nmh/distinfo +++ b/mail/nmh/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2012/08/31 00:50:04 schnoebe Exp $ +$NetBSD: distinfo,v 1.17 2014/09/06 16:07:43 schnoebe Exp $ -SHA1 (nmh-1.5.tar.gz) = 9d8c034206f793d6d796b514c9a8242422f0d4f7 -RMD160 (nmh-1.5.tar.gz) = 12c6aae9c02c5895593e4d5bff95a061c71b623c -Size (nmh-1.5.tar.gz) = 935919 bytes -SHA1 (patch-ba) = 380baae827368e97b03691b5bf2fd2c83123209a -SHA1 (patch-bb) = 8ff2a2b8a7a79e0b38b7d8a2cb0266dccd66af7e -SHA1 (patch-ca) = 756dfb664a6fb51f8fe5024f2fef13c9d9175acb -SHA1 (patch-cd) = 9ce049cc2861d13b89fe38259921640d5733924e -SHA1 (patch-uip_folder.c) = ab3c40af88cda668f98ce14440e3febabdae479d +SHA1 (nmh-1.6.tar.gz) = d424a7520c85abfdbd492f70cdae7fce51a88a7f +RMD160 (nmh-1.6.tar.gz) = 21efdf51df83f310ceac985cdc02b709d7edddf7 +Size (nmh-1.6.tar.gz) = 1197272 bytes +SHA1 (patch-ba) = da39a3ee5e6b4b0d3255bfef95601890afd80709 +SHA1 (patch-bb) = da39a3ee5e6b4b0d3255bfef95601890afd80709 +SHA1 (patch-ca) = ebbd0c463bda8d67734c06d7ed75d5ab2a51cfa2 +SHA1 (patch-cd) = 2576f728e8d55cdbe533ae5fc05eac0cf5413ad4 +SHA1 (patch-uip_folder.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709 diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba index 355acc6af61..e69de29bb2d 100644 --- a/mail/nmh/patches/patch-ba +++ b/mail/nmh/patches/patch-ba @@ -1,10 +0,0 @@ -$NetBSD: patch-ba,v 1.7 2012/07/27 19:29:01 drochner Exp $ - -see http://lists.nongnu.org/archive/html/nmh-workers/2012-07/msg00044.html - ---- etc/rcvdistcomps.orig 2010-12-02 21:15:50.000000000 +0000 -+++ etc/rcvdistcomps -@@ -1,2 +1,3 @@ -+%(void(localmbox))%(void(width))%(putaddr Resent-From: ) - %(lit)%(formataddr{addresses})\ - %<(nonnull)%(void(width))%(putaddr Resent-To: )\n%> diff --git a/mail/nmh/patches/patch-bb b/mail/nmh/patches/patch-bb index b0230048e28..e69de29bb2d 100644 --- a/mail/nmh/patches/patch-bb +++ b/mail/nmh/patches/patch-bb @@ -1,11 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2012/07/27 19:29:02 drochner Exp $ - -see http://lists.nongnu.org/archive/html/nmh-workers/2012-07/msg00044.html - ---- etc/rcvdistcomps.outbox.orig 2010-12-02 21:15:50.000000000 +0000 -+++ etc/rcvdistcomps.outbox -@@ -1,3 +1,4 @@ -+%(void(localmbox))%(void(width))%(putaddr Resent-From: ) - %(lit)%(formataddr{addresses})\ - %<(nonnull)%(void(width))%(putaddr Resent-To: )\n%>\ - Resent-Fcc: outbox diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca index f11bb4f4735..6178114c39d 100644 --- a/mail/nmh/patches/patch-ca +++ b/mail/nmh/patches/patch-ca @@ -1,46 +1,62 @@ -$NetBSD: patch-ca,v 1.7 2012/07/27 19:29:02 drochner Exp $ +$NetBSD: patch-ca,v 1.8 2014/09/06 16:07:43 schnoebe Exp $ install config files into share/examples ---- Makefile.in.orig 2012-06-11 04:14:07.000000000 +0000 +--- Makefile.in.orig 2014-06-15 20:34:16.000000000 +0000 +++ Makefile.in -@@ -644,6 +644,7 @@ sharedstatedir = @sharedstatedir@ - smtpservers = @smtpservers@ +@@ -819,6 +819,7 @@ smtpservers = @smtpservers@ srcdir = @srcdir@ + supported_locks = @supported_locks@ sysconfdir = @sysconfdir@ +egdir = @prefix@/share/examples/nmh target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -@@ -3569,12 +3570,12 @@ uninstall-dist_docDATA: - done +@@ -4030,18 +4031,18 @@ uninstall-dist_docDATA: + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)" - @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ ++ @list='$(dist_sysconf_DATA)'; test -n "$(egdir)" || list=; \ + if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ + fi; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ -- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ -+ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \ -+ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ done uninstall-dist_sysconfDATA: -@@ -3586,12 +3587,12 @@ uninstall-dist_sysconfDATA: - done +@@ -4051,18 +4052,18 @@ uninstall-dist_sysconfDATA: + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)" - @list='$(sysconf_DATA)'; for p in $$list; do \ +- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ ++ @list='$(sysconf_DATA)'; test -n "$(egdir)" || list=; \ + if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ + fi; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ -- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ -+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \ -+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ done uninstall-sysconfDATA: diff --git a/mail/nmh/patches/patch-cd b/mail/nmh/patches/patch-cd index 13e3f1044a7..92e378130be 100644 --- a/mail/nmh/patches/patch-cd +++ b/mail/nmh/patches/patch-cd @@ -1,11 +1,11 @@ -$NetBSD: patch-cd,v 1.6 2012/07/27 19:29:02 drochner Exp $ +$NetBSD: patch-cd,v 1.7 2014/09/06 16:07:43 schnoebe Exp $ make sure a time_t fits in ---- sbr/fmt_scan.c.orig 2012-06-11 04:06:19.000000000 +0000 +--- sbr/fmt_scan.c.orig 2014-06-15 20:30:40.000000000 +0000 +++ sbr/fmt_scan.c -@@ -298,7 +298,7 @@ fmt_scan (struct format *format, char *s - unsigned char *str = NULL; +@@ -371,7 +371,7 @@ fmt_scan (struct format *format, char *s + char *savestr = NULL, *str = NULL; char buffer[BUFSIZ], buffer2[BUFSIZ]; int i, c, ljust, n; - int value = 0; diff --git a/mail/nmh/patches/patch-uip_folder.c b/mail/nmh/patches/patch-uip_folder.c index c1bcdf74cc9..e69de29bb2d 100644 --- a/mail/nmh/patches/patch-uip_folder.c +++ b/mail/nmh/patches/patch-uip_folder.c @@ -1,26 +0,0 @@ -$NetBSD: patch-uip_folder.c,v 1.1 2012/08/31 00:50:05 schnoebe Exp $ - -Promote the changing of directory to restore the functionality of -``folder -r'' - -Reported as 37230 (https://savannah.nongnu.org/bugs/index.php?37230) - ---- uip/folder.c.orig 2012-06-11 04:06:19.000000000 +0000 -+++ uip/folder.c -@@ -341,13 +341,13 @@ main (int argc, char **argv) - /* - * Scan the folders - */ -+ /* change directory to base of nmh directory for crawl_folders */ -+ if (chdir (nmhdir) == NOTOK) -+ adios (nmhdir, "unable to change directory to"); - if (all || ftotal > 0) { - /* - * If no folder is given, do them all - */ -- /* change directory to base of nmh directory for crawl_folders */ -- if (chdir (nmhdir) == NOTOK) -- adios (nmhdir, "unable to change directory to"); - if (!argfolder) { - if (msg) - admonish (NULL, "no folder given for message %s", msg); |