Below is a diff to update the recently added mail/notmuch to 0.30.
changes (from upstream):
????????????????????????????????????????????????????????????????????????
What's new in notmuch 0.30
=========================
S/MIME
------
Handle S/MIME (PKCS#7) messages -- one-part signed messages, encrypted
messages, and multilayer messages. Treat them symmetrically to
OpenPGP messages. This includes handling protected headers
gracefully.
If you're using Notmuch with S/MIME, you currently need to configure
gpgsm appropriately.
Mixed-up MIME Repair
--------------------
Detect and automatically repair a common form of message mangling
created by Microsoft Exchange (see index.repaired=mixedup in
notmuch-properties(7)).
Protected Headers
-----------------
Avoid indexing the legacy-display part of an encrypted message that
has protected headers (see
index.repaired=skip-protected-headers-legacy-display in
notmuch-properties(7)).
Python
------
Drop support for python2, focus on python3.
Introduce new CFFI-based python bindings in the python module named
"notmuch2". Officially deprecate (but still support) the older
"notmuch" module.
Dependencies
------------
Support for Xapian 1.2 is removed. The minimum supported version of
Xapian is now 1.4.0.
????????????????????????????????????????????????????????????????????????
In particular I only kept the python3 flavor for the python bindings.
result of /usr/src/lib/check_sym (although mail/notmuch is still a leaf
port):
????????????????????????????????????????????????????????????????????????
oldlibnotmuch.so.0.0 --> lib/libnotmuch.so.0.0
No dynamic export changes
External reference changes:
added:
g_mime_application_pkcs7_mime_decrypt
g_mime_application_pkcs7_mime_get_smime_type
g_mime_application_pkcs7_mime_get_type
g_mime_application_pkcs7_mime_verify
g_mime_multipart_encrypted_new
g_mime_multipart_insert
g_mime_object_set_content_type_parameter
g_mime_text_part_get_text
g_mime_text_part_get_type
????????????????????????????????????????????????????????????????????????
All tests pass except for the "unicode yen sign" ones, as expected (see
https://marc.info/?l=openbsd-ports&m=158706294808158). The way the
--gzip option for "notmuch dump" is removed (see explanation in previous
url) is now slightly simpler because macros around gzprintf/gzputs were
added upstream.
diff -uNpr /usr/ports/mail/notmuch/Makefile
/build/usr/ports/mail/notmuch/Makefile
--- /usr/ports/mail/notmuch/Makefile Fri May 15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/Makefile Tue Jul 14 13:21:11 2020
@@ -2,7 +2,6 @@
SUBDIR =
SUBDIR += notmuch
-SUBDIR += py-notmuch
SUBDIR += py-notmuch,python3
.include <bsd.port.subdir.mk>
diff -uNpr /usr/ports/mail/notmuch/Makefile.inc
/build/usr/ports/mail/notmuch/Makefile.inc
--- /usr/ports/mail/notmuch/Makefile.inc Fri May 15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/Makefile.inc Tue Jul 14 13:28:15 2020
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
-V = 0.29.3
+V = 0.30
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
diff -uNpr /usr/ports/mail/notmuch/notmuch/Makefile
/build/usr/ports/mail/notmuch/notmuch/Makefile
--- /usr/ports/mail/notmuch/notmuch/Makefile Tue May 19 22:45:49 2020
+++ /build/usr/ports/mail/notmuch/notmuch/Makefile Tue Jul 14 21:13:32 2020
@@ -14,7 +14,7 @@ DEBUG_PACKAGES = -main
COMPILER= base-clang ports-gcc
WANTLIB-main += ${COMPILER_LIBCXX} c glib-2.0 gmime-3.0
-WANTLIB-main += gobject-2.0 intl m talloc xapian z
+WANTLIB-main += gobject-2.0 intl m pthread talloc xapian z
LIB_DEPENDS = databases/xapian-core \
devel/libtalloc \
diff -uNpr /usr/ports/mail/notmuch/notmuch/distinfo
/build/usr/ports/mail/notmuch/notmuch/distinfo
--- /usr/ports/mail/notmuch/notmuch/distinfo Fri May 15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/distinfo Tue Jul 14 13:28:38 2020
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.29.3.tar.xz) = 1fcEuacjleQzA96bH02OFN0nvzZG/bs3S7Pbt9FQ3DU=
-SIZE (notmuch-0.29.3.tar.xz) = 660536
+SHA256 (notmuch-0.30.tar.xz) = Xjuqb+EdZcZ+Jq5Ii+EbMguuBOM2rMnGRiH340SQlvo=
+SIZE (notmuch-0.30.tar.xz) = 711904
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-configure
/build/usr/ports/mail/notmuch/notmuch/patches/patch-configure
--- /usr/ports/mail/notmuch/notmuch/patches/patch-configure Sat May 16
13:43:51 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-configure Tue Jul
14 19:43:42 2020
@@ -3,16 +3,25 @@ $OpenBSD: patch-configure,v 1.2 2020/05/16 11:43:51 st
Index: configure
--- configure.orig
+++ configure
-@@ -533,7 +533,7 @@ EOF
+@@ -518,7 +518,7 @@ EOF
printf 'No.\nCould not make tempdir for testing session-key
support.\n'
errors=$((errors + 1))
elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c
${gmime_ldflags} -o _check_session_keys \
-- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import <
test/gnupg-secret-key.asc \
-+ && GNUPGHOME=${TEMP_GPG} gpg2 --batch --quiet --import <
test/gnupg-secret-key.asc \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import <
"$srcdir"/test/gnupg-secret-key.asc \
++ && GNUPGHOME=${TEMP_GPG} gpg2 --batch --quiet --import <
"$srcdir"/test/gnupg-secret-key.asc \
&& SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
&& [ $SESSION_KEY =
9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
then
-@@ -588,9 +588,9 @@ if ! pkg-config --exists zlib; then
+@@ -669,7 +669,7 @@ EOF
+ printf 'No.\nCould not make tempdir for testing signature
verification when decrypting with session keys.\n'
+ errors=$((errors + 1))
+ elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c
${gmime_ldflags} -o _verify_sig_with_session_key \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import <
"$srcdir"/test/gnupg-secret-key.asc \
++ && GNUPGHOME=${TEMP_GPG} gpg2 --batch --quiet --import <
"$srcdir"/test/gnupg-secret-key.asc \
+ && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
+ then
+ if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
+@@ -721,9 +721,9 @@ if ! pkg-config --exists zlib; then
rm -f compat/gen_zlib_pc
fi
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-doc_Makefile_local
/build/usr/ports/mail/notmuch/notmuch/patches/patch-doc_Makefile_local
--- /usr/ports/mail/notmuch/notmuch/patches/patch-doc_Makefile_local Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-doc_Makefile_local
Tue Jul 14 19:43:42 2020
@@ -7,8 +7,8 @@ Index: doc/Makefile.local
# You can set these variables from the command line.
SPHINXOPTS := -q
--SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} WITH_EMACS=${WITH_EMACS} sphinx-build
-+SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} WITH_EMACS=${WITH_EMACS}
sphinx-build-3
+-SPHINXBUILD = WITH_EMACS=${WITH_EMACS} RSTI_DIR=$(realpath emacs)
sphinx-build
++SPHINXBUILD = WITH_EMACS=${WITH_EMACS} RSTI_DIR=$(realpath emacs)
sphinx-build-3
DOCBUILDDIR := $(dir)/_build
# Internal variables.
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-doc_conf_py
/build/usr/ports/mail/notmuch/notmuch/patches/patch-doc_conf_py
--- /usr/ports/mail/notmuch/notmuch/patches/patch-doc_conf_py Fri May 15
10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-doc_conf_py Tue Jul
14 19:43:42 2020
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_conf_py,v 1.1.1.1 2020/05/15 08:58
Index: doc/conf.py
--- doc/conf.py.orig
+++ doc/conf.py
-@@ -17,7 +17,7 @@ copyright = u'2009-2019, Carl Worth and many others'
+@@ -17,7 +17,7 @@ copyright = u'2009-2020, Carl Worth and many others'
location = os.path.dirname(__file__)
for pathdir in ['.', '..']:
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-emacs_Makefile_local
/build/usr/ports/mail/notmuch/notmuch/patches/patch-emacs_Makefile_local
--- /usr/ports/mail/notmuch/notmuch/patches/patch-emacs_Makefile_local Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-emacs_Makefile_local
Tue Jul 14 19:43:42 2020
@@ -3,7 +3,7 @@ $OpenBSD: patch-emacs_Makefile_local,v 1.1.1.1 2020/05
Index: emacs/Makefile.local
--- emacs/Makefile.local.orig
+++ emacs/Makefile.local
-@@ -128,7 +128,6 @@ endif
+@@ -126,7 +126,6 @@ endif
ifeq ($(WITH_DESKTOP),1)
mkdir -p "$(DESTDIR)$(desktop_dir)"
desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)"
$(emacs_mua_desktop)
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-lib_notmuch_h
/build/usr/ports/mail/notmuch/notmuch/patches/patch-lib_notmuch_h
--- /usr/ports/mail/notmuch/notmuch/patches/patch-lib_notmuch_h Fri May 15
10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-lib_notmuch_h Tue Jul
14 19:43:42 2020
@@ -7,10 +7,10 @@ Index: lib/notmuch.h
* The library version number. This must agree with the soname
* version in Makefile.local.
*/
--#define LIBNOTMUCH_MAJOR_VERSION 5
--#define LIBNOTMUCH_MINOR_VERSION 2
-+#define LIBNOTMUCH_MAJOR_VERSION ${LIBnotmuch_MAJOR}
-+#define LIBNOTMUCH_MINOR_VERSION ${LIBnotmuch_MINOR}
- #define LIBNOTMUCH_MICRO_VERSION 0
+-#define LIBNOTMUCH_MAJOR_VERSION 5
+-#define LIBNOTMUCH_MINOR_VERSION 2
++#define LIBNOTMUCH_MAJOR_VERSION ${LIBnotmuch_MAJOR}
++#define LIBNOTMUCH_MINOR_VERSION ${LIBnotmuch_MINOR}
+ #define LIBNOTMUCH_MICRO_VERSION 0
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-client_h
/build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-client_h
--- /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-client_h Thu Jan
1 01:00:00 1970
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-client_h
Tue Jul 14 20:35:57 2020
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+replace zlib macros by stdio equivalent because our zlib does not have
+"transparent" (no compression) mode so we disable compression altogether.
+NB: macros GZPRINTF and GZPUTS are only used in notmuch-dump.c
+
+Index: notmuch-client.h
+--- notmuch-client.h.orig
++++ notmuch-client.h
+@@ -493,14 +493,12 @@ int
+ status_to_exit (notmuch_status_t status);
+
+ notmuch_status_t
+-print_status_gzbytes (const char *loc,
+- gzFile file,
+- int bytes);
++print_status_bytes (const char *loc, int bytes);
+
+ /* the __location__ macro is defined in talloc.h */
+-#define ASSERT_GZBYTES(file, bytes) ((print_status_gzbytes (__location__,
file, bytes)) ? exit (1) : 0)
+-#define GZPRINTF(file, fmt, ...) ASSERT_GZBYTES (file, gzprintf (file, fmt,
##__VA_ARGS__));
+-#define GZPUTS(file, str) ASSERT_GZBYTES(file, gzputs (file, str));
++#define ASSERT_GZBYTES(bytes) ((print_status_bytes (__location__, bytes)) ?
exit (1) : 0)
++#define GZPRINTF(file, fmt, ...) ASSERT_GZBYTES (fprintf (file, fmt,
##__VA_ARGS__));
++#define GZPUTS(file, str) ASSERT_GZBYTES(fputs (str, file));
+
+ #include "command-line-arguments.h"
+
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-dump_c
/build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-dump_c
--- /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-dump_c Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-dump_c Tue Jul
14 20:37:02 2020
@@ -1,13 +1,14 @@
-$OpenBSD: patch-notmuch-dump_c,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
+$OpenBSD$
-For lack of transparent write mode in zlib, replace zlib by stdio in
-notmuch dump (the --gzip option no longer exists).
+replace zlib macros by stdio equivalent because our zlib does not have
+"transparent" (no compression) mode so we disable compression
+altogether.
Index: notmuch-dump.c
--- notmuch-dump.c.orig
+++ notmuch-dump.c
@@ -24,7 +24,7 @@
- #include <zlib.h>
+ #include "zlib-extra.h"
static int
-database_dump_config (notmuch_database_t *notmuch, gzFile output)
@@ -15,27 +16,7 @@ Index: notmuch-dump.c
{
notmuch_config_list_t *list;
int ret = EXIT_FAILURE;
-@@ -42,7 +42,8 @@ database_dump_config (notmuch_database_t *notmuch, gzF
- notmuch_config_list_key (list));
- goto DONE;
- }
-- gzprintf (output, "#@ %s", buffer);
-+ if (fprintf (output, "#@ %s", buffer) < 0)
-+ exit (1);
-
- if (hex_encode (notmuch, notmuch_config_list_value (list),
- &buffer, &buffer_size) != HEX_SUCCESS) {
-@@ -51,7 +52,8 @@ database_dump_config (notmuch_database_t *notmuch, gzF
- goto DONE;
- }
-
-- gzprintf (output, " %s\n", buffer);
-+ if (fprintf (output, " %s\n", buffer) < 0)
-+ exit (1);
- }
-
- ret = EXIT_SUCCESS;
-@@ -67,32 +69,37 @@ database_dump_config (notmuch_database_t *notmuch, gzF
+@@ -69,7 +69,7 @@ database_dump_config (notmuch_database_t *notmuch, gzF
}
static void
@@ -44,36 +25,7 @@ Index: notmuch-dump.c
{
const char *sep = "";
-- gzprintf (output, "#notmuch-dump %s:%d ",
-- (output_format == DUMP_FORMAT_SUP) ? "sup" : "batch-tag",
-- NOTMUCH_DUMP_VERSION);
-+ if (fprintf (output, "#notmuch-dump %s:%d ",
-+ (output_format == DUMP_FORMAT_SUP) ? "sup" : "batch-tag",
-+ NOTMUCH_DUMP_VERSION) < 0)
-+ exit (1);
-
- if (include & DUMP_INCLUDE_CONFIG) {
-- gzputs (output, "config");
-+ if (fputs ("config", output) < 0)
-+ exit (1);
- sep = ",";
- }
- if (include & DUMP_INCLUDE_PROPERTIES) {
-- gzprintf (output, "%sproperties", sep);
-+ if (fprintf (output, "%sproperties", sep) < 0)
-+ exit (1);
- sep = ",";
- }
- if (include & DUMP_INCLUDE_TAGS) {
-- gzprintf (output, "%stags", sep);
-+ if (fprintf (output, "%stags", sep) < 0)
-+ exit (1);
- }
-- gzputs (output, "\n");
-+ if (fputs ("\n", output) < 0)
-+ exit (1);
- }
-
+@@ -94,7 +94,7 @@ print_dump_header (gzFile output, int output_format, i
static int
dump_properties_message (void *ctx,
notmuch_message_t *message,
@@ -82,42 +34,7 @@ Index: notmuch-dump.c
char **buffer_p, size_t *size_p)
{
const char *message_id;
-@@ -115,7 +122,8 @@ dump_properties_message (void *ctx,
- fprintf (stderr, "Error: failed to hex-encode message-id %s\n",
message_id);
- return 1;
- }
-- gzprintf (output, "#= %s", *buffer_p);
-+ if (fprintf (output, "#= %s", *buffer_p) < 0)
-+ exit (1);
- first = false;
- }
-
-@@ -126,18 +134,21 @@ dump_properties_message (void *ctx,
- fprintf (stderr, "Error: failed to hex-encode key %s\n", key);
- return 1;
- }
-- gzprintf (output, " %s", *buffer_p);
-+ if (fprintf (output, " %s", *buffer_p) < 0)
-+ exit (1);
-
- if (hex_encode (ctx, val, buffer_p, size_p) != HEX_SUCCESS) {
- fprintf (stderr, "Error: failed to hex-encode value %s\n", val);
- return 1;
- }
-- gzprintf (output, "=%s", *buffer_p);
-+ if (fprintf (output, "=%s", *buffer_p) < 0)
-+ exit (1);
- }
- notmuch_message_properties_destroy (list);
-
- if (! first)
-- gzprintf (output, "\n", *buffer_p);
-+ if (fputs ("\n", output) < 0)
-+ exit (1);
-
- return 0;
- }
-@@ -145,7 +156,7 @@ dump_properties_message (void *ctx,
+@@ -147,7 +147,7 @@ dump_properties_message (void *ctx,
static int
dump_tags_message (void *ctx,
notmuch_message_t *message, int output_format,
@@ -126,59 +43,7 @@ Index: notmuch-dump.c
char **buffer_p, size_t *size_p)
{
int first = 1;
-@@ -165,7 +176,8 @@ dump_tags_message (void *ctx,
- }
-
- if (output_format == DUMP_FORMAT_SUP) {
-- gzprintf (output, "%s (", message_id);
-+ if (fprintf (output, "%s (", message_id) < 0)
-+ exit (1);
- }
-
- for (notmuch_tags_t *tags = notmuch_message_get_tags (message);
-@@ -174,12 +186,14 @@ dump_tags_message (void *ctx,
- const char *tag_str = notmuch_tags_get (tags);
-
- if (! first)
-- gzputs (output, " ");
-+ if (fputs (" ", output) < 0)
-+ exit (1);
-
- first = 0;
-
- if (output_format == DUMP_FORMAT_SUP) {
-- gzputs (output, tag_str);
-+ if (fputs (tag_str, output) < 0)
-+ exit (1);
- } else {
- if (hex_encode (ctx, tag_str,
- buffer_p, size_p) != HEX_SUCCESS) {
-@@ -187,12 +201,14 @@ dump_tags_message (void *ctx,
- tag_str);
- return EXIT_FAILURE;
- }
-- gzprintf (output, "+%s", *buffer_p);
-+ if (fprintf (output, "+%s", *buffer_p) < 0)
-+ exit (1);
- }
- }
-
- if (output_format == DUMP_FORMAT_SUP) {
-- gzputs (output, ")\n");
-+ if (fputs (")\n", output) < 0)
-+ exit (1);
- } else {
- if (make_boolean_term (ctx, "id", message_id,
- buffer_p, size_p)) {
-@@ -200,13 +216,14 @@ dump_tags_message (void *ctx,
- message_id, strerror (errno));
- return EXIT_FAILURE;
- }
-- gzprintf (output, " -- %s\n", *buffer_p);
-+ if (fprintf (output, " -- %s\n", *buffer_p) < 0)
-+ exit (1);
- }
- return EXIT_SUCCESS;
+@@ -208,7 +208,7 @@ dump_tags_message (void *ctx,
}
static int
@@ -187,7 +52,7 @@ Index: notmuch-dump.c
const char *query_str, int output_format, int include)
{
notmuch_query_t *query;
-@@ -279,8 +296,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
+@@ -281,8 +281,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
dump_include_t include,
bool gzip_output)
{
@@ -197,7 +62,7 @@ Index: notmuch-dump.c
const char *name_for_error = output_file_name ? output_file_name :
"stdout";
char *tempname = NULL;
-@@ -300,10 +316,10 @@ notmuch_database_dump (notmuch_database_t *notmuch,
+@@ -302,10 +301,10 @@ notmuch_database_dump (notmuch_database_t *notmuch,
goto DONE;
}
@@ -210,20 +75,19 @@ Index: notmuch-dump.c
name_for_error, strerror (errno));
if (close (outfd))
fprintf (stderr, "Error closing %s during shutdown: %s\n",
-@@ -314,9 +330,10 @@ notmuch_database_dump (notmuch_database_t *notmuch,
+@@ -316,9 +315,9 @@ notmuch_database_dump (notmuch_database_t *notmuch,
ret = database_dump_file (notmuch, output, query_str, output_format,
include);
if (ret) goto DONE;
- ret = gzflush (output, Z_FINISH);
+ ret = fflush (output);
if (ret) {
-- fprintf (stderr, "Error flushing output: %s\n", gzerror (output, NULL));
-+ fprintf (stderr, "Error flushing %s: %s\n",
-+ name_for_error, strerror (errno));
+- fprintf (stderr, "Error flushing output: %s\n", gzerror_str (output));
++ fprintf (stderr, "Error flushing output: %s\n", strerror (errno));
goto DONE;
}
-@@ -329,10 +346,10 @@ notmuch_database_dump (notmuch_database_t *notmuch,
+@@ -331,10 +330,10 @@ notmuch_database_dump (notmuch_database_t *notmuch,
}
}
@@ -231,23 +95,23 @@ Index: notmuch-dump.c
+ ret = fclose (output);
if (ret) {
fprintf (stderr, "Error closing %s: %s\n", name_for_error,
-- gzerror (output, NULL));
+- gzerror_str (output));
+ strerror (errno));
ret = EXIT_FAILURE;
output = NULL;
goto DONE;
-@@ -350,7 +367,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
+@@ -352,7 +351,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
}
- DONE:
+ DONE:
if (ret != EXIT_SUCCESS && output)
- (void) gzclose_w (output);
+ (void) fclose (output);
if (ret != EXIT_SUCCESS && output_file_name)
(void) unlink (tempname);
-@@ -388,7 +405,6 @@ notmuch_dump_command (notmuch_config_t *config, int ar
- { "properties", DUMP_INCLUDE_PROPERTIES },
- { "tags", DUMP_INCLUDE_TAGS} } },
+@@ -390,7 +389,6 @@ notmuch_dump_command (notmuch_config_t *config, int ar
+ { "properties", DUMP_INCLUDE_PROPERTIES },
+ { "tags", DUMP_INCLUDE_TAGS } } },
{ .opt_string = &output_file_name, .name = "output" },
- { .opt_bool = &gzip_output, .name = "gzip" },
{ .opt_inherit = notmuch_shared_options },
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-new_c
/build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-new_c
--- /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-new_c Fri May 15
10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-new_c Tue Jul
14 19:43:42 2020
@@ -6,7 +6,7 @@ when upgrading database, back up the old db without co
Index: notmuch-new.c
--- notmuch-new.c.orig
+++ notmuch-new.c
-@@ -1156,7 +1156,7 @@ notmuch_new_command (notmuch_config_t *config, int arg
+@@ -1148,7 +1148,7 @@ notmuch_new_command (notmuch_config_t *config, int arg
* relatively small. */
const char *backup_name =
@@ -15,7 +15,7 @@ Index: notmuch-new.c
dot_notmuch_path,
gm_time->tm_year + 1900,
gm_time->tm_mon + 1,
-@@ -1168,11 +1168,11 @@ notmuch_new_command (notmuch_config_t *config, int arg
+@@ -1160,11 +1160,11 @@ notmuch_new_command (notmuch_config_t *config, int arg
if (add_files_state.verbosity >= VERBOSITY_NORMAL) {
printf ("Welcome to a new version of notmuch! Your database
will now be upgraded.\n");
printf ("This process is safe to interrupt.\n");
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-restore_c
/build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-restore_c
--- /usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-restore_c Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-notmuch-restore_c
Tue Jul 14 20:42:00 2020
@@ -1,31 +1,16 @@
-$OpenBSD: patch-notmuch-restore_c,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
+$OpenBSD$
+older zlib
+
Index: notmuch-restore.c
--- notmuch-restore.c.orig
+++ notmuch-restore.c
-@@ -238,6 +238,7 @@ notmuch_restore_command (notmuch_config_t *config, int
- int opt_index;
- int include = 0;
- int input_format = DUMP_FORMAT_AUTO;
-+ int errnum;
-
- if (notmuch_database_open (notmuch_config_get_database_path (config),
- NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
-@@ -449,10 +450,13 @@ notmuch_restore_command (notmuch_config_t *config, int
- if (notmuch)
+@@ -450,7 +450,7 @@ notmuch_restore_command (notmuch_config_t *config, int
notmuch_database_destroy (notmuch);
-- if (input && gzclose_r (input)) {
-- fprintf (stderr, "Error closing %s: %s\n",
-- name_for_error, gzerror (input, NULL));
-- ret = EXIT_FAILURE;
-+ if (input) {
+ if (input) {
+- errnum = gzclose_r (input);
+ errnum = gzclose (input);
-+ if (errnum) {
-+ fprintf (stderr, "Error closing %s: %d\n",
-+ name_for_error, errnum);
-+ ret = EXIT_FAILURE;
-+ }
- }
-
- return ret ? EXIT_FAILURE : EXIT_SUCCESS;
+ if (errnum) {
+ fprintf (stderr, "Error closing %s: %d\n",
+ name_for_error, errnum);
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-status_c
/build/usr/ports/mail/notmuch/notmuch/patches/patch-status_c
--- /usr/ports/mail/notmuch/notmuch/patches/patch-status_c Thu Jan 1
01:00:00 1970
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-status_c Tue Jul
14 20:37:26 2020
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: status.c
+--- status.c.orig
++++ status.c
+@@ -74,12 +74,10 @@ status_to_exit (notmuch_status_t status)
+ }
+
+ notmuch_status_t
+-print_status_gzbytes (const char *loc, gzFile file, int bytes)
++print_status_bytes (const char *loc, int bytes)
+ {
+- if (bytes <= 0) {
+- int errnum;
+- const char *errstr = gzerror (file, &errnum);
+- fprintf (stderr, "%s: zlib error %s (%d)\n", loc, errstr, errnum);
++ if (bytes < 0) {
++ fprintf (stderr, "%s: %s\n", loc, strerror (errno));
+ return NOTMUCH_STATUS_FILE_ERROR;
+ } else {
+ return NOTMUCH_STATUS_SUCCESS;
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-test_T355-smime_sh
/build/usr/ports/mail/notmuch/notmuch/patches/patch-test_T355-smime_sh
--- /usr/ports/mail/notmuch/notmuch/patches/patch-test_T355-smime_sh Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-test_T355-smime_sh
Tue Jul 14 19:43:42 2020
@@ -6,12 +6,12 @@ LibreSSL has md5 as default fingerprint algo
Index: test/T355-smime.sh
--- test/T355-smime.sh.orig
+++ test/T355-smime.sh
-@@ -21,7 +21,7 @@ test_require_external_prereq gpgsm
+@@ -6,7 +6,7 @@ test_description='S/MIME signature verification and de
+ test_require_external_prereq openssl
+ test_require_external_prereq gpgsm
- cp $NOTMUCH_SRCDIR/test/smime/key+cert.pem test_suite.pem
-
--FINGERPRINT=$(openssl x509 -fingerprint -in test_suite.pem -noout | sed -e
's/^.*=//' -e s/://g)
-+FINGERPRINT=$(openssl x509 -fingerprint -sha1 -in test_suite.pem -noout | sed
-e 's/^.*=//' -e s/://g)
+-FINGERPRINT=$(openssl x509 -fingerprint -in
"$NOTMUCH_SRCDIR/test/smime/key+cert.pem" -noout | sed -e 's/^.*=//' -e s/://g)
++FINGERPRINT=$(openssl x509 -fingerprint -sha1 -in
"$NOTMUCH_SRCDIR/test/smime/key+cert.pem" -noout | sed -e 's/^.*=//' -e s/://g)
add_gpgsm_home
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh
/build/usr/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh
--- /usr/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh
Tue Jul 14 22:17:38 2020
@@ -1,14 +1,23 @@
$OpenBSD: patch-test_test-lib_sh,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
+we don't have libdl
use gpg2 instead of gpg
Index: test/test-lib.sh
--- test/test-lib.sh.orig
+++ test/test-lib.sh
-@@ -112,11 +112,11 @@ add_gnupg_home ()
+@@ -96,7 +96,6 @@ TEST_GDB=${TEST_GDB:-gdb}
+ TEST_CC=${TEST_CC:-cc}
+ TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
+ TEST_SHIM_CFLAGS=${TEST_SHIM_CFLAGS:-"-fpic -shared"}
+-TEST_SHIM_LDFLAGS=${TEST_SHIM_LDFLAGS:-"-ldl"}
+
+ # Protect ourselves from common misconfiguration to export
+ # CDPATH into the environment
+@@ -113,11 +112,11 @@ add_gnupg_home ()
_gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
at_exit_function _gnupg_exit
- mkdir -m 0700 "$GNUPGHOME"
+ mkdir -p -m 0700 "$GNUPGHOME"
- gpg --no-tty --import <$NOTMUCH_SRCDIR/test/gnupg-secret-key.asc
>"$GNUPGHOME"/import.log 2>&1
+ gpg2 --no-tty --import <$NOTMUCH_SRCDIR/test/gnupg-secret-key.asc
>"$GNUPGHOME"/import.log 2>&1
test_debug "cat $GNUPGHOME/import.log"
@@ -20,7 +29,7 @@ Index: test/test-lib.sh
echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
fi
echo no-emit-version >> "$GNUPGHOME"/gpg.conf
-@@ -124,7 +124,7 @@ add_gnupg_home ()
+@@ -125,7 +124,7 @@ add_gnupg_home ()
# Change this if we ship a new test key
FINGERPRINT="5AEAB11F5E33DCE875DDB75B6D92612D94E46381"
SELF_USERID="Notmuch Test Suite <[email protected]> (INSECURE!)"
@@ -28,4 +37,4 @@ Index: test/test-lib.sh
+ printf '%s:6:\n' "$FINGERPRINT" | gpg2 --quiet --batch --no-tty
--import-ownertrust
}
- # Each test should start with something like this, after copyright notices:
+ add_gpgsm_home ()
diff -uNpr /usr/ports/mail/notmuch/notmuch/patches/patch-util_zlib-extra_c
/build/usr/ports/mail/notmuch/notmuch/patches/patch-util_zlib-extra_c
--- /usr/ports/mail/notmuch/notmuch/patches/patch-util_zlib-extra_c Fri May
15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/patches/patch-util_zlib-extra_c
Thu Jan 1 01:00:00 1970
@@ -1,24 +0,0 @@
-$OpenBSD: patch-util_zlib-extra_c,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
-
-Index: util/zlib-extra.c
---- util/zlib-extra.c.orig
-+++ util/zlib-extra.c
-@@ -47,6 +47,7 @@ gz_getline (void *talloc_ctx, char **bufptr, ssize_t *
- int zlib_status = 0;
- (void) gzerror (stream, &zlib_status);
- switch (zlib_status) {
-+ case Z_STREAM_END:
- case Z_OK:
- /* no data read before EOF */
- if (offset == 0)
-@@ -78,8 +79,9 @@ gz_getline (void *talloc_ctx, char **bufptr, ssize_t *
-
- const char *gz_error_string (util_status_t status, gzFile file)
- {
-+ int errnum;
- if (status == UTIL_GZERROR)
-- return gzerror (file, NULL);
-+ return gzerror (file, &errnum);
- else
- return util_error_string (status);
- }
diff -uNpr /usr/ports/mail/notmuch/notmuch/pkg/PLIST-main
/build/usr/ports/mail/notmuch/notmuch/pkg/PLIST-main
--- /usr/ports/mail/notmuch/notmuch/pkg/PLIST-main Fri May 15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/notmuch/pkg/PLIST-main Tue Jul 14
21:11:14 2020
@@ -38,9 +38,10 @@ include/notmuch.h
@man man/man5/notmuch-hooks.5
@man man/man7/notmuch-properties.7
@man man/man7/notmuch-search-terms.7
+share/notmuch/
+share/notmuch/bash_completion.d/
+share/notmuch/bash_completion.d/notmuch
share/zsh/
-share/zsh/functions/
-share/zsh/functions/Completion/
-share/zsh/functions/Completion/Unix/
-share/zsh/functions/Completion/Unix/_email-notmuch
-share/zsh/functions/Completion/Unix/_notmuch
+share/zsh/site-functions/
+share/zsh/site-functions/_email-notmuch
+share/zsh/site-functions/_notmuch
diff -uNpr /usr/ports/mail/notmuch/py-notmuch/Makefile
/build/usr/ports/mail/notmuch/py-notmuch/Makefile
--- /usr/ports/mail/notmuch/py-notmuch/Makefile Sun Jul 5 03:39:38 2020
+++ /build/usr/ports/mail/notmuch/py-notmuch/Makefile Tue Jul 14 13:21:01 2020
@@ -9,7 +9,7 @@ MODPY_EGG_VERSION = ${V}
REVISION = 0
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = mail/notmuch/notmuch
diff -uNpr /usr/ports/mail/notmuch/py-notmuch/distinfo
/build/usr/ports/mail/notmuch/py-notmuch/distinfo
--- /usr/ports/mail/notmuch/py-notmuch/distinfo Fri May 15 10:58:14 2020
+++ /build/usr/ports/mail/notmuch/py-notmuch/distinfo Tue Jul 14 22:39:10 2020
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.29.3.tar.xz) = 1fcEuacjleQzA96bH02OFN0nvzZG/bs3S7Pbt9FQ3DU=
-SIZE (notmuch-0.29.3.tar.xz) = 660536
+SHA256 (notmuch-0.30.tar.xz) = Xjuqb+EdZcZ+Jq5Ii+EbMguuBOM2rMnGRiH340SQlvo=
+SIZE (notmuch-0.30.tar.xz) = 711904
