diff --git a/0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch b/0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch deleted file mode 100644 index f5af685..0000000 --- a/0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/backends/chert/chert_cursor.cc b/backends/chert/chert_cursor.cc -index c470c85a276658851a764945ab3f0887827c2ce2..ab29efefbab93a8e2f885e58fd69210231c84b30 100644 ---- a/backends/chert/chert_cursor.cc -+++ b/backends/chert/chert_cursor.cc -@@ -1,7 +1,7 @@ - /* chert_cursor.cc: Btree cursor implementation - * - * Copyright 1999,2000,2001 BrightStation PLC -- * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2012 Olly Betts -+ * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2015 Olly Betts - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -97,6 +97,7 @@ ChertCursor::rebuild() - C[level].n = B->C[level].n; - C[level].p = B->C[level].p; - version = B->cursor_version; -+ B->cursor_created_since_last_modification = true; - } - - ChertCursor::~ChertCursor() -diff --git a/backends/chert/chert_table.cc b/backends/chert/chert_table.cc -index 2a97fd4405ed051e6cd1ec18f97bad49feb674d3..7b96ed9b150f20ba360fb486e7a2f96db3936a70 100644 ---- a/backends/chert/chert_table.cc -+++ b/backends/chert/chert_table.cc -@@ -2,7 +2,7 @@ - * - * Copyright 1999,2000,2001 BrightStation PLC - * Copyright 2002 Ananova Ltd -- * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2015 Olly Betts -+ * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 Olly Betts - * Copyright 2008 Lemur Consulting Ltd - * Copyright 2010 Richard Boulton - * -@@ -1483,6 +1483,11 @@ ChertTable::basic_open(bool revision_supplied, chert_revision_number_t revision_ - - base_letter = ch; - -+ if (cursor_created_since_last_modification) { -+ cursor_created_since_last_modification = false; -+ ++cursor_version; -+ } -+ - /* ready to open the main file */ - - RETURN(true); -@@ -2041,6 +2046,11 @@ ChertTable::cancel() - changed_n = 0; - changed_c = DIR_START; - seq_count = SEQ_START_POINT; -+ -+ if (cursor_created_since_last_modification) { -+ cursor_created_since_last_modification = false; -+ ++cursor_version; -+ } - } - - /************ B-tree reading ************/ diff --git a/xapian-core-1.2.20.tar.xz b/xapian-core-1.2.20.tar.xz deleted file mode 100644 index 2cf16c2..0000000 --- a/xapian-core-1.2.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4f8d5b9e393ea32912955a17e6b6ea3f6c052ae9133ded6fe48582c25b1aa8f -size 3181788 diff --git a/xapian-core-1.2.20.tar.xz.asc b/xapian-core-1.2.20.tar.xz.asc deleted file mode 100644 index a428d54..0000000 --- a/xapian-core-1.2.20.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJU9vFYAAoJEBgUewc7rSsHrwwQAIks18I/xF+pY7KKhs+5m28T -1LusVCrXWZUBUvOkNPNVPncbwELRZ3GZBdzPAerVUiqmrZIqp6Rqtdf23xh0HjX1 -AU2cbApVIC8TIuwpOqP4y42lgm7Cll623BryLpxlZhG9bB+yRNZZrtPGbFQ+6Zwu -X0r/km3wLsoZZVDD/jCLQHtaWHouP/+UN00dgKe/eiAvw4ZAeavOleNYlS/JepyV -AO6gbuG2zPGCxOHOmaaQuZ3oVX8npXBPslo9DYO51OQAuluXIIBEMqWUXLDi2Ryt -sJGYhHQxJcJLwExswfpGj4yokAnJpVW2kwF6E+/NMxQiFT4UH7mKMGFBIUvR05b+ -8jAk6FdXV2hGr8yq/BGK3MXrSLfUwck1hZVLxNCP8tuK0lZmr+pzH2uClrcXUiKN -ZOC3chDLPv01dLtmBfhtyOwS2k5XptVsTCAB7FIYfP3z4E2S4XNcbxbp9Hxjzk4v -2BLV1pBjAewT/UAcxNJmbIVEzSSpEkCqARzFturfy/lptFQ2paOK7iBDKL2DWXuE -fK3Cy+HunQdkdRYyRWmxBRVJYnXywsNYhqM2OLHMY9QiZ1ud1ak1xPu/mn8xm0eL -WWGFwV4qDJEcNbQqiMM3817Dug1umcjEZC1vTEo9/GIDcB9HTLwZFeE6sJR3mx8L -MhPzhnmJE2AldrgztbgG -=07w6 ------END PGP SIGNATURE----- diff --git a/xapian-core-1.2.21.tar.xz b/xapian-core-1.2.21.tar.xz new file mode 100644 index 0000000..4634a30 --- /dev/null +++ b/xapian-core-1.2.21.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f +size 3202560 diff --git a/xapian-core-1.2.21.tar.xz.asc b/xapian-core-1.2.21.tar.xz.asc new file mode 100644 index 0000000..647579f --- /dev/null +++ b/xapian-core-1.2.21.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJVXYmwAAoJEBgUewc7rSsHL1wP/RUsxFiyBeMWsSX5wWP2ppQt +ga+fv80U3rwNNG4bA57xIA6JLvfVsw0mlzmQVtR39YFDho7QOJ2p1kG36wLws4nA +lgAupzMfGz5hXT0MOdZitFQzAzDH0HwOaKRsXKUt4ZmE0NJVNbFkvM2+8ekUoyYt +RKqNJcUKiCsx1+77m9n6cKp6DA0Ytze1QiWAgCZiFqfQFXUfWJSdUpBalZKTPGBN +ZYIU1+ObVRg9yolTeX8uNbioSJ7aPANrKv9CCGl+BVVZPzlU3mqY9t9lkHl/C/+u +lirW0+UHRRv9HXpGnoUA6fT+F7jqDt3ks9MShK7h2WGENcXNMOlkdOSK4fprlgyU +HSxpKiEhUg8yDXEdbjsntZ61HDF86hbpbQiwI4pxAvTycb95UBSIBGgITSLUbf+3 +RtVFarAVRBiRLScJmyweYwk2PdZ5BTG65CWNk91bERDgV93+vIIjnJlp2RQpiHMt +mQpWZvtMJdnzCDnCMISCQBsSPpagj01DCpxOh8M1ckJLKCdZe7tFDTaOl4V3M24z +02oyZE3hyRcbmdDnnZAZXOrVFLTRqle3zs/mkqYz2onQANcKmBgk7st/r/kwLATe +aaOuyZeJCFY3v+wOKh8p9uQHsR2vd0y5MqgjGm09tnTK1ZOuZZ0L9/ibdPsQ4zNf +Pu23DudGdEfpprRSknl4 +=VprO +-----END PGP SIGNATURE----- diff --git a/xapian-core.changes b/xapian-core.changes index 1190b11..8eb5cb0 100644 --- a/xapian-core.changes +++ b/xapian-core.changes @@ -1,3 +1,114 @@ +------------------------------------------------------------------- +Thu May 21 08:54:55 UTC 2015 - tittiatcoke@gmail.com + +- Update to 1.2.21 + * API: + + QueryParser: Extend the set of characters allowed in the + start of a range to be anything except for '(' and characters <= ' '. + + * matcher: + + Reimplement OP_PHRASE for non-exact phrases. + + Reimplement OP_NEAR - the new implementation consistently + requires the terms to occur at different positions, and fixes + some previously missed matches. + + Fix a reversed check for picking the shorter position list + for an exact phrase of two terms. + + When matching an exact phrase, if a term doesn't occur where + we want, use its actual position to advance the anchor term, + rather than just checking the next position of the anchor term. + + * brass backend: + + Fix cursor versioning to consider cancel() and reopen() as + events where the cursor version may need incrementing, + and flag the current cursor version as used when a cursor is rebuilt. + + Avoid using file descriptions < 3 for writable database tables, + as it risks corruption if some code in the same process tries + to write to stdout or stderr without realising it is closed. + + * chert backend: + + Fix cursor versioning to consider cancel() and reopen() as + events where the cursor version may need incrementing, + and flag the current cursor version as used when a cursor is rebuilt. + + Avoid using file descriptions < 3 for writable database tables, + as it risks corruption if some code in the same process tries + to write to stdout or stderr without realising it is closed. + + * flint backend: + + Fix cursor versioning to consider cancel() and reopen() as + events where the cursor version may need incrementing, + and flag the current cursor version as used when a cursor is rebuilt. + + + * remote backend: + + + Fix sort by value when multiple databases are in use and one or + more are remote. + + * build system: + + + The compiler ABI check in the public API headers now issues a + warning (instead of an error) for an ABI mismatch for ABI versions + 2 and later (which means GCC >= 3.4). + + xapian-config,xapian-core.pc: When compiling with xlC on AIX, the + reported --cxxflags/--cflags now include -D_LARGE_FILES=1 as this + is defined for the library, and defining it changes the ABI of + std::string with this compiler, so it must also be defined when + building code using the Xapian API. + + xapian-core.pc: Include --enable-runtime-pseudo-reloc in --libs + output for mingw and cygwin, like xapian-config does. + + xapian-core.pc: Fix include directory reported by `pkg-config --cflags`. + + xapian-config: Fix typo so cached result of test in is_uninstalled() + is actually used on subsequent calls. + + configure: Changes in 1.2.19 broke the custom macro we use to probe + for supported compiler flags such that the flags never got used. + + configure: Set default value for AUTOM4TE before AC_OUTPUT so the + default will actually get used. + + soaktest: Link with libtool's '-no-install' or '-no-fast-install', + like we already do for other test programs, which means that libtool + doesn't need to generate shell script wrappers for them on most platforms. + + * documentation: + + API documentation: Minor wording tweaks and formatting improvements. + + docs/deprecation.rst: Add deprecation of omindex --preserve-nonduplicates + which happened in 1.2.4. + + HACKING: libtool 2.4.6 is now used for bootstrapping snapshots and releases. + + * tools: + + xapian-compact: Make sure we open all the tables of input databases at the + same revision. + + xapian-metadata: Add 'list' subcommand to list all the metadata keys. + + xapian-replicate: Fix connection timeout to be 10 seconds rather than 10000 + seconds (the incorrect timeout has been the case since 1.2.3). + + xapian-replicate: Set SO_KEEPALIVE for xapian-replicate's connection to the + master, and add command line option to allow setting socket-level timeouts + (SO_RCVTIMEO and SO_SNDTIMEO) on platforms that support them. + + xapian-replicate-server: Avoid potentially reading uninitialised data if a + changeset file is truncated. + + * portability: + + Add spaces between literal strings and macros which expand to literal strings + for C++11 compatibility. + + ValueCountMatchSpy::top_values_begin(): Fix the comparison function not to + return true for two equal elements, which manifests as incorrect sorting in + some cases when using clang's libc++ (which recent OS X versions do). + + apitest: The adddoc5 testcase fails under clang due to an exception handling + bug, so just #ifdef out the problematic part of the testcase when building + with clang for now. + + configure: Improve the probe for whether the test harness can use RTTI to + work for IBM's xlC compiler (which defaults to not generating RTTI). + + Use F_DUPFD where available to dup to a file descriptor which is >= 2, rather + than calling dup() until we get one. + + When unserialising a double, avoid reading one byte past the end of the + serialised value. + + When unserialising a double, add missing cast to unsigned char when we check + if the value will fit in the double type. + + Fix incorrect use of "delete" which should be "delete []". This is + undefined behaviour in C++, though the type is POD, so in practice this + probably worked OK on many platforms. + +- Drop patch 0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch + due to upstream inclusion + ------------------------------------------------------------------- Sat May 2 01:27:33 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/xapian-core.spec b/xapian-core.spec index b119b32..c470ce2 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -17,7 +17,7 @@ Name: xapian-core -Version: 1.2.20 +Version: 1.2.21 Release: 0 Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0 @@ -27,8 +27,6 @@ Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}. Source1: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring Source3: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch -Patch0: 0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -92,7 +90,6 @@ files needed for building packages which use Xapian %prep %setup -q -%patch0 -p1 %build %configure \