diff options
author | wiz <wiz@pkgsrc.org> | 2014-07-03 15:01:46 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-07-03 15:01:46 +0000 |
commit | 12be8af8c894079d945a352da73394f1915c0b8f (patch) | |
tree | 4467bbb97f2181333ebd2f3f4b91a5192892f759 | |
parent | 18c4fad7aaefd9ba15d6b1a6e1e53c2ce1294732 (diff) | |
download | pkgsrc-12be8af8c894079d945a352da73394f1915c0b8f.tar.gz |
Update to 0.18.1:
Notmuch 0.18.1 (2014-06-25)
===========================
This is a bug fix and portability release.
Build System
------------
Add a workaround for systems without zlib.pc
Make emacs install robust against the non-existence of emacs
Put notmuch lib directory first in RPATH
Fix handling of html_static_path in sphinx
Both the python bindings and the main docs had spurious settings of
this variable.
Test Suite
----------
Use --quick when starting emacs
This avoids a hang in the T160-json tests.
Allow pending break points in atomicity script
This allows the atomicity tests to run on several more architectures/OSes.
Command-Line Interface
----------------------
To improve portability use fsync instead of fdatasync in
`notmuch-dump`. There should be no functional difference.
Library changes
---------------
Resurrect support for single-message mbox files
The removal introduced a bug with previously indexed single-message
mboxes. This support remains deprecated.
Fix for phrase indexing
There were several bugs where words intermingled from different
headers and MIME parts could match a single phrase query. This fix
will affect only newly indexed messages.
Emacs Interface
---------------
Make sure tagging on an empty query is harmless
Previously tagging an empty query could lead to tags being
unintentionally removed.
Notmuch 0.18 (2014-05-06)
=========================
Overview
--------
This new release includes some enhancements to searching for messages
by filesystem location (`folder:` and `path:` prefixes under *General*
below). Saved searches in *Emacs* have also been enhanced to allow
distinct search orders for each one. Another enhancement to the
*Emacs* interface is that replies to encrypted messages are now
encrypted, reducing the risk of unintentional information disclosure.
The default dump output format has changed to the more robust
`batch-tag` format. The previously deprecated parsing of single
message mboxes has been removed. For detailed release notes, see
below.
General
-------
The `folder:` search prefix now requires an exact match
The `folder:` prefix has been changed to search for email messages
by the exact, case sensitive maildir or MH folder name. Wildcard
matching (`folder:foo*`) is no longer supported. The new behaviour
allows for more accurate mail folder based searches, makes it
possible to search for messages in the top-level folder, and should
lead to less surprising results than the old behaviour. Users are
advised to see the `notmuch-search-terms` manual page for details,
and review how the change affects their existing `folder:` searches.
There is a new `path:` search prefix.
The new `path:` search prefix complements the `folder:` prefix. The
`path:` prefix searches for email messages that are in particular
directories within the mail store, optionally recursively using a
special syntax. See the `notmuch-search-terms` manual page for
details.
Notmuch database upgrade due to `folder:` and `path:` changes
The above mentioned changes to the `folder:` prefix and the addition
of `path:` prefix require a Notmuch database upgrade. This will be
done automatically, without prompting on the next time `notmuch new`
is run after the upgrade. The upgrade is not reversible, and the
upgraded database will not be readable by older versions of
Notmuch. As a safeguard, a database dump will be created in the
`.notmuch` directory before upgrading.
Library changes
---------------
Notmuch database upgrade
The libnotmuch consumers are reminded to handle database upgrades
properly, either by relying on running `notmuch new`, or checking
`notmuch_database_needs_upgrade()` and calling
`notmuch_database_upgrade()` as necessary. This has always been the
case, but in practise there have been no database upgrades in any
released version of Notmuch before now.
Support for indexing mbox files has been dropped
There has never been proper support for mbox files containing
multiple messages, and the support for single-message mbox files has
been deprecated since Notmuch 0.15. The support has now been
dropped, and all mbox files will be rejected during indexing.
Message header parsing changes
Notmuch previously had an internal parser for message headers. The
parser has now been dropped in favour of letting GMime parse both
the headers and the message MIME structure at the same pass. This is
mostly an internal change, but the GMime parser is stricter in its
interpretation of the headers. This may result in messages with
slightly malformed message headers being now rejected.
Command-Line Interface
----------------------
`notmuch dump` now defaults to `batch-tag` format
The old format is still available with `--format=sup`.
`notmuch new` has a --quiet option
This option suppresses the progress and summary reports.
`notmuch insert` respects maildir.synchronize_flags config option
Do not synchronize tags to maildir flags in `notmuch insert` if the
user does not want it.
The commands set consistent exit status codes on failures
The cli commands now consistently set exit status of 1 on failures,
except where explicitly otherwise noted. The notable expections are
the status codes for format version mismatches for commands that
support formatted output.
Bug fix for checking configured new.tags for invalid tags
`notmuch new` and `notmuch insert` now check the user configured
new.tags for invalid tags, and refuse to apply them, similar to
`notmuch tag`. Invalid tags are currently the empty string and tags
starting with `-`.
Emacs Interface
---------------
Init file
If the file pointed by new variable `notmuch-init-file` (typically
`~/.emacs.d/notmuch-config.el`) exists, it is loaded at the end of
`notmuch.el`. Users can put their personal notmuch emacs lisp based
configuration/customization items there instead of filling
`~/.emacs` with these.
Changed format for saved searches
The format for `notmuch-saved-searches` has changed, but old style
saved searches are still supported. The new style means that a saved
search can store the desired sort order for the search, and it can
store a separate query to use for generating the count notmuch
shows.
The variable is fully customizable and any configuration done
through customize should *just work*, with the additional options
mentioned above. For manual customization see the documentation for
`notmuch-saved-searches`.
IMPORTANT: a new style notmuch-saved-searches variable will break
previous versions of notmuch-emacs (even search will not work); to
fix remove the customization for notmuch-saved-searches.
If you have a custom saved search sort function (not unsorted or
alphabetical) then the sort function will need to be
modified. Replacing (car saved-search) by (notmuch-saved-search-get
saved-search :name) and (cdr saved-search) by
(notmuch-saved-search-get saved-search :query) should be sufficient.
The keys of `notmuch-tag-formats` are now regexps
Previously, the keys were literal strings. Customized settings of
`notmuch-tag-formats` will continue to work as before unless tags
contain regexp special characters like `.` or `*`.
Changed tags are now shown in the buffer
Previously tag changes made in a buffer were shown immediately. In
some cases (particularly automatic tag changes like marking read)
this made it hard to see what had happened (e.g., whether the
message had been unread).
The changes are now shown explicitly in the buffer: by default
deleted tags are displayed with red strike-through and added tags
are displayed underlined in green (inverse video is used for deleted
tags if the terminal does not support strike-through).
The variables `notmuch-tag-deleted-formats` and
`notmuch-tag-added-formats`, which have the same syntax as
`notmuch-tag-formats`, allow this to be customized.
Setting `notmuch-tag-deleted-formats` to `'((".*" nil))` and
`notmuch-tag-added-formats` to `'((".*" tag))` will give the old
behavior of hiding deleted tags and showing added tags identically
to tags already present.
Version variable
The new, build-time generated variable `notmuch-emacs-version` is used
to distinguish between notmuch cli and notmuch emacs versions.
The function `notmuch-hello-versions` (bound to 'v' in notmuch-hello
window) prints both notmuch cli and notmuch emacs versions in case
these differ from each other.
This is especially useful when using notmuch remotely.
Ido-completing-read initialization in Emacs 23
`ido-completing-read` in Emacs 23 versions 1 through 3 freezes unless
it is initialized. Defadvice-based *Ido* initialization is defined
for these Emacs versions.
Bug fix for saved searches with newlines in them
Split lines confuse `notmuch count --batch`, so we remove embedded
newlines before calling notmuch count.
Bug fixes for sender identities
Previously, Emacs would rewrite some sender identities in unexpected
and undesirable ways. Now it will use identities exactly as
configured in `notmuch-identities`.
Replies to encrypted messages will be encrypted by default
In the interest of maintaining confidentiality of communications,
the Notmuch Emacs interface now automatically adds the mml tag to
encrypt replies to encrypted messages. This should make it less
likely to accidentally reply to encrypted messages in plain text.
Reply pushes mark before signature
We push mark and set point on reply so that the user can easily cut
the quoted text. The mark is now pushed before the signature, if
any, instead of end of buffer so the signature is preserved.
Message piping uses the originating buffer's working directory
`notmuch-show-pipe-message` now uses the originating buffer's
current default directory instead of that of the `*notmuch-pipe*`
buffer's.
nmbug
-----
nmbug adds a `clone` command for setting up the initial repository and
uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
The `@{upstream}` change reduces ambiguity when fetching multiple
branches, but requires existing users update their `NMBGIT`
repository (usually `~/.nmbug`) to distinguish between local and
remote-tracking branches. The easiest way to do this is:
1. If you have any purely local commits (i.e. they aren't in the
nmbug repository on nmbug.tethera.net), push them to a remote
repository. We'll restore them from the backup in step 4.
2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
3. Use the new `clone` command to create a fresh clone:
nmbug clone http://nmbug.tethera.net/git/nmbug-tags.git
4. If you had local commits in step 1, add a remote for that
repository and fetch them into the new repository.
-rw-r--r-- | mail/notmuch/Makefile | 11 | ||||
-rw-r--r-- | mail/notmuch/PLIST | 34 | ||||
-rw-r--r-- | mail/notmuch/distinfo | 13 | ||||
-rw-r--r-- | mail/notmuch/patches/patch-aa | 17 | ||||
-rw-r--r-- | mail/notmuch/patches/patch-doc_Makefile.local | 15 | ||||
-rw-r--r-- | mail/notmuch/patches/patch-doc_prerst2man.py | 11 | ||||
-rw-r--r-- | mail/notmuch/patches/patch-notmuch-config.c | 57 |
7 files changed, 72 insertions, 86 deletions
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index a6e0d64e7fa..fb2484b25f3 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2014/01/09 12:15:23 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/07/03 15:01:46 wiz Exp $ -DISTNAME= notmuch-0.17 +DISTNAME= notmuch-0.18.1 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ @@ -9,14 +9,21 @@ HOMEPAGE= http://notmuchmail.org/ COMMENT= Mail indexer LICENSE= gnu-gpl-v3 +BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils + HAS_CONFIGURE= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config +MAKE_FLAGS+= PYTHONBIN=${PYTHONBIN} CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # as of 0.18 +.include "../../lang/python/application.mk" .include "../../mail/gmime24/buildlink3.mk" .include "../../textproc/xapian/buildlink3.mk" .include "../../devel/talloc/buildlink3.mk" +BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.5.2 +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST index c995160badb..e9171591c31 100644 --- a/mail/notmuch/PLIST +++ b/mail/notmuch/PLIST @@ -1,24 +1,24 @@ -@comment $NetBSD: PLIST,v 1.1 2014/01/09 12:15:23 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/07/03 15:01:46 wiz Exp $ bin/notmuch include/notmuch.h lib/libnotmuch.so lib/libnotmuch.so.3 lib/libnotmuch.so.3.1.0 -man/man1/notmuch-compact.1 -man/man1/notmuch-config.1 -man/man1/notmuch-count.1 -man/man1/notmuch-dump.1 -man/man1/notmuch-insert.1 -man/man1/notmuch-new.1 -man/man1/notmuch-reply.1 -man/man1/notmuch-restore.1 -man/man1/notmuch-search.1 -man/man1/notmuch-setup.1 -man/man1/notmuch-show.1 -man/man1/notmuch-tag.1 -man/man1/notmuch.1 -man/man5/notmuch-hooks.5 -man/man7/notmuch-search-terms.7 +man/man1/notmuch-compact.1.gz +man/man1/notmuch-config.1.gz +man/man1/notmuch-count.1.gz +man/man1/notmuch-dump.1.gz +man/man1/notmuch-insert.1.gz +man/man1/notmuch-new.1.gz +man/man1/notmuch-reply.1.gz +man/man1/notmuch-restore.1.gz +man/man1/notmuch-search.1.gz +man/man1/notmuch-setup.1.gz +man/man1/notmuch-show.1.gz +man/man1/notmuch-tag.1.gz +man/man1/notmuch.1.gz +man/man5/notmuch-hooks.5.gz +man/man7/notmuch-search-terms.7.gz share/emacs/site-lisp/coolj.el share/emacs/site-lisp/notmuch-address.el share/emacs/site-lisp/notmuch-crypto.el @@ -34,7 +34,7 @@ share/emacs/site-lisp/notmuch-query.el share/emacs/site-lisp/notmuch-show.el share/emacs/site-lisp/notmuch-tag.el share/emacs/site-lisp/notmuch-tree.el +share/emacs/site-lisp/notmuch-version.el share/emacs/site-lisp/notmuch-wash.el share/emacs/site-lisp/notmuch.el -share/examples/notmuch/bash_completion.d/notmuch share/examples/notmuch/zsh/functions/Completion/Unix/_notmuch diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index ee0e566558b..98bde9928d7 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1 2014/01/09 12:15:23 wiz Exp $ +$NetBSD: distinfo,v 1.2 2014/07/03 15:01:46 wiz Exp $ -SHA1 (notmuch-0.17.tar.gz) = 0fe14140126a0da04754f548edf7e7b135eeec86 -RMD160 (notmuch-0.17.tar.gz) = 3bc5635dabe9987ad0535ac6d76cb160eb2413ff -Size (notmuch-0.17.tar.gz) = 606710 bytes -SHA1 (patch-aa) = 905585b294983e88e04274e70e817c2ddc2a3dce -SHA1 (patch-notmuch-config.c) = 21aafdcfb3a53d29c3d0d37283fecef0194cefc5 +SHA1 (notmuch-0.18.1.tar.gz) = ad82d6d5355594c4cab3c6d28c70ae4993acbec9 +RMD160 (notmuch-0.18.1.tar.gz) = 2e4825029cce0a972bf7d2b4493657e4366e262c +Size (notmuch-0.18.1.tar.gz) = 634691 bytes +SHA1 (patch-aa) = d439fe1539c14524832e0059ad8201f8131e3b04 +SHA1 (patch-doc_Makefile.local) = 4bdae1a7cb16db7ffd60948b30a1b73fe73af8ea +SHA1 (patch-doc_prerst2man.py) = 66db50b64da9d0ccb4ec35cd9fb8327524e19af8 diff --git a/mail/notmuch/patches/patch-aa b/mail/notmuch/patches/patch-aa index aec2251c99d..06007b7386a 100644 --- a/mail/notmuch/patches/patch-aa +++ b/mail/notmuch/patches/patch-aa @@ -1,10 +1,19 @@ -$NetBSD: patch-aa,v 1.1 2014/01/09 12:15:23 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2014/07/03 15:01:46 wiz Exp $ Install completion files into example directory. ---- configure.orig 2013-08-03 11:29:40.000000000 +0000 +--- configure.orig 2014-05-06 07:27:29.000000000 +0000 +++ configure -@@ -668,10 +668,10 @@ HAVE_EMACS = ${have_emacs} +@@ -418,7 +418,7 @@ else + have_sphinx=0 + + printf "Checking if rst2man is available... " +- if rst2man -V > /dev/null 2>&1; then ++ if rst2man.py -V > /dev/null 2>&1; then + printf "Yes.\n" + have_rst2man=1 + else +@@ -824,10 +824,10 @@ HAVE_RST2MAN=${have_rst2man} desktop_dir = \$(prefix)/share/applications # The directory to which bash completions files should be installed @@ -15,5 +24,5 @@ Install completion files into example directory. -zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix} +zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/examples/notmuch/zsh/functions/Completion/Unix} - # Whether the getline function is available (if not, then notmuch will + # Whether the canonicalize_file_name function is available (if not, then notmuch will # build its own version) diff --git a/mail/notmuch/patches/patch-doc_Makefile.local b/mail/notmuch/patches/patch-doc_Makefile.local new file mode 100644 index 00000000000..d65a034978d --- /dev/null +++ b/mail/notmuch/patches/patch-doc_Makefile.local @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_Makefile.local,v 1.1 2014/07/03 15:01:46 wiz Exp $ + +--- doc/Makefile.local.orig 2014-05-06 07:27:29.000000000 +0000 ++++ doc/Makefile.local +@@ -7,8 +7,8 @@ SPHINXOPTS := -q + SPHINXBUILD = sphinx-build + DOCBUILDDIR := $(dir)/_build + +-prerst2man := python $(srcdir)/$(dir)/prerst2man.py +-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py ++prerst2man := ${PYTHONBIN} $(srcdir)/$(dir)/prerst2man.py ++mkdocdeps := ${PYTHONBIN} $(srcdir)/$(dir)/mkdocdeps.py + + # Internal variables. + ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir) diff --git a/mail/notmuch/patches/patch-doc_prerst2man.py b/mail/notmuch/patches/patch-doc_prerst2man.py new file mode 100644 index 00000000000..2d831b7b472 --- /dev/null +++ b/mail/notmuch/patches/patch-doc_prerst2man.py @@ -0,0 +1,11 @@ +$NetBSD: patch-doc_prerst2man.py,v 1.1 2014/07/03 15:01:46 wiz Exp $ + +--- doc/prerst2man.py.orig 2014-05-06 07:27:29.000000000 +0000 ++++ doc/prerst2man.py +@@ -59,5 +59,5 @@ for page in man_pages: + outfile.write("".join(lines)) + outfile.close() + +- system('set -x; rst2man {0} {1}/{2}.{3}' ++ system('set -x; rst2man.py {0} {1}/{2}.{3}' + .format(filename, outdir, page[0], page[4])) diff --git a/mail/notmuch/patches/patch-notmuch-config.c b/mail/notmuch/patches/patch-notmuch-config.c deleted file mode 100644 index aa06cfac66a..00000000000 --- a/mail/notmuch/patches/patch-notmuch-config.c +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-notmuch-config.c,v 1.1 2014/01/09 12:15:23 wiz Exp $ - -NULL as second argument for realpath() is only supported in glibc -and POSIX 2008. Work around this. See BUGS section for problems: -http://man7.org/linux/man-pages/man3/realpath.3.html - ---- notmuch-config.c.orig 2013-12-31 00:39:25.000000000 +0000 -+++ notmuch-config.c -@@ -23,6 +23,8 @@ - #include <pwd.h> - #include <netdb.h> - #include <assert.h> -+#include <sys/param.h> -+#include <stdlib.h> - - static const char toplevel_config_comment[] = - " .notmuch-config - Configuration file for the notmuch mail system\n" -@@ -444,7 +446,7 @@ int - notmuch_config_save (notmuch_config_t *config) - { - size_t length; -- char *data, *filename; -+ char *data, filename[MAXPATHLEN]; - GError *error = NULL; - - data = g_key_file_to_data (config->key_file, &length, NULL); -@@ -454,15 +456,9 @@ notmuch_config_save (notmuch_config_t *c - } - - /* Try not to overwrite symlinks. */ -- filename = realpath (config->filename, NULL); -- if (! filename) { -+ if (! realpath (config->filename, filename)) { - if (errno == ENOENT) { -- filename = strdup (config->filename); -- if (! filename) { -- fprintf (stderr, "Out of memory.\n"); -- g_free (data); -- return 1; -- } -+ strncpy(filename, config->filename, MAXPATHLEN); - } else { - fprintf (stderr, "Error canonicalizing %s: %s\n", config->filename, - strerror (errno)); -@@ -480,12 +476,10 @@ notmuch_config_save (notmuch_config_t *c - filename, error->message); - } - g_error_free (error); -- free (filename); - g_free (data); - return 1; - } - -- free (filename); - g_free (data); - return 0; - } |