Update to 1.2.15. From the changelog:
Omega 1.2.15 (2013-04-16):
omega:
* Don't pointlessly link utf8convert.o into the omega CGI.
Omega 1.2.14 (2013-03-14):
indexers:
* omindex:
+ Correct "max" -> "min" when reserving space for shared strings in .xlsx
files. This just means we now reserve a more appropriate amount of space
to start with.
+ Ignore .com files by default.
Omega 1.2.13 (2013-01-09):
indexers:
* omindex:
+ Extracting text using external filters now works for filenames containing a
newline character - previously the newline got lost during escaping for the
shell.
+ Fix segfault when -F option without a ':' is passed.
+ Skip a file if we get a read error while calculating the MD5 checksum (used
for duplicate detection) - previously we used a checksum of the file up to
that point.
+ Avoid rereading SVG and Atom files when we calculate their MD5 checksums.
+ Improvement --help output and man page, most notably:
- Say explicitly that --sample-size accepts the same formats as --max-size.
- Note default size limit on files to index is unlimited.
+ When generating a sample for a CSV file, limit the size we pre-allocate to
the CSV file size if that's smaller than the requested sample size, in case
the user sets that limit very high.
omega:
* Fix to decode %-encoded character at the end of the query string.
Omega 1.2.12 (2012-06-27):
No changes since 1.2.11 except to bump the version - this release was made to
fix an incorrect library version information update in xapian-core 1.2.11.
Omega 1.2.11 (2012-06-26):
indexers:
* Change HTML parser's handling of multiple <body> tags and of text outside of
<body> to match the behaviour of modern web browsers. (ticket#599)
* omindex:
+ Add command line option to control the size of the document sample stored.
Patch from Mihai Bivol.
+ Rework .xlsx parsing to substitute the shared strings into the positions
they are used in, so that the sample actually matches what appears in the
spreadsheet, and to index calculated cell contents.
+ Improve handling of headers and footers in OpenDocument documents.
+ pdftotext outputs a formfeed between each page, which messes up our "empty
body" check, so trim any trailing formfeeds before this check.
Omega 1.2.10 (2012-05-09):
indexers:
* Add support for CDATA to HTML/XML parser.
* omindex:
+ Add --max-size option, based on patch from ndaley in ticket#587.
+ Add support for atom feed files, patch from Mihai Bivol in ticket#595.
+ If the document with the highest existing docid before the run was updated,
we were reporting it as "added", but now we correctly report it as
"updated". (Backported from 1.3.0).
+ Catch and report std::exception explicitly, so failing to allocate memory
is no longer reported as "Unknown exception". (Backported from 1.3.0).
Omega 1.2.9 (2012-03-08):
documentation:
* docs/overview.html:
+ Document that libmagic is used to determine the MIME type if the extension
isn't known. Partly addresses ticket#569.
+ We now limit time as well as CPU and memory for external filters.
indexers:
* Our HTML parser now ignores sections bracketed by <!--UdmComment--> and
<!--/UdmComment-->, like we already do for <!--htdig_noindex-->.
* omindex: Add more extensions to the default ignore list: bin dat db fon jar
lnk pyc pyd pyo sqlite sqlite3 sqlite-journal tmp ttf
(schmonz)
diff -r1.20 -r1.21 pkgsrc/textproc/xapian-omega/Makefile| @@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.20 2013/05/31 12:42:24 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2013/06/04 21:28:26 schmonz Exp $ | |
| 2 | # | 2 | # | |
| 3 | 3 | |||
| 4 | DISTNAME= xapian-omega-1.2.8 | 4 | DISTNAME= xapian-omega-${VERSION} | |
| 5 | PKGREVISION= 4 | 5 | VERSION= 1.2.15 | |
| 6 | CATEGORIES= textproc | 6 | CATEGORIES= textproc | |
| 7 | MASTER_SITES= http://oligarchy.co.uk/xapian/1.2.8/ | 7 | MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/ | |
| 8 | 8 | |||
| 9 | MAINTAINER= schmonz@NetBSD.org | 9 | MAINTAINER= schmonz@NetBSD.org | |
| 10 | HOMEPAGE= http://xapian.org/docs/omega/overview.html | 10 | HOMEPAGE= http://xapian.org/docs/omega/overview.html | |
| 11 | COMMENT= Search engine application for websites using Xapian | 11 | COMMENT= Search engine application for websites using Xapian | |
| 12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
| 13 | 13 | |||
| 14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
| 15 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | 15 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |
| 16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
| 17 | USE_LANGUAGES= c c++ | 17 | USE_LANGUAGES= c c++ | |
| 18 | USE_TOOLS+= perl:run | 18 | USE_TOOLS+= perl:run | |
| 19 | 19 | |||
| 20 | TEST_TARGET= check | 20 | TEST_TARGET= check |
| @@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
| 1 | $NetBSD: distinfo,v 1.10 2012/01/10 01:03:59 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.11 2013/06/04 21:28:26 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (xapian-omega-1.2.8.tar.gz) = c4d4c030ac72f85c46a681914bca7de154373a98 | 3 | SHA1 (xapian-omega-1.2.15.tar.gz) = a6aef085b1e63262c2f8ff7cd9419f28c8a53623 | |
| 4 | RMD160 (xapian-omega-1.2.8.tar.gz) = 2288159a0c388706d737825d33d222b68292b9fb | 4 | RMD160 (xapian-omega-1.2.15.tar.gz) = d9931283d9d6d174cc8136ed3e0df925e67e27cf | |
| 5 | Size (xapian-omega-1.2.8.tar.gz) = 615930 bytes | 5 | Size (xapian-omega-1.2.15.tar.gz) = 627733 bytes | |
| 6 | SHA1 (patch-aa) = 674bc7c739b870888a7a01e0eb832e025c55c4b8 | 6 | SHA1 (patch-aa) = 033625ce1ac9797c8bf193fe3549a637410c1307 | |
| 7 | SHA1 (patch-ab) = 40b2d59423f3bb60b801bbcec7a5db2140686b61 | 7 | SHA1 (patch-ab) = f84d1d457218186dff2a31e7d621085b58c891c8 |
| @@ -1,44 +1,44 @@ | @@ -1,44 +1,44 @@ | |||
| 1 | $NetBSD: patch-aa,v 1.3 2012/01/10 01:04:00 schmonz Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2013/06/04 21:28:26 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | Call it "xapian-omega" and follow hier(7). | 3 | Call it "xapian-omega" and follow hier(7). | |
| 4 | 4 | |||
| 5 | --- Makefile.in.orig 2011-12-14 05:34:48.000000000 +0000 | 5 | --- Makefile.in.orig 2013-04-17 00:14:08.000000000 +0000 | |
| 6 | +++ Makefile.in | 6 | +++ Makefile.in | |
| 7 | @@ -38,7 +38,7 @@ PRE_UNINSTALL = : | 7 | @@ -55,7 +55,7 @@ PRE_UNINSTALL = : | |
| 8 | POST_UNINSTALL = : | 8 | POST_UNINSTALL = : | |
| 9 | build_triplet = @build@ | 9 | build_triplet = @build@ | |
| 10 | host_triplet = @host@ | 10 | host_triplet = @host@ | |
| 11 | -pkglibbin_PROGRAMS = omega$(EXEEXT) | 11 | -pkglibbin_PROGRAMS = omega$(EXEEXT) | |
| 12 | +pkglibbin_PROGRAMS = xapian-omega$(EXEEXT) | 12 | +pkglibbin_PROGRAMS = xapian-omega$(EXEEXT) | |
| 13 | bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) | 13 | bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) | |
| 14 | check_PROGRAMS = htmlparsetest$(EXEEXT) md5test$(EXEEXT) \ | 14 | check_PROGRAMS = atomparsetest$(EXEEXT) htmlparsetest$(EXEEXT) \ | |
| 15 | urlenctest$(EXEEXT) utf8converttest$(EXEEXT) | 15 | md5test$(EXEEXT) urlenctest$(EXEEXT) utf8converttest$(EXEEXT) | |
| 16 | @@ -423,7 +423,7 @@ AM_CPPFLAGS = \ | 16 | @@ -461,7 +461,7 @@ AM_CPPFLAGS = \ | |
| 17 | -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ | 17 | -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ | |
| 18 | -DPKGLIBBINDIR=\"$(pkglibbindir)\" | 18 | -DPKGLIBBINDIR=\"$(pkglibbindir)\" | |
| 19 | 19 | |||
| 20 | -pkglibbindir = $(pkglibdir)/bin | 20 | -pkglibbindir = $(pkglibdir)/bin | |
| 21 | +pkglibbindir = $(libexecdir)/cgi-bin | 21 | +pkglibbindir = $(libexecdir)/cgi-bin | |
| 22 | dist_pkglibbin_SCRIPTS = outlookmsg2html | 22 | dist_pkglibbin_SCRIPTS = outlookmsg2html | |
| 23 | dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega | 23 | dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega | |
| 24 | TESTS = htmlparsetest$(EXEEXT)\ | 24 | TESTS = atomparsetest$(EXEEXT)\ | |
| 25 | @@ -431,7 +431,7 @@ TESTS = htmlparsetest$(EXEEXT)\ | 25 | @@ -470,7 +470,7 @@ TESTS = atomparsetest$(EXEEXT)\ | |
| 26 | urlenctest$(EXEEXT)\ | 26 | urlenctest$(EXEEXT)\ | |
| 27 | utf8converttest$(EXEEXT) | 27 | utf8converttest$(EXEEXT) | |
| 28 | 28 | |||
| 29 | -omegadatadir = $(datadir)/omega | 29 | -omegadatadir = $(datadir)/omega | |
| 30 | +omegadatadir = $(datadir)/xapian-omega | 30 | +omegadatadir = $(datadir)/xapian-omega | |
| 31 | dist_omegadata_DATA = htdig2omega.script mbox2omega.script | 31 | dist_omegadata_DATA = htdig2omega.script mbox2omega.script | |
| 32 | dist_sysconf_DATA = omega.conf | 32 | dist_sysconf_DATA = omega.conf | |
| 33 | 33 | |||
| 34 | @@ -662,8 +662,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_ | 34 | @@ -714,8 +714,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_ | |
| 35 | md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) | 35 | md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) $(EXTRA_md5test_DEPENDENCIES) | |
| 36 | @rm -f md5test$(EXEEXT) | 36 | @rm -f md5test$(EXEEXT) | |
| 37 | $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS) | 37 | $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS) | |
| 38 | -omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) | 38 | -omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) | |
| 39 | - @rm -f omega$(EXEEXT) | 39 | - @rm -f omega$(EXEEXT) | |
| 40 | +xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) | 40 | +xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) | |
| 41 | + @rm -f xapian-omega$(EXEEXT) | 41 | + @rm -f xapian-omega$(EXEEXT) | |
| 42 | $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS) | 42 | $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS) | |
| 43 | omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES) | 43 | omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES) $(EXTRA_omindex_DEPENDENCIES) | |
| 44 | @rm -f omindex$(EXEEXT) | 44 | @rm -f omindex$(EXEEXT) |
| @@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
| 1 | $NetBSD: patch-ab,v 1.2 2012/01/10 01:04:00 schmonz Exp $ | 1 | $NetBSD: patch-ab,v 1.3 2013/06/04 21:28:26 schmonz Exp $ | |
| 2 | 2 | |||
| 3 | Respect ${VARBASE} and follow hier(7). | 3 | Respect ${VARBASE} and follow hier(7). | |
| 4 | 4 | |||
| 5 | --- omega.conf.orig 2008-07-16 00:42:17.000000000 -0400 | 5 | --- omega.conf.orig 2013-04-17 00:01:38.000000000 +0000 | |
| 6 | +++ omega.conf | 6 | +++ omega.conf | |
| 7 | @@ -1,11 +1,11 @@ | 7 | @@ -1,11 +1,11 @@ | |
| 8 | # Directory containing Xapian databases: | 8 | # Directory containing Xapian databases: | |
| 9 | -database_dir /var/lib/omega/data | 9 | -database_dir /var/lib/omega/data | |
| 10 | +database_dir @VARBASE@/xapian-omega/data | 10 | +database_dir @VARBASE@/xapian-omega/data | |
| 11 | 11 | |||
| 12 | # Directory containing OmegaScript templates: | 12 | # Directory containing OmegaScript templates: | |
| 13 | -template_dir /var/lib/omega/templates | 13 | -template_dir /var/lib/omega/templates | |
| 14 | +template_dir @VARBASE@/xapian-omega/templates | 14 | +template_dir @VARBASE@/xapian-omega/templates | |
| 15 | 15 | |||
| 16 | # Directory to write Omega logs to: | 16 | # Directory to write Omega logs to: | |
| 17 | -log_dir /var/log/omega | 17 | -log_dir /var/log/omega | |
| 18 | +log_dir @VARBASE@/log/xapian-omega | 18 | +log_dir @VARBASE@/log/xapian-omega |