CVS commit: pkgsrc/textproc/xapian-omega

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Nov  7 22:36:54 UTC 2023

Modified Files:
        pkgsrc/textproc/xapian-omega: distinfo
        pkgsrc/textproc/xapian-omega/patches: patch-Makefile.in
Removed Files:
        pkgsrc/textproc/xapian-omega/patches: patch-values.h

Log Message:
xapian-omega: update to 1.4.24. Changes:

documentation:

* Document $filesize error handling.

indexers:

* omindex:

  + Implement piped input to filters for __WIN32__.  Previously it looks like
    the filter was run but the input wasn't connected to its stdin so it would
    probably block indefinitely.

  + Fix corner case in shell emulation - we no longer set environment variables
    which start with a digit.

    This issue was spotted from reading the code - in practice this isn't a
    case that's likely to be encountered, and the previous behaviour doesn't
    appear to have any security consequences even if a user was somehow tricked
    into specifying an extraction command did this.

* scriptindex:

  + Check if we can actually support %z in parsedate action.  Previously we
    assumed we could if struct tm had a tm_gmtoff member, but that's only a
    necessary condition and not sufficient, e.g. on Cygwin we have tm_gmtoff
    but strptime() doesn't currently understand %z.

  + If we were expecting an action but didn't get an identifier this triggered
    an infinitely repeating error:

    Unknown index action ''

    Now we instead give a single error:

    Expected index action, found '...'

    where '...' shows the sequence of non-whitespace characters encountered.

testsuite:

* Run tests under eatmydata if available.

* Turn off MSYS2 argument conversion for tests as it breaks omegatest, and we
  shouldn't need this conversion there.

* omegatest: Rewrite in Perl as we were hitting non-portable quoting issues
  with the shell implementation, and really it had grown too large to make
  sense as a shell script anyway.

build system:

* Add --enable-werror configure option.

* configure: Only auto-enable -D_FORTIFY_SOURCE=2 if it works without
  additional libraries and remove the hard-coded block against using it
  on mingw.  Mingw-w64 v11.0.0 eliminated the requirement to link with -lssp
  so we now auto-enable -D_FORTIFY_SOURCE=2 there.

portability:

* Fix to build on Cygwin.

* Rename our bswap32 helper function to avoid clash with system-provided
  function on FreeBSD and NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/textproc/xapian-omega/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/xapian-omega/patches/patch-values.h

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-omega/distinfo
diff -u pkgsrc/textproc/xapian-omega/distinfo:1.42 pkgsrc/textproc/xapian-omega/distinfo:1.43
--- pkgsrc/textproc/xapian-omega/distinfo:1.42  Mon Jul 10 15:08:30 2023
+++ pkgsrc/textproc/xapian-omega/distinfo       Tue Nov  7 22:36:53 2023
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.42 2023/07/10 15:08:30 schmonz Exp $
+$NetBSD: distinfo,v 1.43 2023/11/07 22:36:53 schmonz Exp $
 
-BLAKE2s (xapian-omega-1.4.23.tar.xz) = fd1665473528f5af9831c6e14730c528c9ed54db3625f1aa503fb56b93abd55b
-SHA512 (xapian-omega-1.4.23.tar.xz) = 2137972cebb10315f35024c8a5e179ce082eab777e4fd795ba6700eeab0d77ec49b6e06d104222e77824898c25c1717d346564d59e5f349360fec89476e3ee4f
-Size (xapian-omega-1.4.23.tar.xz) = 571596 bytes
-SHA1 (patch-Makefile.in) = 10275e2771cefcc96b23c5ccce0877861b2da795
+BLAKE2s (xapian-omega-1.4.24.tar.xz) = f36e0c217c3da136d105c3a40eae4ee275b7dbfa217ef106e6d9cc33139ecb16
+SHA512 (xapian-omega-1.4.24.tar.xz) = d3a5c5c4de9a13ed2e55ab46915aaea1ba51120b5716a4e7cab9fb628ef2c979c83e17a44d3354045459d08a6d7041322182d9c81bdbb54eb6bd53431d147a9c
+Size (xapian-omega-1.4.24.tar.xz) = 580736 bytes
+SHA1 (patch-Makefile.in) = 6ef8d525f10028afc4dfa1cafed8861c0289ac4d
 SHA1 (patch-omega.conf) = f1e941dac326de7005cad0a5a4a2848e401855c4
-SHA1 (patch-values.h) = b3758856f5a34c47e4247d8076fbbdc1e65305e2

Index: pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in
diff -u pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in:1.2 pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in:1.3
--- pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in:1.2  Fri Aug  2 21:29:11 2019
+++ pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in      Tue Nov  7 22:36:53 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.2 2019/08/02 21:29:11 schmonz Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2023/11/07 22:36:53 schmonz Exp $
 
 Call it "xapian-omega" and follow hier(7).
 
---- Makefile.in.orig   2019-07-24 03:34:14.000000000 +0000
+--- Makefile.in.orig   2023-11-06 04:30:24.000000000 +0000
 +++ Makefile.in
 @@ -92,7 +92,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -13,7 +13,7 @@ Call it "xapian-omega" and follow hier(7
  bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) \
        omindex-list$(EXEEXT)
  check_PROGRAMS = atomparsetest$(EXEEXT) csvesctest$(EXEEXT) \
-@@ -805,7 +805,7 @@ AM_CPPFLAGS = \
+@@ -838,7 +838,7 @@ AM_CPPFLAGS = \
        -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \
        -DPKGLIBBINDIR=\"$(pkglibbindir)\"
  
@@ -21,17 +21,17 @@ Call it "xapian-omega" and follow hier(7
 +pkglibbindir = $(libexecdir)/cgi-bin
  dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml vcard2text
  dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
- dist_check_SCRIPTS = omegatest sourcetest
-@@ -819,7 +819,7 @@ TESTS = atomparsetest$(EXEEXT)\
-       urlenctest$(EXEEXT)\
-       utf8converttest$(EXEEXT)
+ dist_check_SCRIPTS = omegatest.pl sourcetest
+@@ -855,7 +855,7 @@ TESTS = atomparsetest$(EXEEXT)\
  
+ TEST_EXTENSIONS = .pl
+ PL_LOG_COMPILER = $(PERL)
 -omegadatadir = $(datadir)/omega
 +omegadatadir = $(datadir)/xapian-omega
  dist_omegadata_DATA = htdig2omega.script mbox2omega.script
  dist_sysconf_DATA = omega.conf
  
-@@ -1120,8 +1120,8 @@ md5test$(EXEEXT): $(md5test_OBJECTS) $(m
+@@ -1157,8 +1157,8 @@ md5test$(EXEEXT): $(md5test_OBJECTS) $(m
  common/str.$(OBJEXT): common/$(am__dirstamp) \
        common/$(DEPDIR)/$(am__dirstamp)