cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to notmuch-0.31

Browse Source 
Changes: https://notmuchmail.org/news/release-0.31/

Bump major of shared lib as symbol has been removed. Thanks to Olivier
Taïbi <oli AT olitb DOT net> for working together with upstream to fix a
segfault.
This commit is contained in:
bket 2020-11-01 09:48:48 +00:00
parent 7f09af6350
commit 62933ccf09
13 changed files with 73 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/notmuch/Makefile.inc
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.2 2020/08/13 18:21:18 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.3 2020/11/01 09:48:48 bket Exp $
V = 0.30
V = 0.31
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz

5
mail/notmuch/notmuch/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2020/10/05 19:46:17 jca Exp $
# $OpenBSD: Makefile,v 1.6 2020/11/01 09:48:48 bket Exp $
COMMENT-main = mail indexer, tagger and threader
COMMENT-emacs = Emacs bindings for notmuch
PKGNAME-main = notmuch-${V}
REVISION-main = 0
PKGNAME-emacs = notmuch-emacs-${V}
SHARED_LIBS += notmuch 0.0
SHARED_LIBS += notmuch 1.0
MULTI_PACKAGES = -main -emacs
DEBUG_PACKAGES = -main

4
mail/notmuch/notmuch/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (notmuch-0.30.tar.xz) = Xjuqb+EdZcZ+Jq5Ii+EbMguuBOM2rMnGRiH340SQlvo=
SIZE (notmuch-0.30.tar.xz) = 711904
SHA256 (notmuch-0.31.tar.xz) = Vx+g4VOchmErHyssgKOY4I7P71LifvfkjPjjuE+hg5Q=
SIZE (notmuch-0.31.tar.xz) = 713144

4
mail/notmuch/notmuch/patches/patch-Makefile_global
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_global,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
$OpenBSD: patch-Makefile_global,v 1.2 2020/11/01 09:48:48 bket Exp $
Index: Makefile.global
--- Makefile.global.orig
+++ Makefile.global
@@ -16,7 +16,7 @@ else
@@ -17,7 +17,7 @@ else
DATE:=$(shell date +%F)
endif

17
mail/notmuch/notmuch/patches/patch-configure
View File

@ -1,9 +1,13 @@
$OpenBSD: patch-configure,v 1.4 2020/10/05 19:46:17 jca Exp $
$OpenBSD: patch-configure,v 1.5 2020/11/01 09:48:48 bket Exp $
The realpath command (e.g. from GNU coreutils) is not so common outside Linux
systems. Taken from
https://git.notmuchmail.org/git?p=notmuch;a=commit;h=b042a59cdf8be7ad215268eee32d4cc114d312bb
Index: configure
--- configure.orig
+++ configure
@@ -721,9 +721,9 @@ if ! pkg-config --exists zlib; then
@@ -702,9 +702,9 @@ if ! pkg-config --exists zlib; then
rm -f compat/gen_zlib_pc
fi
@ -15,3 +19,12 @@ Index: configure
printf "Yes.\n"
have_zlib=1
zlib_cflags=$(pkg-config --cflags zlib)
@@ -1536,7 +1536,7 @@ EOF
if [ $WITH_PYTHON_DOCS = "1" ]; then
echo "tags.add('WITH_PYTHON')"
fi
- printf "rsti_dir = '%s'\n" $(realpath emacs)
+ printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)"
} > sphinx.config
# Finally, after everything configured, inform the user how to continue.

6
mail/notmuch/notmuch/patches/patch-doc_Makefile_local
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-doc_Makefile_local,v 1.2 2020/08/13 18:21:18 sthen Exp $
$OpenBSD: patch-doc_Makefile_local,v 1.3 2020/11/01 09:48:48 bket Exp $
Index: doc/Makefile.local
--- doc/Makefile.local.orig
@ -7,8 +7,8 @@ Index: doc/Makefile.local
# You can set these variables from the command line.
SPHINXOPTS := -q
-SPHINXBUILD = WITH_EMACS=${WITH_EMACS} RSTI_DIR=$(realpath emacs) sphinx-build
+SPHINXBUILD = WITH_EMACS=${WITH_EMACS} RSTI_DIR=$(realpath emacs) sphinx-build-3
-SPHINXBUILD = sphinx-build
+SPHINXBUILD = sphinx-build-3
DOCBUILDDIR := $(dir)/_build
# Internal variables.

4
mail/notmuch/notmuch/patches/patch-doc_conf_py
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-doc_conf_py,v 1.2 2020/08/13 18:21:19 sthen Exp $
$OpenBSD: patch-doc_conf_py,v 1.3 2020/11/01 09:48:48 bket Exp $
Index: doc/conf.py
--- doc/conf.py.orig
+++ doc/conf.py
@@ -17,7 +17,7 @@ copyright = u'2009-2020, Carl Worth and many others'
@@ -19,7 +19,7 @@ copyright = u'2009-2020, Carl Worth and many others'
location = os.path.dirname(__file__)
for pathdir in ['.', '..']:

24
mail/notmuch/notmuch/patches/patch-lib_config_cc Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-lib_config_cc,v 1.1 2020/11/01 09:48:48 bket Exp $
Don't set destructor until iterator is initialized. Taken from
https://git.notmuchmail.org/git?p=notmuch;a=commit;h=582e919e2769bd99064b997b05e1601ffcfe9a98
Index: lib/config.cc
--- lib/config.cc.orig
+++ lib/config.cc
@@ -113,7 +113,6 @@ notmuch_database_get_config_list (notmuch_database_t *
goto DONE;
}
- talloc_set_destructor (list, _notmuch_config_list_destroy);
list->notmuch = notmuch;
list->current_key = NULL;
list->current_val = NULL;
@@ -122,6 +121,7 @@ notmuch_database_get_config_list (notmuch_database_t *
new(&(list->iterator)) Xapian::TermIterator (notmuch->xapian_db->metadata_keys_begin
(CONFIG_PREFIX + (prefix ? prefix : "")));
+ talloc_set_destructor (list, _notmuch_config_list_destroy);
} catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, "A Xapian exception occurred getting metadata iterator: %s.\n",

6
mail/notmuch/notmuch/patches/patch-notmuch-new_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-notmuch-new_c,v 1.2 2020/08/13 18:21:19 sthen Exp $
$OpenBSD: patch-notmuch-new_c,v 1.3 2020/11/01 09:48:48 bket Exp $
when upgrading database, back up the old db without compression since
--gzip is not supported in this port
@ -6,7 +6,7 @@ when upgrading database, back up the old db without compression since
Index: notmuch-new.c
--- notmuch-new.c.orig
+++ notmuch-new.c
@@ -1148,7 +1148,7 @@ notmuch_new_command (notmuch_config_t *config, int arg
@@ -1151,7 +1151,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,
@@ -1160,11 +1160,11 @@ notmuch_new_command (notmuch_config_t *config, int arg
@@ -1163,11 +1163,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");

16
mail/notmuch/notmuch/patches/patch-test_Makefile_local Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-test_Makefile_local,v 1.1 2020/11/01 09:48:48 bket Exp $
Fix relative path linking issue
Index: test/Makefile.local
--- test/Makefile.local.orig
+++ test/Makefile.local
@@ -32,7 +32,7 @@ $(dir)/random-corpus: $(random_corpus_deps)
$(dir)/smtp-dummy: $(smtp_dummy_modules)
$(call quiet,CC) $^ -o $@ $(LDFLAGS)
-$(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
+$(dir)/symbol-test: $(dir)/symbol-test.o
$(call quiet,CXX) $^ -o $@ $(LDFLAGS) -Llib -lnotmuch $(XAPIAN_LDFLAGS)
$(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o

17
mail/notmuch/notmuch/patches/patch-test_T355-smime_sh
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-test_T355-smime_sh,v 1.2 2020/08/13 18:21:19 sthen Exp $
OpenSSL has sha1 as default fingerprint algo
LibreSSL has md5 as default fingerprint algo
Index: test/T355-smime.sh
--- test/T355-smime.sh.orig
+++ test/T355-smime.sh
@@ -6,7 +6,7 @@ test_description='S/MIME signature verification and de
test_require_external_prereq openssl
test_require_external_prereq gpgsm
-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

18
mail/notmuch/notmuch/patches/patch-test_T530-upgrade_sh
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-test_T530-upgrade_sh,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
modify test because we don't have notmuch dump --gzip
Index: test/T530-upgrade.sh
--- test/T530-upgrade.sh.orig
+++ test/T530-upgrade.sh
@@ -38,8 +38,8 @@ Your notmuch database has now been upgraded.
No new mail."
test_begin_subtest "tag backup matches pre-upgrade dump"
-gunzip -c ${MAIL_DIR}/.notmuch/dump-*.gz | sort > backup-dump
-test_expect_equal_file pre-upgrade-dump backup-dump
+<${MAIL_DIR}/.notmuch/dump-* sort > backup-dump
+test_expect_equal_file pre-upgrade-dump backup-dump
test_begin_subtest "folder: no longer matches in the middle of path"
output=$(notmuch search folder:baz)

4
mail/notmuch/py-notmuch/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (notmuch-0.30.tar.xz) = Xjuqb+EdZcZ+Jq5Ii+EbMguuBOM2rMnGRiH340SQlvo=
SIZE (notmuch-0.30.tar.xz) = 711904
SHA256 (notmuch-0.31.tar.xz) = Vx+g4VOchmErHyssgKOY4I7P71LifvfkjPjjuE+hg5Q=
SIZE (notmuch-0.31.tar.xz) = 713144