Received: by mail.netbsd.org (Postfix, from userid 605) id 7987684DB2; Sat, 4 Feb 2023 14:28:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A733584D9B for ; Sat, 4 Feb 2023 14:28:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id iosA4UsIvyJB for ; Sat, 4 Feb 2023 14:28:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7155784CD8 for ; Sat, 4 Feb 2023 14:28:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6467BFA90; Sat, 4 Feb 2023 14:28:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1675520899242560" MIME-Version: 1.0 Date: Sat, 4 Feb 2023 14:28:19 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20230204142819.6467BFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1675520899242560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Feb 4 14:28:19 UTC 2023 Modified Files: pkgsrc/textproc/csharp-xapian: Makefile pkgsrc/textproc/php-xapian: Makefile PLIST pkgsrc/textproc/xapian: Makefile.common distinfo distinfo-bindings Removed Files: pkgsrc/textproc/xapian/patches-bindings: patch-php7_php7_xapian__wrap.cc patch-php_php5_xapian__wrap.cc Log Message: Update to 1.4.22. From the changelog: testsuite: * Expand canceltransaction1 to test value changes are rolled back. matcher: * Minor optimisations to DPHWeight and TfIdfWeight weighting formulae calculations. * Optimise LatLongDistancePostingSource to avoid pow() call on each document with default k2 setting. glass backend: * Fix bug in recovery from WritableDatabase::commit() failing. If renaming to switch the new version file live fails (e.g. due to the disk being full) we discard the changes, try to write and switch to a different new version file with an increased revision (on failure of this too we close the database), then throw DatabaseError. Unfortunately the roll-back of state is not complete, and if we successfully switch to the different new version file then that bad state persists on disk. In order for this bug to manifest, repeating essentially the same operation which just failed needs to succeed which seems more likely to be a happen when using a filing system which has more sophisticated freespace handling (the reporter was using btrfs), though it's possible with any FS if another process frees up disk space in the small window between the two operations. Thanks to Uwe Kleine-Koenig for reporting and especially for coming up with an easy way to reproduce. build system: * configure: Enable -fno-math-errno if supported. We don't make use of maths function setting errno and if we tell the compiler that it can optimise them better in some cases. documentation: * INSTALL: Document assumptions about platform features * INSTALL: Add section on clang version requirements. Bindings: Lua: * When passing a Lua function for a Xapian functor object, the wrapper object was leaked in most cases (except for Xapian::StemImplementation). Perl: * Fix testsuite and docs for Perl 5.36.0 change. Prior to Perl 5.36.0 retrieving the string value of an integer could set the flag read by "SvPOK()", but that's no longer the case in Perl 5.36.0 and later. We already document the need to explicitly stringify numeric values passed where a string is needed, so just add the missing stringification to the testcase and document that it's required in more places when using Perl 5.36.0 and later. PHP8: * Add support for PHP8 (PHP 8.0, 8.1 and 8.2 should all work). The PHP bindings are now implemented entirely in C++ code using PHP's C extension API, and the `xapian.php` wrapper file no longer exists. This change means smaller and faster bindings. See the documentation for a recommended way to write code which works with both PHP7 and PHP8 bindings. To add PHP8 support we've had to drop support for PHP7. PHP7.4 reached end of life on 2022-11-28 so hopefully this isn't a problem for too many people, but if you need support for PHP7 please use xapian-bindings <= 1.4.21. Fixes #817, reported by Ryan Schmidt. * We now set the version in the metadata of the PHP module to the xapian-bindings version (previously it was unversioned). Python: * Drop support for Python 2.6. We need to use SWIG 4.1.0 for PHP8 support, but that no longer supports Python 2.6 so we have to raise the minimum Python 2 version to Python 2.7. The last Python 2.6 release was in 2013 so hopefully this isn't a problem for anyone, but if you still need to use Python 2.6 please use xapian-bindings <= 1.4.21. Python3: * Drop support for Python 3.2. We need to use SWIG 4.1.0 for PHP8 support, but that no longer supports Python 3.2 so we have to raise the minimum Python 3 version to Python 3.3. The last Python 3.2 release was in 2014 so hopefully this isn't a problem for anyone, but if you still need to use Python 3.2 please use xapian-bindings <= 1.4.21. Ruby: * Fix new Ruby 3.2 warning "undefining the allocator of T_DATA class swig_runtime_data" (fixed by the change to using a newer SWIG version). To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/csharp-xapian/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/php-xapian/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/php-xapian/PLIST cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/xapian/Makefile.common cvs rdiff -u -r1.47 -r1.48 pkgsrc/textproc/xapian/distinfo cvs rdiff -u -r1.25 -r1.26 pkgsrc/textproc/xapian/distinfo-bindings cvs rdiff -u -r1.1 -r0 \ pkgsrc/textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc \ pkgsrc/textproc/xapian/patches-bindings/patch-php_php5_xapian__wrap.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1675520899242560 Content-Disposition: inline Content-Length: 6067 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/csharp-xapian/Makefile diff -u pkgsrc/textproc/csharp-xapian/Makefile:1.27 pkgsrc/textproc/csharp-xapian/Makefile:1.28 --- pkgsrc/textproc/csharp-xapian/Makefile:1.27 Sat Dec 24 23:09:48 2022 +++ pkgsrc/textproc/csharp-xapian/Makefile Sat Feb 4 14:28:19 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2022/12/24 23:09:48 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2023/02/04 14:28:19 schmonz Exp $ PKGNAME= csharp-${PKGNAME_MODULE} -PKGREVISION= 2 COMMENT= C\# bindings for Xapian search engine HOMEPAGE= https://xapian.org/docs/bindings/csharp/ Index: pkgsrc/textproc/php-xapian/Makefile diff -u pkgsrc/textproc/php-xapian/Makefile:1.5 pkgsrc/textproc/php-xapian/Makefile:1.6 --- pkgsrc/textproc/php-xapian/Makefile:1.5 Sun Dec 11 14:23:17 2022 +++ pkgsrc/textproc/php-xapian/Makefile Sat Feb 4 14:28:19 2023 @@ -1,23 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2022/12/11 14:23:17 taca Exp $ +# $NetBSD: Makefile,v 1.6 2023/02/04 14:28:19 schmonz Exp $ PKGNAME= ${PHP_PKG_PREFIX}-${PKGNAME_MODULE} COMMENT= PHP bindings for Xapian search engine HOMEPAGE= https://xapian.org/docs/bindings/php/ -# https://trac.xapian.org/ticket/817 -PHP_VERSIONS_INCOMPATIBLE= 80 81 82 +PHP_VERSIONS_INCOMPATIBLE= 56 74 .include "../../lang/php/phpversion.mk" -.if (${PKG_PHP_MAJOR_VERS} == 5) CONFIGURE_ARGS+= --with-php -PHP_5_OR_EMPTY= 5 -.else -CONFIGURE_ARGS+= --with-php7 -PHP_5_OR_EMPTY= # empty -.endif - -PLIST_SUBST+= PHP_5_OR_EMPTY=${PHP_5_OR_EMPTY:Q} .include "${PHPPKGSRCDIR}/buildlink3.mk" .include "../../textproc/xapian/module.mk" Index: pkgsrc/textproc/php-xapian/PLIST diff -u pkgsrc/textproc/php-xapian/PLIST:1.1 pkgsrc/textproc/php-xapian/PLIST:1.2 --- pkgsrc/textproc/php-xapian/PLIST:1.1 Mon Jul 10 17:34:04 2017 +++ pkgsrc/textproc/php-xapian/PLIST Sat Feb 4 14:28:19 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2017/07/10 17:34:04 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.2 2023/02/04 14:28:19 schmonz Exp $ ${PHP_EXTENSION_DIR}/xapian.a ${PHP_EXTENSION_DIR}/xapian.so share/doc/xapian-bindings/php/examples/simpleexpand.php${PKG_PHP_MAJOR_VERS} @@ -6,4 +6,3 @@ share/doc/xapian-bindings/php/examples/s share/doc/xapian-bindings/php/examples/simplematchdecider.php${PKG_PHP_MAJOR_VERS} share/doc/xapian-bindings/php/examples/simplesearch.php${PKG_PHP_MAJOR_VERS} share/doc/xapian-bindings/php/index.html -share/php${PHP_5_OR_EMPTY}/xapian.php Index: pkgsrc/textproc/xapian/Makefile.common diff -u pkgsrc/textproc/xapian/Makefile.common:1.19 pkgsrc/textproc/xapian/Makefile.common:1.20 --- pkgsrc/textproc/xapian/Makefile.common:1.19 Sat Dec 24 23:10:04 2022 +++ pkgsrc/textproc/xapian/Makefile.common Sat Feb 4 14:28:18 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2022/12/24 23:10:04 wiz Exp $ +# $NetBSD: Makefile.common,v 1.20 2023/02/04 14:28:18 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.21 +VERSION= 1.4.22 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.47 pkgsrc/textproc/xapian/distinfo:1.48 --- pkgsrc/textproc/xapian/distinfo:1.47 Sun Sep 25 12:24:54 2022 +++ pkgsrc/textproc/xapian/distinfo Sat Feb 4 14:28:18 2023 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.47 2022/09/25 12:24:54 schmonz Exp $ +$NetBSD: distinfo,v 1.48 2023/02/04 14:28:18 schmonz Exp $ -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 +BLAKE2s (xapian-core-1.4.22.tar.xz) = ef21a1eed426b804be88c6ebd1c74e3d72fca3374d0d17467f392849ad374093 +SHA512 (xapian-core-1.4.22.tar.xz) = 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29 +Size (xapian-core-1.4.22.tar.xz) = 3019608 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.25 pkgsrc/textproc/xapian/distinfo-bindings:1.26 --- pkgsrc/textproc/xapian/distinfo-bindings:1.25 Sun Sep 25 12:24:54 2022 +++ pkgsrc/textproc/xapian/distinfo-bindings Sat Feb 4 14:28:18 2023 @@ -1,11 +1,9 @@ -$NetBSD: distinfo-bindings,v 1.25 2022/09/25 12:24:54 schmonz Exp $ +$NetBSD: distinfo-bindings,v 1.26 2023/02/04 14:28:18 schmonz Exp $ -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 +BLAKE2s (xapian-bindings-1.4.22.tar.xz) = 178c0c7414795f0be3b02dec756e95b55de920240711d7823f279707c8e1dd24 +SHA512 (xapian-bindings-1.4.22.tar.xz) = 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f +Size (xapian-bindings-1.4.22.tar.xz) = 1074840 bytes SHA1 (patch-configure) = 60ff2a667b174879a0ae3d327a9f2467bce31b89 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578 -SHA1 (patch-php7_php7_xapian__wrap.cc) = aa5ca15ef04bbd5038e23f4d1d01d1029243c68e -SHA1 (patch-php_php5_xapian__wrap.cc) = 0dd8cf51ebc1a2fb62dd3c277bd071e89b8eb022 SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b --_----------=_1675520899242560--