Hello community, here is the log from the commit of package notmuch for openSUSE:Factory checked in at 2019-11-28 13:51:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notmuch (Old) and /work/SRC/openSUSE:Factory/.notmuch.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notmuch" Thu Nov 28 13:51:32 2019 rev:23 rq:751569 version:0.29.3 Changes: -------- --- /work/SRC/openSUSE:Factory/notmuch/notmuch.changes 2019-11-07 23:21:17.980843562 +0100 +++ /work/SRC/openSUSE:Factory/.notmuch.new.26869/notmuch.changes 2019-11-28 13:51:38.230677351 +0100 @@ -1,0 +2,14 @@ +Thu Nov 28 10:14:18 UTC 2019 - Dan Čermák <[email protected]> + +- New upstream release 0.29.3 + + Disable python-notmuch building following upstream with the Debian package + + General + ------- + + Fix for use-after-free in notmuch_config_list_{key,val}. + + Fix for double close of file in notmuch-dump. + +------------------------------------------------------------------- Old: ---- notmuch-0.29.2.tar.xz notmuch-0.29.2.tar.xz.asc New: ---- notmuch-0.29.3.tar.xz notmuch-0.29.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notmuch.spec ++++++ --- /var/tmp/diff_new_pack.WRUApo/_old 2019-11-28 13:51:40.322676556 +0100 +++ /var/tmp/diff_new_pack.WRUApo/_new 2019-11-28 13:51:40.350676545 +0100 @@ -1,7 +1,7 @@ # # spec file for package notmuch # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: notmuch -Version: 0.29.2 +Version: 0.29.3 Release: 0 Summary: The mail indexer License: GPL-3.0-or-later @@ -29,7 +29,7 @@ # key fingerprint: 7A18 807F 100A 4570 C596 8420 7E4E 65C8 720B 706B Source4: notmuch.keyring -%{bcond_without python} +%{bcond_with python} %{bcond_without python3} %{bcond_without emacs} ++++++ notmuch-0.29.2.tar.xz -> notmuch-0.29.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/NEWS new/notmuch-0.29.3/NEWS --- old/notmuch-0.29.2/NEWS 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/NEWS 2019-11-27 13:20:54.000000000 +0100 @@ -1,3 +1,18 @@ +Notmuch 0.29.3 (2019-11-27) +=========================== + +General +------- + +Fix for use-after-free in notmuch_config_list_{key,val}. + +Fix for double close of file in notmuch-dump. + +Debian +------ + +Drop python2 support from shipped debian packaging. + Notmuch 0.29.2 (2019-10-19) =========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/bindings/python/notmuch/version.py new/notmuch-0.29.3/bindings/python/notmuch/version.py --- old/notmuch-0.29.2/bindings/python/notmuch/version.py 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/bindings/python/notmuch/version.py 2019-11-27 13:20:54.000000000 +0100 @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.29.2' +__VERSION__ = '0.29.3' SOVERSION = '5' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/debian/changelog new/notmuch-0.29.3/debian/changelog --- old/notmuch-0.29.2/debian/changelog 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/debian/changelog 2019-11-27 13:20:54.000000000 +0100 @@ -1,3 +1,19 @@ +notmuch (0.29.3-1) unstable; urgency=medium + + * New upstream bugfix release. + - fix use-after-free bug in libnotmuch + - fix double close of file in "notmuch dump" + + -- David Bremner <[email protected]> Wed, 27 Nov 2019 08:19:57 -0400 + +notmuch (0.29.2-2) experimental; urgency=medium + + * Drop python-notmuch binary package. + * Drop python2 build-dependency (Closes: #937161). + * Convert to pybuild for python bindings + + -- David Bremner <[email protected]> Sat, 02 Nov 2019 18:21:06 -0300 + notmuch (0.29.2-1) unstable; urgency=medium * New upstream bug fix release: fix file descriptor leak with gzipped diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/debian/control new/notmuch-0.29.3/debian/control --- old/notmuch-0.29.2/debian/control 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/debian/control 2019-11-27 13:20:54.000000000 +0100 @@ -14,7 +14,6 @@ libgmime-3.0-dev (>= 3.0.3~), libtalloc-dev, libz-dev, - python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), dh-python, dh-elpa (>= 1.3), @@ -73,19 +72,6 @@ This package provides the necessary development libraries and header files to allow you to develop new software using libnotmuch. -Package: python-notmuch -Architecture: all -Section: python -Depends: ${misc:Depends}, ${python:Depends}, libnotmuch5 (>= ${source:Version}) -Description: Python interface to the notmuch mail search and index library - Notmuch is a system for indexing, searching, reading, and tagging - large collections of email messages in maildir or mh format. It uses - the Xapian library to provide fast, full-text search with a very - convenient search syntax. - . - This package provides a Python interface to the notmuch - functionality, directly interfacing with a shared notmuch library. - Package: python3-notmuch Architecture: all Section: python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/debian/python3-notmuch.install new/notmuch-0.29.3/debian/python3-notmuch.install --- old/notmuch-0.29.2/debian/python3-notmuch.install 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/debian/python3-notmuch.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/python3* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/debian/rules new/notmuch-0.29.3/debian/rules --- old/notmuch-0.29.2/debian/rules 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/debian/rules 2019-11-27 13:20:54.000000000 +0100 @@ -1,9 +1,9 @@ #!/usr/bin/make -f -python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {} +export PYBUILD_NAME=notmuch %: - dh $@ --with python2,python3,elpa + dh $@ --with python3,elpa override_dh_auto_configure: BASHCMD=/bin/bash ./configure --prefix=/usr \ @@ -17,20 +17,17 @@ override_dh_auto_build: dh_auto_build -- V=1 - dh_auto_build --sourcedirectory bindings/python - cd bindings/python && $(python3_all) setup.py build + dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python $(MAKE) -C contrib/notmuch-mutt override_dh_auto_clean: dh_auto_clean - dh_auto_clean --sourcedirectory bindings/python - cd bindings/python && $(python3_all) setup.py clean -a + dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python dh_auto_clean --sourcedirectory bindings/ruby $(MAKE) -C contrib/notmuch-mutt clean override_dh_auto_install: dh_auto_install - dh_auto_install --sourcedirectory bindings/python - cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp + dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install dh_auto_install --sourcedirectory bindings/ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/lib/config.cc new/notmuch-0.29.3/lib/config.cc --- old/notmuch-0.29.2/lib/config.cc 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/lib/config.cc 2019-11-27 13:20:54.000000000 +0100 @@ -150,13 +150,17 @@ return true; } +static inline char * _key_from_iterator (notmuch_config_list_t *list) { + return talloc_strdup (list, (*list->iterator).c_str () + CONFIG_PREFIX.length ()); +} + const char * notmuch_config_list_key (notmuch_config_list_t *list) { if (list->current_key) talloc_free (list->current_key); - list->current_key = talloc_strdup (list, (*list->iterator).c_str () + CONFIG_PREFIX.length ()); + list->current_key = _key_from_iterator (list); return list->current_key; } @@ -166,7 +170,7 @@ { std::string strval; notmuch_status_t status; - const char *key = notmuch_config_list_key (list); + char *key = _key_from_iterator (list); /* TODO: better error reporting?? */ status = _metadata_value (list->notmuch, key, strval); @@ -177,6 +181,7 @@ talloc_free (list->current_val); list->current_val = talloc_strdup (list, strval.c_str ()); + talloc_free (key); return list->current_val; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/notmuch-dump.c new/notmuch-0.29.3/notmuch-dump.c --- old/notmuch-0.29.2/notmuch-dump.c 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/notmuch-dump.c 2019-11-27 13:20:54.000000000 +0100 @@ -329,13 +329,15 @@ } } - if (gzclose_w (output) != Z_OK) { + ret = gzclose_w (output); + if (ret) { fprintf (stderr, "Error closing %s: %s\n", name_for_error, gzerror (output, NULL)); ret = EXIT_FAILURE; output = NULL; goto DONE; - } + } else + output = NULL; if (output_file_name) { ret = rename (tempname, output_file_name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.29.2/version new/notmuch-0.29.3/version --- old/notmuch-0.29.2/version 2019-10-19 12:37:37.000000000 +0200 +++ new/notmuch-0.29.3/version 2019-11-27 13:20:54.000000000 +0100 @@ -1 +1 @@ -0.29.2 +0.29.3
