Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package notmuch for openSUSE:Factory checked in at 2021-08-19 10:00:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notmuch (Old) and /work/SRC/openSUSE:Factory/.notmuch.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notmuch" Thu Aug 19 10:00:56 2021 rev:35 rq:912841 version:0.32.3 Changes: -------- --- /work/SRC/openSUSE:Factory/notmuch/notmuch.changes 2021-07-01 07:05:35.307498636 +0200 +++ /work/SRC/openSUSE:Factory/.notmuch.new.1899/notmuch.changes 2021-08-19 10:01:58.091194698 +0200 @@ -1,0 +2,25 @@ +Wed Aug 18 06:29:37 UTC 2021 - Dan ??erm??k <dcer...@suse.com> + +- New upstream release 0.32.3 + +What's new in notmuch 0.32.3 +========================= + +Library +------- + +Restore location of database via `MAILDIR` environment variable, which +was broken in 0.32. + +Bump libnotmuch minor version to match the documentation in +`notmuch.h`. + +Correct documentation for deprecated database opening functions to +point out that they (still) do not load configuration information. + +CLI +--- + +Restore "notmuch config get built_with.*", which was broken in 0.32. + +------------------------------------------------------------------- Old: ---- notmuch-0.32.2.tar.xz notmuch-0.32.2.tar.xz.asc New: ---- notmuch-0.32.3.tar.xz notmuch-0.32.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notmuch.spec ++++++ --- /var/tmp/diff_new_pack.5du7B8/_old 2021-08-19 10:01:58.571194115 +0200 +++ /var/tmp/diff_new_pack.5du7B8/_new 2021-08-19 10:01:58.575194110 +0200 @@ -18,7 +18,7 @@ %define libversion 5 Name: notmuch -Version: 0.32.2 +Version: 0.32.3 Release: 0 Summary: The mail indexer License: GPL-3.0-or-later ++++++ notmuch-0.32.2.tar.xz -> notmuch-0.32.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/NEWS new/notmuch-0.32.3/NEWS --- old/notmuch-0.32.2/NEWS 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/NEWS 2021-08-18 02:18:21.000000000 +0200 @@ -1,3 +1,23 @@ +Notmuch 0.32.3 (2021-08-17) +=========================== + +Library +------- + +Restore location of database via `MAILDIR` environment variable, which +was broken in 0.32. + +Bump libnotmuch minor version to match the documentation in +`notmuch.h`. + +Correct documentation for deprecated database opening functions to +point out that they (still) do not load configuration information. + +CLI +--- + +Restore "notmuch config get built_with.*", which was broken in 0.32. + Notmuch 0.32.2 (2021-06-27) =========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/bindings/python/notmuch/version.py new/notmuch-0.32.3/bindings/python/notmuch/version.py --- old/notmuch-0.32.2/bindings/python/notmuch/version.py 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/bindings/python/notmuch/version.py 2021-08-18 02:18:21.000000000 +0200 @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.32.2' +__VERSION__ = '0.32.3' SOVERSION = '5' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/bindings/python-cffi/version.txt new/notmuch-0.32.3/bindings/python-cffi/version.txt --- old/notmuch-0.32.2/bindings/python-cffi/version.txt 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/bindings/python-cffi/version.txt 2021-08-18 02:18:21.000000000 +0200 @@ -1 +1 @@ -0.32.2 +0.32.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/debian/changelog new/notmuch-0.32.3/debian/changelog --- old/notmuch-0.32.2/debian/changelog 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/debian/changelog 2021-08-18 02:18:21.000000000 +0200 @@ -1,3 +1,11 @@ +notmuch (0.32.3-1) unstable; urgency=medium + + * new upstream bugfix release + * fixes for a few configuration related bugs introduced in 0.32 + * bump libnotmuch minor version to match documentation. + + -- David Bremner <brem...@debian.org> Tue, 17 Aug 2021 17:16:09 -0700 + notmuch (0.32.2-1) experimental; urgency=medium * New upstream bugfix release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/lib/notmuch.h new/notmuch-0.32.3/lib/notmuch.h --- old/notmuch-0.32.2/lib/notmuch.h 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/lib/notmuch.h 2021-08-18 02:18:21.000000000 +0200 @@ -58,7 +58,7 @@ * version in Makefile.local. */ #define LIBNOTMUCH_MAJOR_VERSION 5 -#define LIBNOTMUCH_MINOR_VERSION 3 +#define LIBNOTMUCH_MINOR_VERSION 4 #define LIBNOTMUCH_MICRO_VERSION 0 @@ -316,7 +316,7 @@ /** * Deprecated alias for notmuch_database_open_with_config with - * config_path=error_message=NULL + * config_path="" and error_message=NULL * @deprecated Deprecated as of libnotmuch 5.4 (notmuch 0.32) */ /* NOTMUCH_DEPRECATED(5, 4) */ @@ -326,7 +326,7 @@ notmuch_database_t **database); /** * Deprecated alias for notmuch_database_open_with_config with - * config_path=NULL + * config_path="" * * @deprecated Deprecated as of libnotmuch 5.4 (notmuch 0.32) * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/lib/open.cc new/notmuch-0.32.3/lib/open.cc --- old/notmuch-0.32.2/lib/open.cc 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/lib/open.cc 2021-08-18 02:18:21.000000000 +0200 @@ -221,6 +221,10 @@ } if (! *database_path) { + *database_path = getenv ("MAILDIR"); + } + + if (! *database_path) { notmuch_status_t status; *database_path = talloc_asprintf (ctx, "%s/mail", getenv ("HOME")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/notmuch-config.c new/notmuch-0.32.3/notmuch-config.c --- old/notmuch-0.32.2/notmuch-config.c 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/notmuch-config.c 2021-08-18 02:18:21.000000000 +0200 @@ -538,11 +538,18 @@ { notmuch_config_values_t *list; - for (list = notmuch_config_get_values_string (notmuch, item); - notmuch_config_values_valid (list); - notmuch_config_values_move_to_next (list)) { - const char *val = notmuch_config_values_get (list); - puts (val); + if (STRNCMP_LITERAL (item, BUILT_WITH_PREFIX) == 0) { + if (notmuch_built_with (item + strlen (BUILT_WITH_PREFIX))) + puts ("true"); + else + puts ("false"); + } else { + for (list = notmuch_config_get_values_string (notmuch, item); + notmuch_config_values_valid (list); + notmuch_config_values_move_to_next (list)) { + const char *val = notmuch_config_values_get (list); + puts (val); + } } return EXIT_SUCCESS; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/test/T030-config.sh new/notmuch-0.32.3/test/T030-config.sh --- old/notmuch-0.32.2/test/T030-config.sh 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/test/T030-config.sh 2021-08-18 02:18:21.000000000 +0200 @@ -144,4 +144,21 @@ output=$(notmuch config get ${key}) test_expect_equal "${output}" "${value}" +test_begin_subtest "set built_with.* yields error" +test_expect_code 1 "notmuch config set built_with.compact false" + +test_begin_subtest "get built_with.{compact,field_processor} prints true" +for key in compact field_processor; do + notmuch config get built_with.${key} +done > OUTPUT +cat <<EOF > EXPECTED +true +true +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "get built_with.nonexistent prints false" +output=$(notmuch config get built_with.nonexistent) +test_expect_equal "$output" "false" + test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/test/T055-path-config.sh new/notmuch-0.32.3/test/T055-path-config.sh --- old/notmuch-0.32.2/test/T055-path-config.sh 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/test/T055-path-config.sh 2021-08-18 02:18:21.000000000 +0200 @@ -16,6 +16,7 @@ unset DATABASE_PATH unset NOTMUCH_PROFILE unset XAPIAN_PATH + unset MAILDIR rm -f "$HOME/mail" cp notmuch-config-backup.${test_name} ${NOTMUCH_CONFIG} } @@ -55,6 +56,18 @@ unset DATABASE_PATH } +maildir_env_config () { + local dir + backup_config + dir="${HOME}/env_points_here" + ln -s $MAIL_DIR $dir + export MAILDIR=$dir + notmuch config set database.path + notmuch config set database.mail_root + XAPIAN_PATH="${MAIL_DIR}/.notmuch/xapian" + unset DATABASE_PATH +} + xdg_config () { local dir local profile=${1:-default} @@ -79,7 +92,7 @@ notmuch --config=${CONFIG_PATH} config set database.path } -for config in traditional split XDG XDG+profile symlink home_mail; do +for config in traditional split XDG XDG+profile symlink home_mail maildir_env; do #start each set of tests with an known set of messages add_email_corpus @@ -106,6 +119,9 @@ home_mail) home_mail_config ;; + maildir_env) + maildir_env_config + ;; esac test_begin_subtest "count ($config)" @@ -190,6 +206,7 @@ > basic reply test EOF test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "insert+search ($config)" generate_message \ "[subject]=\"insert-subject\"" \ @@ -250,11 +267,13 @@ test_expect_equal "${output}+${output2}" "${value}+" test_begin_subtest "Config list ($config)" - notmuch config list | notmuch_dir_sanitize | sed -e "s/^database.backup_dir=.*$/database.backup_dir/" \ - -e "s/^database.hook_dir=.*$/database.hook_dir/" \ - -e "s/^database.path=.*$/database.path/" \ - -e "s,^database.mail_root=CWD/home/mail,database.mail_root=MAIL_DIR," \ - > OUTPUT + notmuch config list | notmuch_dir_sanitize | \ + sed -e "s/^database.backup_dir=.*$/database.backup_dir/" \ + -e "s/^database.hook_dir=.*$/database.hook_dir/" \ + -e "s/^database.path=.*$/database.path/" \ + -e "s,^database.mail_root=CWD/home/mail,database.mail_root=MAIL_DIR," \ + -e "s,^database.mail_root=CWD/home/env_points_here,database.mail_root=MAIL_DIR," \ + > OUTPUT cat <<EOF > EXPECTED built_with.compact=true built_with.field_processor=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.2/version.txt new/notmuch-0.32.3/version.txt --- old/notmuch-0.32.2/version.txt 2021-06-27 13:56:21.000000000 +0200 +++ new/notmuch-0.32.3/version.txt 2021-08-18 02:18:21.000000000 +0200 @@ -1 +1 @@ -0.32.2 +0.32.3