On Sat 30/10/2021 17:20, Bjorn Ketelaars wrote:
> Diff below updates notmuch to 0.34, which brings some new features:
> https://git.notmuchmail.org/git?p=notmuch;a=blob;f=NEWS;h=d08183bf30eb696f7fafeb74ad8050972aefac4d;hb=HEAD
>
> For now notmuch is build *without* the optional new s-expression based
> query parser. Reason is that this feature relies on a new port (sfsexp
> [0]), which we currently do not have in ports. I have a WIP port of
> sfsexp but prefer to wait on a newer release of this library.
>
> Minor of SHARED_LIB requires a bump due to an addition.
>
> Tested on amd64.
>
> Comments/OK?
In the mean time a newer version of notmuch (0.34.1) has been released,
which fixes a potential use-after-free bug.
OK?
diff --git Makefile.inc Makefile.inc
index 96aed3962a0..7eb6a589f9f 100644
--- Makefile.inc
+++ Makefile.inc
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.6 2021/10/14 04:18:26 bket Exp $
-V = 0.33.2
+V = 0.34.1
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
diff --git notmuch/Makefile notmuch/Makefile
index ca8c7340633..b4027c3cdf3 100644
--- notmuch/Makefile
+++ notmuch/Makefile
@@ -6,7 +6,7 @@ COMMENT-emacs = Emacs bindings for notmuch
PKGNAME-main = notmuch-${V}
PKGNAME-emacs = notmuch-emacs-${V}
-SHARED_LIBS += notmuch 1.1
+SHARED_LIBS += notmuch 1.2
MULTI_PACKAGES = -main -emacs
DEBUG_PACKAGES = -main
diff --git notmuch/distinfo notmuch/distinfo
index 745ece3d8d0..00d8e40c5fa 100644
--- notmuch/distinfo
+++ notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.33.2.tar.xz) = JEiS9qtSqE9rATs4fNZlLUYe/9NrFO+eV2YEtYULLK4=
-SIZE (notmuch-0.33.2.tar.xz) = 733228
+SHA256 (notmuch-0.34.1.tar.xz) = RXrPfMSBUoCnawxKlcZIFbbX49nANCFo5tludB8x2BY=
+SIZE (notmuch-0.34.1.tar.xz) = 748444
diff --git notmuch/patches/patch-lib_Makefile_local
notmuch/patches/patch-lib_Makefile_local
index 4900bbc7329..4b032d84f2b 100644
--- notmuch/patches/patch-lib_Makefile_local
+++ notmuch/patches/patch-lib_Makefile_local
@@ -26,7 +26,7 @@ Index: lib/Makefile.local
endif
ifeq ($(LIBDIR_IN_LDCONFIG),1)
ifeq ($(DESTDIR),)
-@@ -73,19 +77,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
+@@ -74,19 +78,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
$(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a
parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules)
$(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a
parse-time-string/libparse-time-string.a
diff --git notmuch/pkg/PLIST-main notmuch/pkg/PLIST-main
index 461a4aa2f7f..c26d91f71d6 100644
--- notmuch/pkg/PLIST-main
+++ notmuch/pkg/PLIST-main
@@ -15,6 +15,7 @@ include/notmuch.h
@info info/notmuch-restore.info
@info info/notmuch-search-terms.info
@info info/notmuch-search.info
+@info info/notmuch-sexp-queries.info
@info info/notmuch-show.info
@info info/notmuch-tag.info
@info info/notmuch.info
@@ -38,6 +39,7 @@ include/notmuch.h
@man man/man5/notmuch-hooks.5
@man man/man7/notmuch-properties.7
@man man/man7/notmuch-search-terms.7
+@man man/man7/notmuch-sexp-queries.7
share/notmuch/
share/notmuch/bash_completion.d/
share/notmuch/bash_completion.d/notmuch
diff --git py-notmuch/distinfo py-notmuch/distinfo
index 745ece3d8d0..00d8e40c5fa 100644
--- py-notmuch/distinfo
+++ py-notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.33.2.tar.xz) = JEiS9qtSqE9rATs4fNZlLUYe/9NrFO+eV2YEtYULLK4=
-SIZE (notmuch-0.33.2.tar.xz) = 733228
+SHA256 (notmuch-0.34.1.tar.xz) = RXrPfMSBUoCnawxKlcZIFbbX49nANCFo5tludB8x2BY=
+SIZE (notmuch-0.34.1.tar.xz) = 748444
