Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update sphinxsearch to 2.1.6.

Fix build on NetBSD. Force libiconv support as standard.

Changes in 2.1.6:
- fixed #1882, race of periodic and forced FLUSHing on an RT index
- fixed #1881, quorum syntax with '.' as blended char
- fixed #1880, crash on multiquery with one incorrect query
- fixed #1876, crash on words with large code points and infix searches
- fixed #1875, fixed crash on adding documents with long words in dict=keyword index with morphology and infixes enabled
- fixed #1857, crash in arabic stemmer
- fixed evaluating of LCS by an expression ranker
  • Loading branch information...
commit a4bba1bc5e40b335de5726180ace465382727690 1 parent d4fe978
fhajny authored
View
9 sphinxsearch/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
#
-DISTNAME= sphinx-2.1.5-release
+DISTNAME= sphinx-2.1.6-release
PKGNAME= ${DISTNAME:S/-/search-/:S/-release//}
CATEGORIES= databases textproc
MASTER_SITES= http://sphinxsearch.com/files/
@@ -40,7 +40,7 @@ PKG_USERS+= ${SPHINX_USER}:${SPHINX_GROUP}
SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= Setting standard paths
-SUBST_STAGE.paths= post-patch
+SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= sphinx.conf.in sphinx-min.conf.in Makefile.in src/searchd.cpp
SUBST_FILES.paths+= src/Makefile.in
SUBST_SED.paths+= -e 's,@CONFDIR@/log/searchd.pid,${SPHINX_RUN}/searchd.pid,g'
@@ -54,13 +54,16 @@ SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
CONFIGURE_DIRS= .
CONFIGURE_DIRS+= api/libsphinxclient
+CONFIGURE_ARGS+= --with-iconv
+
MAKE_JOBS_SAFE= no
-LDFLAGS.SunOS+= -lsocket -lnsl
+LIBS.SunOS+= -liconv -lsocket -lnsl
post-install:
${MV} ${DESTDIR}${EGDIR}/sphinx.conf.dist ${DESTDIR}${EGDIR}/sphinx-full.conf
${MV} ${DESTDIR}${EGDIR}/sphinx-min.conf.dist ${DESTDIR}${EGDIR}/sphinx-min.conf
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
View
12 sphinxsearch/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-SHA1 (sphinx-2.1.5-release.tar.gz) = c8065f8b8754f5858172712efb728d990f534ff4
-RMD160 (sphinx-2.1.5-release.tar.gz) = e6882a4f9863bb6c4f986e381a465af81f595360
-Size (sphinx-2.1.5-release.tar.gz) = 2414784 bytes
-SHA1 (patch-Makefile.in) = 948f412b7c7949dff4cf8222507bc7d3f856f4fc
-SHA1 (patch-src_searchd.cpp) = cbbadb740f117bcb1a29b9770c5e4aaeefbaa110
-SHA1 (patch-src_sphinxstd.h) = 9b41a32725016f7d768d727944be8bef39b604f5
+SHA1 (sphinx-2.1.6-release.tar.gz) = fe4dfc605afe8f58d9e25fd0c58dfed1673ec4b1
+RMD160 (sphinx-2.1.6-release.tar.gz) = 13fc7c061fddd7917f08ca8409214d4a53a28acf
+Size (sphinx-2.1.6-release.tar.gz) = 2429835 bytes
+SHA1 (patch-Makefile.in) = cde29f401b40e191ef957078fe0a845909fc96ab
+SHA1 (patch-src_searchd.cpp) = 7f5aea11d4ebe9f293f4d6346811bc3e821620f9
+SHA1 (patch-src_sphinxstd.h) = f35839cee4dd14458ad0c00c60a1d9b4f601e9d6
View
12 sphinxsearch/options.mk
@@ -3,8 +3,8 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.sphinx-search
PKG_OPTIONS_NONEMPTY_SETS= db
PKG_OPTIONS_SET.db= mysql pgsql
-PKG_SUPPORTED_OPTIONS= iconv
-PKG_SUGGESTED_OPTIONS= mysql iconv
+PKG_SUPPORTED_OPTIONS= #
+PKG_SUGGESTED_OPTIONS= mysql
.include "../../mk/bsd.options.mk"
@@ -21,11 +21,3 @@ CONFIGURE_ARGS+= --with-pgsql
.else
CONFIGURE_ARGS+= --without-pgsql
.endif
-
-.if !empty(PKG_OPTIONS:Miconv)
-CONFIGURE_ARGS+= --with-iconv
-LDFLAGS+= -liconv
-. include "../../converters/libiconv/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-iconv
-.endif
View
14 sphinxsearch/patches/patch-Makefile.in
@@ -2,7 +2,7 @@ $NetBSD$
Force pkgsrc compatible locations.
---- Makefile.in.orig 2012-08-15 13:58:33.000000000 +0000
+--- Makefile.in.orig 2013-11-11 19:18:55.000000000 +0000
+++ Makefile.in
@@ -79,7 +79,7 @@ am__nobase_list = $(am__nobase_strip_set
am__base_list = \
@@ -13,7 +13,7 @@ Force pkgsrc compatible locations.
DATA = $(sysconf_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-@@ -222,6 +222,7 @@ sbindir = @sbindir@
+@@ -225,6 +225,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -21,7 +21,7 @@ Force pkgsrc compatible locations.
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
-@@ -290,24 +291,24 @@ sphinx-min.conf.dist: $(top_builddir)/co
+@@ -296,24 +297,24 @@ sphinx-min.conf.dist: $(top_builddir)/co
cd $(top_builddir) && $(SHELL) ./config.status $@
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
@@ -52,7 +52,7 @@ Force pkgsrc compatible locations.
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -624,7 +625,7 @@ check: check-recursive
+@@ -630,7 +631,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
@@ -61,7 +61,7 @@ Force pkgsrc compatible locations.
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
-@@ -675,7 +676,6 @@ info-am:
+@@ -681,7 +682,6 @@ info-am:
install-data-am:
@$(NORMAL_INSTALL)
@@ -69,7 +69,7 @@ Force pkgsrc compatible locations.
install-dvi: install-dvi-recursive
install-dvi-am:
-@@ -732,7 +732,7 @@ uninstall-am: uninstall-sysconfDATA
+@@ -738,7 +738,7 @@ uninstall-am: uninstall-sysconfDATA
distclean distclean-generic distclean-hdr distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
@@ -78,7 +78,7 @@ Force pkgsrc compatible locations.
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
-@@ -742,9 +742,6 @@ uninstall-am: uninstall-sysconfDATA
+@@ -748,9 +748,6 @@ uninstall-am: uninstall-sysconfDATA
tags-recursive uninstall uninstall-am uninstall-sysconfDATA
View
6 sphinxsearch/patches/patch-src_searchd.cpp
@@ -2,14 +2,14 @@
Avoid hard-coded paths.
---- src/searchd.cpp.orig 2012-10-16 16:28:39.000000000 +0000
+--- src/searchd.cpp.orig 2014-02-19 19:13:38.000000000 +0000
+++ src/searchd.cpp
-@@ -14434,7 +14434,7 @@ void ShowHelp ()
+@@ -19128,7 +19128,7 @@ void ShowHelp ()
"--safetrace\t\tonly use system backtrace() call in crash reports\n"
"\n"
"Examples:\n"
- "searchd --config /usr/local/sphinx/etc/sphinx.conf\n"
-+ "searchd --config @PKG_SYSCONFDIR@//sphinx.conf\n"
++ "searchd --config @PKG_SYSCONFDIR@/sphinx.conf\n"
#if USE_WINDOWS
"searchd --install --config c:\\sphinx\\sphinx.conf\n"
#endif
View
6 sphinxsearch/patches/patch-src_sphinxstd.h
@@ -2,15 +2,17 @@
Portability fixes.
---- src/sphinxstd.h.orig 2013-04-18 15:15:44.000000000 +0000
+--- src/sphinxstd.h.orig 2014-01-22 15:16:21.000000000 +0000
+++ src/sphinxstd.h
-@@ -67,6 +67,11 @@ typedef int __declspec("SAL_nokernel") _
+@@ -75,6 +75,13 @@ typedef int __declspec("SAL_nokernel") _
#endif
#endif
+#ifdef __NetBSD__
+#define pthread_mutexattr_setpshared(m,a) (0)
+#define pthread_condattr_setpshared(m,a) (0)
++#include "sys/signal.h"
++#define PTHREAD_STACK_MIN MINSIGSTKSZ
+#endif
+
/////////////////////////////////////////////////////////////////////////////
Please sign in to comment.
Something went wrong with that request. Please try again.