packages: sphinx/sphinx.spec, sphinx/bug-297.patch (NEW) - 0000297: indexer...

[glen]

Author: glen                         Date: Wed Feb  9 10:34:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0000297: indexer --rotate causes non-recoverable lock failure occasionally

---- Files affected:
packages/sphinx:
   sphinx.spec (1.37 -> 1.38) , bug-297.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/sphinx/sphinx.spec
diff -u packages/sphinx/sphinx.spec:1.37 packages/sphinx/sphinx.spec:1.38
--- packages/sphinx/sphinx.spec:1.37	Sat Feb  5 02:12:26 2011
+++ packages/sphinx/sphinx.spec	Wed Feb  9 11:34:11 2011
@@ -20,7 +20,7 @@
 Summary(pl.UTF-8):	Silnik przeszukiwania pełnotekstowego SQL open-source
 Name:		sphinx
 Version:	0.9.9
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://www.sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@
 Source2:	%{name}.logrotate
 Patch0:		%{name}-system-libstemmer.patch
 Patch1:		bug-468.patch
+Patch2:		bug-297.patch
 URL:		http://www.sphinxsearch.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -150,6 +151,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e '
 	s#/var/run/#/var/run/sphinx/#
@@ -306,6 +308,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/02/09 10:34:11  glen
+- 0000297: indexer --rotate causes non-recoverable lock failure occasionally
+
 Revision 1.37  2011/02/05 01:12:26  sparky
 - corrected lang tag in %description
 

================================================================
Index: packages/sphinx/bug-297.patch
diff -u /dev/null packages/sphinx/bug-297.patch:1.1
--- /dev/null	Wed Feb  9 11:34:16 2011
+++ packages/sphinx/bug-297.patch	Wed Feb  9 11:34:11 2011
@@ -0,0 +1,13 @@
+http://www.sphinxsearch.com/bugs/view.php?id=297
+https://code.google.com/p/sphinxsearch/source/detail?r=2051
+
+--- sphinx-0.9.9/src/sphinx.cpp~	2011-02-09 12:30:45.000000000 +0200
++++ sphinx-0.9.9/src/sphinx.cpp	2011-02-09 12:33:23.908126477 +0200
+@@ -14386,6 +14386,7 @@
+ 	{
+ 		m_sLastError.SetSprintf ( "failed to lock %s: %s", sName, strerror(errno) );
+ 		::close ( m_iLockFD );
++		m_iLockFD = -1;
+ 		return false;
+ 	}
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx.spec?r1=1.37&r2=1.38&f=u