CVS commit: pkgsrc/textproc/xapian

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep 25 12:24:54 UTC 2022

Modified Files:
        pkgsrc/textproc/xapian: Makefile.common distinfo distinfo-bindings

Log Message:
Update to 1.4.21. From the changelog:

glass backend:

* Avoid throwing InvalidArgument when searching for overlong terms in some
  cases.  Such terms can't match, but are valid to query for.  Patch from
  Robert Stepanek in https://github.com/xapian/xapian/pull/313.

chert backend:

* Avoid throwing InvalidArgument when searching for overlong terms in some
  cases.  Such terms can't match, but are valid to query for.

build system:

* Clean up cygwin and mingw configure checks.  When we check $host_os, always
  anchor at the start (e.g. cygwin* not *cygwin*), and check for msys* as well
  since that's a derivative of cygwin and behaves similarly for the things
  we're checking here.

* Update to use AX_CXX_COMPILE_STDCXX which is a replacement for
  AX_CXX_COMPILE_STDCXX_11 (which we were using) which also supports newer C++
  standards versions which will be useful.  For C++11 the only difference seems
  to be that the macro now checks for attribute support - we use C++11
  attributes so that seems a good thing.

documentation:

* INSTALL: Restructure MSVC section for clarity.

* INSTALL: Mention -D_FORTIFY_SOURCE=3 too (fairly new - requires GCC 12).

* Consistently say "macOS" not "Mac OS X", "OS X", etc.

* admin_notes.rst:

  + Update locking section to cover Open File Description locks

  + Add some discussion of block sizes (fixes #819, reported by mgautier)

  + Fix cut-and-paste error - we were suggesting that the docdata table only
    exists if there's positional data.  Noted by Gaurav Arora.

  + Improve markup

examples:

* Stop using std::endl in examples since this seems to be C++ best practice
  as it causes a flush of the stream, which is rarely actually wanted.  Also
  often the replacement \n can be combined with a string literal.

portability:

* Stop trying to check for incompatible C++ ABI between the compiler used to
  build xapian-core and the compiler used to build code using xapian-core.

  This check was helpful in the GCC 3 days, but ABI versions 2 and up are
  compatible aside from obscure corner cases, and GCC now defaults to using the
  latest ABI version it supports.  The result is that this check is no longer
  useful enough to justify the noise.

  We still check for incompatible _GLIBCXX_DEBUG between the library and
  application builds, since that will cause things not to work, and the normal
  error message doesn't make it clear what's wrong.

  Reported by David Bremner.

* Fix new warnings from GCC 12.

* Avoid undefined value use when unpacking a key in a corrupted glass docdata
  table.  We now skip further checks on the entry in this case.

* Merge allocations in MSVC directory reading compatibility code so we can
  allocate in a single malloc() call.

* Add accept() wrapper which checks an assumption that Microsoft's SOCKET type
  only actually holds 32 bit values even in 64 bit platforms and throws an
  exception if violated.

* Eliminate a use of sprintf.

* Squash some unhelpful MSVC deprecation warnings.

* Declare dummy invalid parameter handler noexcept to fix a warning from MSVC.

* Include <stdlib.h> in configure check for sys_errlist as that's where it is
  with mingw and MSVC.

debug code:

* Fix debug logging for Xapian::Internal::intrusive_ptr<const T>.

  GCC 12.2 warned about infinite recursion in the old version, and this seems
  to be the case.  This code has been there a long time, but is only used when
  debug logging is enabled.  It does seem to be used, so presumably nobody's
  tried to log something which triggered it.

Updating during the freeze for the bug and portability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/xapian/Makefile.common
cvs rdiff -u -r1.46 -r1.47 pkgsrc/textproc/xapian/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/xapian/distinfo-bindings

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/xapian/Makefile.common
diff -u pkgsrc/textproc/xapian/Makefile.common:1.16 pkgsrc/textproc/xapian/Makefile.common:1.17
--- pkgsrc/textproc/xapian/Makefile.common:1.16 Mon Jul 11 18:25:18 2022
+++ pkgsrc/textproc/xapian/Makefile.common      Sun Sep 25 12:24:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2022/07/11 18:25:18 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.17 2022/09/25 12:24:54 schmonz Exp $
 # used by textproc/csharp-xapian/Makefile
 # used by textproc/lua-xapian/Makefile
 # used by textproc/p5-Xapian/Makefile
@@ -9,7 +9,7 @@
 # used by textproc/xapian/Makefile
 # used by textproc/xapian-omega/Makefile
 
-VERSION=               1.4.20
+VERSION=               1.4.21
 CATEGORIES=            textproc
 MASTER_SITES=          http://oligarchy.co.uk/xapian/${VERSION}/
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/textproc/xapian/distinfo
diff -u pkgsrc/textproc/xapian/distinfo:1.46 pkgsrc/textproc/xapian/distinfo:1.47
--- pkgsrc/textproc/xapian/distinfo:1.46        Mon Jul 11 18:25:18 2022
+++ pkgsrc/textproc/xapian/distinfo     Sun Sep 25 12:24:54 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2022/07/11 18:25:18 schmonz Exp $
+$NetBSD: distinfo,v 1.47 2022/09/25 12:24:54 schmonz Exp $
 
-BLAKE2s (xapian-core-1.4.20.tar.xz) = 01fe3fd73acb43e8cab478ca9e5dbd83818322bf4eccf6d340b2cc9954677433
-SHA512 (xapian-core-1.4.20.tar.xz) = e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35
-Size (xapian-core-1.4.20.tar.xz) = 3003788 bytes
+BLAKE2s (xapian-core-1.4.21.tar.xz) = 1a72c0f57ce75ad991d780a4bd5391f06455ccbd5bc21ecb10e651087a6b78b2
+SHA512 (xapian-core-1.4.21.tar.xz) = 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
+Size (xapian-core-1.4.21.tar.xz) = 3018384 bytes
 SHA1 (patch-common_errno__to__string.cc) = c5d9613e6676e1dcd3d9caabf113046d5e471454
 SHA1 (patch-common_safesyssocket.h) = 032d441853914d510bc285bb682a98c4ee264d52
 SHA1 (patch-xapian-config.in) = 470d1de7f04b8b8817abbcf56b5b71a36948de97

Index: pkgsrc/textproc/xapian/distinfo-bindings
diff -u pkgsrc/textproc/xapian/distinfo-bindings:1.24 pkgsrc/textproc/xapian/distinfo-bindings:1.25
--- pkgsrc/textproc/xapian/distinfo-bindings:1.24       Mon Jul 11 18:25:18 2022
+++ pkgsrc/textproc/xapian/distinfo-bindings    Sun Sep 25 12:24:54 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo-bindings,v 1.24 2022/07/11 18:25:18 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.25 2022/09/25 12:24:54 schmonz Exp $
 
-BLAKE2s (xapian-bindings-1.4.20.tar.xz) = b69c6acc546b0fa5ba3ce6f4db07109ea629945a924d4020892aaa62c619f6bc
-SHA512 (xapian-bindings-1.4.20.tar.xz) = bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
-Size (xapian-bindings-1.4.20.tar.xz) = 1143304 bytes
+BLAKE2s (xapian-bindings-1.4.21.tar.xz) = 8703a5a05c016e13581cdff56b9e39c8e2e1feb8fe95759f6f4c83c14d7e1a44
+SHA512 (xapian-bindings-1.4.21.tar.xz) = 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
+Size (xapian-bindings-1.4.21.tar.xz) = 1151620 bytes
 SHA1 (patch-configure) = 60ff2a667b174879a0ae3d327a9f2467bce31b89
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578