diff --git a/sphinx-0.9.9-default_listen.patch b/sphinx-0.9.9-default_listen.patch new file mode 100644 index 0000000..408df7c --- /dev/null +++ b/sphinx-0.9.9-default_listen.patch @@ -0,0 +1,26 @@ +diff -ur sphinx-0.9.9-orig/sphinx.conf.in sphinx-0.9.9/sphinx.conf.in +--- sphinx-0.9.9-orig/sphinx.conf.in 2009-11-07 00:09:58.000000000 +0100 ++++ sphinx-0.9.9/sphinx.conf.in 2010-12-11 17:35:07.383729029 +0100 +@@ -572,7 +572,7 @@ + # listen = 192.168.0.1:9312 + # listen = 9312 + # listen = /var/run/searchd.sock +- ++ listen = 127.0.0.1:9312 + + # log file, searchd run info is logged here + # optional, default is 'searchd.log' +Only in sphinx-0.9.9: sphinx.conf.in~ +diff -ur sphinx-0.9.9-orig/sphinx-min.conf.in sphinx-0.9.9/sphinx-min.conf.in +--- sphinx-0.9.9-orig/sphinx-min.conf.in 2009-11-07 00:09:58.000000000 +0100 ++++ sphinx-0.9.9/sphinx-min.conf.in 2010-12-11 17:35:25.640860529 +0100 +@@ -40,7 +40,7 @@ + + searchd + { +- port = 9312 ++ listen = 127.0.0.1:9312 + log = @CONFDIR@/log/searchd.log + query_log = @CONFDIR@/log/query.log + read_timeout = 5 +Only in sphinx-0.9.9: sphinx-min.conf.in~ diff --git a/sphinx.spec b/sphinx.spec index ffc532e..8ac6115 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 0.9.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -13,9 +13,11 @@ URL: http://sphinxsearch.com Source0: http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz Source1: %{name}.init Patch0: %{name}-%{version}-fix_static.patch +Patch1: %{name}-%{version}-default_listen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mysql-devel + BuildRequires: postgresql-devel BuildRequires: expat-devel #Requires: @@ -30,7 +32,7 @@ Requires(pre): shadow-utils %description Sphinx is a full-text search engine, distributed under GPL version 2. -Commercial licensing (eg. for embedded use) is also available upon request. +Commercial licensing (e.g. for embedded use) is also available upon request. Generally, it's a standalone search engine, meant to provide fast, size-efficient and relevant full-text search functions to other @@ -39,7 +41,7 @@ databases and scripting languages. Currently built-in data source drivers support fetching data either via direct connection to MySQL, or PostgreSQL, or from a pipe in a custom XML -format. Adding new drivers (eg. to natively support some other DBMSes) is +format. Adding new drivers (e.g. to natively support some other DBMSes) is designed to be as easy as possible. Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also @@ -74,6 +76,7 @@ Sphinx search engine, http://sphinxsearch.com/ %prep %setup -q %patch0 -p1 -b .fix_static +%patch1 -p1 -b .default_listen # Fix wrong-file-end-of-line-encoding sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql @@ -104,6 +107,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx # Create /var/run/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx +touch $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx/searchd.log +touch $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx/query.log # Create /var/lib/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx @@ -193,6 +198,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/sphinx %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/sphinx +%ghost %{_localstatedir}/run/sphinx/searchd.log +%ghost %{_localstatedir}/run/sphinx/query.log + + %files -n libsphinxclient %defattr(-,root,root,-) %doc COPYING api/java api/ruby api/*.php api/*.py api/libsphinxclient/README @@ -205,6 +214,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_includedir}/* %changelog +* Sat Dec 11 2010 Christof Damian - 0.9.9-3 +- change default listen address to localhost ( bug 566792 ) +- add ghost for files in /var/run/ ( bug 656694 ) + * Wed Jul 14 2010 Christof Damian - 0.9.9-2 - add COPYING file to lib package