Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

listen_local.patch

@@ -0,0 +1,26 @@
+--- sphinx-2.2.11-release-orig/sphinx.conf.in	2019-09-05 08:57:23.608395395 -0400
++++ sphinx-2.2.11-release/sphinx.conf.in	2019-09-05 08:56:43.568117907 -0400
+@@ -810,8 +810,8 @@
+ 	# listen			= 192.168.0.1:9312
+ 	# listen			= 9312
+ 	# listen			= /var/run/searchd.sock
+-	listen			= 9312
+-	listen			= 9306:mysql41
++	listen			= 127.0.0.1:9312
++	listen			= 127.0.0.1:9306:mysql41
+ 
+ 	# log file, searchd run info is logged here
+ 	# optional, default is 'searchd.log'
+--- sphinx-2.2.11-release-orig/sphinx-min.conf.in	2019-09-05 08:59:14.851388059 -0400
++++ sphinx-2.2.11-release/sphinx-min.conf.in	2019-09-05 08:59:44.248857589 -0400
+@@ -49,8 +49,8 @@
+ 
+ searchd
+ {
+-	listen			= 9312
+-	listen			= 9306:mysql41
++	listen			= 127.0.0.1:9312
++	listen			= 127.0.0.1:9306:mysql41
+ 	log			= @CONFDIR@/log/searchd.log
+ 	query_log		= @CONFDIR@/log/query.log
+ 	read_timeout		= 5

sphinx-2.0.3-default_listen.patch

@@ -1,24 +0,0 @@
-diff -r -U3 sphinx-2.0.3-release.orig/sphinx.conf.in sphinx-2.0.3-release/sphinx.conf.in
---- sphinx-2.0.3-release.orig/sphinx.conf.in	2011-04-18 09:39:40.000000000 -0500
-+++ sphinx-2.0.3-release/sphinx.conf.in	2012-02-14 13:49:19.660872549 -0600
-@@ -716,7 +716,7 @@
- 	# listen			= 192.168.0.1:9312
- 	# listen			= 9312
- 	# listen			= /var/run/searchd.sock
--	listen			= 9312
-+        listen                  = 127.0.0.1:9312
- 	listen			= 9306:mysql41
- 
- 	# log file, searchd run info is logged here
-diff -r -U3 sphinx-2.0.3-release.orig/sphinx-min.conf.in sphinx-2.0.3-release/sphinx-min.conf.in
---- sphinx-2.0.3-release.orig/sphinx-min.conf.in	2011-04-18 09:39:40.000000000 -0500
-+++ sphinx-2.0.3-release/sphinx-min.conf.in	2012-02-14 13:49:55.682449012 -0600
-@@ -54,7 +54,7 @@
- 
- searchd
- {
--	listen			= 9312
-+        listen                  = 127.0.0.1:9312
- 	listen			= 9306:mysql41
- 	log			= @CONFDIR@/log/searchd.log
- 	query_log		= @CONFDIR@/log/query.log

sphinx-c99.patch

@@ -0,0 +1,99 @@
+Add missing return types to avoid build failures with C99 compilers.
+Include <string.h> to avoid implicit function declarations.
+Avoid incompatible pointer types and a format string warning.
+
+Partially fixed via:
+
+commit da41e452c5acc99ffe40f48be32d9ca7e55c407c
+Author: tomat <tomat@406a0c4d-033a-0410-8de8-e80135713968>
+Date:   Wed Jun 2 05:16:06 2010 +0000
+
+    fixed query buffer overrun and SIGPIPE in C API, mantis bug 489 \ 504
+    
+    git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@2316 406a0c4d-033a-0410-
+8de8-e80135713968
+
+Rest submitted upstream: <https://github.com/sphinxsearch/sphinx/pull/47>
+
+diff --git a/api/libsphinxclient/sphinxclient.c b/api/libsphinxclient/sphinxclient.c
+index 16f7913fa37b3bf3..0530fc2c65f1082c 100644
+--- a/api/libsphinxclient/sphinxclient.c
++++ b/api/libsphinxclient/sphinxclient.c
+@@ -311,7 +311,7 @@ static void sphinx_free_results ( sphinx_client * client )
+ }
+ 
+ 
+-static sock_close ( int sock );
++static void sock_close ( int sock );
+ 
+ 
+ #define safe_free(_ptr) \
+@@ -1436,7 +1436,7 @@ static int sock_set_blocking ( int sock )
+ }
+ 
+ 
+-static sock_close ( int sock )
++static void sock_close ( int sock )
+ {
+ 	if ( sock<0 )
+ 		return;
+diff --git a/api/libsphinxclient/test.c b/api/libsphinxclient/test.c
+index f779bb1ff638a179..670e379b4ad3c36f 100644
+--- a/api/libsphinxclient/test.c
++++ b/api/libsphinxclient/test.c
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #if _WIN32
+ #include <winsock2.h>
+@@ -218,7 +219,8 @@ void test_excerpt_spz ( sphinx_client * client )
+ 
+ void test_persist_work ( sphinx_client * client )
+ {
+-	char * docs[] = { NULL };
++	const char * docs[] = { NULL };
++	char *docs0;
+ 	const char words[] = "that is";
+ 	const char * index = "test1";
+ 	const char filler[] = " no need to worry about ";
+@@ -229,13 +231,14 @@ void test_persist_work ( sphinx_client * client )
+ 
+ 	// should be in sync with sphinxclient.c MAX_PACKET_LEN
+ 	i = 8*1024*1024 + 50;
+-	docs[0] = malloc ( i );
+-	if ( !docs[0] )
++	docs0 = malloc ( i );
++	if ( !docs0 )
+ 		die ( "malloc failed at test_persist_work" );
++	docs[0] = docs0;
+ 
+-	memcpy ( docs[0], words, sizeof(words)-1 );
+-	doc = docs[0] + sizeof(words)-1;
+-	while ( ( doc + sizeof(filler) )<docs[0]+i )
++	memcpy ( docs0, words, sizeof(words)-1 );
++	doc = docs0 + sizeof(words)-1;
++	while ( ( doc + sizeof(filler) )<docs0+i )
+ 	{
+ 		memcpy ( doc, filler, sizeof(filler)-1 );
+ 		doc += sizeof(filler)-1;
+@@ -264,7 +267,7 @@ void test_persist_work ( sphinx_client * client )
+ 			opts.html_strip_mode = "none";
+ 			opts.query_mode = SPH_TRUE;
+ 
+-			*( docs[0]+sizeof(words)+100 ) = '\0';
++			*( docs0+sizeof(words)+100 ) = '\0';
+ 		}
+ 
+ 		printf ( "n=%d,\t", i );
+@@ -405,7 +408,7 @@ void title ( const char * name )
+ 	if ( g_smoke || !name )
+ 		return;
+ 
+-	printf ( "-> % s <-\n\n", name );
++	printf ( "-> %s <-\n\n", name );
+ }
+ 
+ int main ( int argc, char ** argv )

sphinx-configure-c99.patch

@@ -0,0 +1,148 @@
+Generic C99 compatibility fixes for the configure script.  These
+changes are already part of autoconf upstream, so re-running
+autoconf would fix these issues, too.
+
+diff --git a/api/libsphinxclient/configure b/api/libsphinxclient/configure
+index ff655ed23b938e71..c502ef318fd28313 100755
+--- a/api/libsphinxclient/configure
++++ b/api/libsphinxclient/configure
+@@ -2761,7 +2761,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4190,8 +4190,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -8112,10 +8112,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -8129,7 +8125,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -8210,10 +8206,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -8227,7 +8219,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -11831,10 +11823,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -11848,7 +11836,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -11929,10 +11917,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -11946,7 +11930,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -17369,10 +17353,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -17386,7 +17366,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -17467,10 +17447,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -17484,7 +17460,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

sphinx.spec

@@ -11,18 +11,29 @@
 %endif
 %endif
 
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
+%bcond_with java
+%else
+%bcond_without java
+%endif
+
+
 Name:		sphinx
 Version:	2.2.11
-Release:	11%{?dist}
+Release:	34%{?dist}
 Summary:	Free open-source SQL full-text search engine
-License:	GPLv2+
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:	GPL-2.0-or-later
 URL:		http://sphinxsearch.com
 
 Source0:	http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
 Source1:	searchd.service
 Patch0:		%{name}-2.0.3-fix_static.patch
-Patch1:		%{name}-2.0.3-default_listen.patch
+Patch1:		listen_local.patch
+Patch2:		sphinx-configure-c99.patch
+Patch3:		sphinx-c99.patch
 
+BuildRequires: make
 BuildRequires:  gcc gcc-c++
 BuildRequires:	expat-devel
 BuildRequires:	mariadb-connector-c-devel openssl-devel
@@ -34,7 +45,6 @@ Requires(preun):	systemd
 Requires(postun):	systemd
 
 # Users and groups
-Requires(pre):		shadow-utils
        
 
 %description
@@ -56,7 +66,8 @@ available as a plug-gable MySQL storage engine. API is very lightweight so
 porting it to new language is known to take a few hours.
 
 As for the name, Sphinx is an acronym which is officially decoded as SQL
-Phrase Index. Yes, I know about CMU's Sphinx project.
+Phrase Index.
+For the Sphinx documentation generator, see python-sphinx instead.
 
 
 %package -n libsphinxclient
@@ -78,6 +89,7 @@ Pure C search-d client API library
 Sphinx search engine, http://sphinxsearch.com/
 
 
+%if %{with java}
 %package java
 Summary:		Java API for Sphinx
 BuildRequires:	java-devel
@@ -89,7 +101,7 @@ Requires:		jpackage-utils
 This package provides the Java API for Sphinx,
 the free, open-source full-text search engine,
 designed with indexing database content in mind.
-
+%endif
 
 %package php
 Summary:	PHP API for Sphinx
@@ -104,8 +116,10 @@ designed with indexing database content in mind.
 
 %prep
 %setup -qn %{name}-%{version}-release
-%patch0 -p1 -b .fix_static
-%patch1 -p1 -b .default_listen
+%patch -P0 -p1 -b .fix_static
+%patch -P1 -p1 -b .default_listen
+%patch -P2 -p1
+%patch -P3 -p1
 
 # Fix wrong-file-end-of-line-encoding
 for f in \
@@ -120,6 +134,12 @@ done
 # Fix file not UTF8
 iconv -f iso8859-1 -t utf-8 doc/%{name}.txt > doc/%{name}.txt.conv && mv -f doc/%{name}.txt.conv doc/%{name}.txt
 
+# Create a sysusers.d config file
+cat >sphinx.sysusers.conf <<EOF
+g sphinx -
+u sphinx - 'Sphinx Search' %{sphinx_home} /bin/bash
+EOF
+
 %build
 %if %{__isa_bits} == 64
 %configure --sysconfdir=%{_sysconfdir}/%{name} --with-mysql --with-pgsql --enable-id64
@@ -136,8 +156,10 @@ pushd api/libsphinxclient
 popd
 
 
+%if %{with java}
 # make the java api
 make -C api/java 
+%endif
 
 
 %install
@@ -196,11 +218,13 @@ pushd api/libsphinxclient/
     make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"
 popd
 
+%if %{with java}
 # install the java api
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 install -m 0644 api/java/%{name}api.jar \
     $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 ln -s %{_javadir}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}api.jar
+%endif
 
 # install the php api
 # "Non-PEAR PHP extensions should put their Class files in /usr/share/php."
@@ -214,13 +238,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 # clean-up .a archives
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
+install -m0644 -D sphinx.sysusers.conf %{buildroot}%{_sysusersdir}/sphinx.conf
+
 
-%pre
-getent group %{sphinx_group} >/dev/null || groupadd -r %{sphinx_group}
-getent passwd %{sphinx_user} >/dev/null || \
-useradd -r -g %{sphinx_group} -d %{sphinx_home} -s /bin/bash \
--c "Sphinx Search" %{sphinx_user}
-exit 0
 
 %post
 %systemd_post searchd.service
@@ -263,24 +283,98 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/
 %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/%{name}
 %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/%{name}
 %{_mandir}/man1/*
+%{_sysusersdir}/sphinx.conf
 
 %files -n libsphinxclient
-%doc COPYING api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
+%doc COPYING %{?with_java: api/java} api/ruby api/*.php api/*.py api/libsphinxclient/README
 %{_libdir}/libsphinxclient-0*.so
 
 %files -n libsphinxclient-devel
 %{_libdir}/libsphinxclient.so
 %{_includedir}/*
 
+%if %{with java}
 %files java
 %doc api/java/README COPYING
 %{_javadir}/*
+%endif
 
 %files php
 %doc COPYING
 %{_datadir}/php/*
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.2.11-33
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.2.11-31
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Dec 19 2023 Florian Weimer <fweimer@redhat.com> - 2.2.11-28
+- Additional C compatibility fixes
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 10 2023 Florian Weimer <fweimer@redhat.com> - 2.2.11-25
+- C99 compatibility fixes
+
+* Tue Aug 16 2022 Michal Schorm <mschorm@redhat.com> - 2.2.11-24
+- Remove the Java binding
+  Resolves: #2104104, #2113735
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.2.11-22
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.2.11-19
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 2.2.11-18
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.2.11-15
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Sep 05 2019 Ben Cotton <bcotton@fedoraproject.org> - 2.2.11-13
+- Listen only on localhost (CVE-2019-14511, rhbz#1749190)
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 2.2.11-11
 - Revert incorrect use of _tmpfiledir rhbx#1551735