From 2c8ea9d8f7e4035ad550727bfc634836191f06f0 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Braojos Date: Fri, 5 Nov 2021 11:27:18 +0100 Subject: [PATCH 01/19] - Upgrade to sphinx-2.3.2-beta Signed-off-by: Sergio Arroutbi Braojos --- sources | 2 +- sphinx.spec | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sources b/sources index af4f946..3a321e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cac34f3d78a9d612ca4301abfcbd666 sphinx-2.2.11-release.tar.gz +b5aaa0009b8fb33614f0ecc7bb6cd6e7 sphinx-2.3.2-beta.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 4a6751a..b58bd80 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -12,13 +12,13 @@ %endif Name: sphinx -Version: 2.2.11 -Release: 20%{?dist} +Version: 2.3.2 +Release: beta Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com -Source0: http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz +Source0: http://sphinxsearch.com/files/%{name}-%{version}-%{release}.tar.gz Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: listen_local.patch @@ -104,7 +104,7 @@ designed with indexing database content in mind. %prep -%setup -qn %{name}-%{version}-release +%setup -qn %{name}-%{version}-%{release} %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen @@ -282,6 +282,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Nov 5 2021 Sergio Arroutbi - sphinx-2.3.2-beta +- Upgrade to sphinx-2.3.2-beta + Resolves: rhbz#1655314 + * Fri Jul 23 2021 Fedora Release Engineering - 2.2.11-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 66efc6c18c689b7888e71afb0db938d6a0e39d08 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Braojos Date: Thu, 18 Nov 2021 18:37:18 +0100 Subject: [PATCH 02/19] Revert "- Upgrade to sphinx-2.3.2-beta" Reverting commit due to issue on fedpkg build. This reverts commit 2c8ea9d8f7e4035ad550727bfc634836191f06f0. Signed-off-by: Sergio Arroutbi Braojos --- sources | 2 +- sphinx.spec | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 3a321e7..af4f946 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5aaa0009b8fb33614f0ecc7bb6cd6e7 sphinx-2.3.2-beta.tar.gz +5cac34f3d78a9d612ca4301abfcbd666 sphinx-2.2.11-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index b58bd80..4a6751a 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -12,13 +12,13 @@ %endif Name: sphinx -Version: 2.3.2 -Release: beta +Version: 2.2.11 +Release: 20%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com -Source0: http://sphinxsearch.com/files/%{name}-%{version}-%{release}.tar.gz +Source0: http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: listen_local.patch @@ -104,7 +104,7 @@ designed with indexing database content in mind. %prep -%setup -qn %{name}-%{version}-%{release} +%setup -qn %{name}-%{version}-release %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen @@ -282,10 +282,6 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog -* Fri Nov 5 2021 Sergio Arroutbi - sphinx-2.3.2-beta -- Upgrade to sphinx-2.3.2-beta - Resolves: rhbz#1655314 - * Fri Jul 23 2021 Fedora Release Engineering - 2.2.11-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c2729ee5f4e032a931aeebc1cb94b089b2adac07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:27:09 +0000 Subject: [PATCH 03/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 4a6751a..76a90a3 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -282,6 +282,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.2.11-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.2.11-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 66ea1146467fc3410f6baed9c4e41191122ffca5 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:17:34 +0100 Subject: [PATCH 04/19] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 76a90a3..939b178 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -282,6 +282,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Feb 05 2022 Jiri Vanek - 2.2.11-22 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 2.2.11-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3f68725d0eec94d3c9ed895a15fbd04c66fccf47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:12:10 +0000 Subject: [PATCH 05/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 939b178..f0aeceb 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -282,6 +282,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.2.11-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 2.2.11-22 - Rebuilt for java-17-openjdk as system jdk From 85904cc174b32b64abbc8ee6913dee04279bab03 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 16 Aug 2022 01:05:24 +0200 Subject: [PATCH 06/19] Remove the Java binding https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs Resolves: #2104104, #2113735 --- sphinx.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index f0aeceb..39f4111 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -11,9 +11,16 @@ %endif %endif +%if 0%{?fedora} >= 37 +%bcond_with java +%else +%bcond_without java +%endif + + Name: sphinx Version: 2.2.11 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -79,6 +86,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 @@ -90,7 +98,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 @@ -137,8 +145,10 @@ pushd api/libsphinxclient popd +%if %{with java} # make the java api make -C api/java +%endif %install @@ -197,11 +207,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." @@ -266,22 +278,28 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_mandir}/man1/* %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 +* Tue Aug 16 2022 Michal Schorm - 2.2.11-24 +- Remove the Java binding + Resolves: #2104104, #2113735 + * Sat Jul 23 2022 Fedora Release Engineering - 2.2.11-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e96188752eb1895f9c0ca9f0abff28d3106247ed Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 16 Aug 2022 01:29:42 +0200 Subject: [PATCH 07/19] Improve the package description text Resolves: #2110987 --- sphinx.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 39f4111..8bef076 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -64,7 +64,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 From 3fb17b557bc85758e0af5ce89b199e045c253dc2 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 10 Jan 2023 10:36:53 +0100 Subject: [PATCH 08/19] C99 compatibility fixes Related to: --- sphinx-c99.patch | 50 +++++++++++++ sphinx-configure-c99.patch | 148 +++++++++++++++++++++++++++++++++++++ sphinx.spec | 9 ++- 3 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 sphinx-c99.patch create mode 100644 sphinx-configure-c99.patch diff --git a/sphinx-c99.patch b/sphinx-c99.patch new file mode 100644 index 0000000..0fa1580 --- /dev/null +++ b/sphinx-c99.patch @@ -0,0 +1,50 @@ +Add missing return types to avoid build failures with C99 compilers. +Include to avoid implicit function declarations. + +Partially fixed via: + +commit da41e452c5acc99ffe40f48be32d9ca7e55c407c +Author: tomat +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: + +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..a4806ea9aca9c82c 100644 +--- a/api/libsphinxclient/test.c ++++ b/api/libsphinxclient/test.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #if _WIN32 + #include diff --git a/sphinx-configure-c99.patch b/sphinx-configure-c99.patch new file mode 100644 index 0000000..2f7e65a --- /dev/null +++ b/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 ' \ + '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 diff --git a/sphinx.spec b/sphinx.spec index 8bef076..0f371fa 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -29,6 +29,8 @@ Source0: http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: listen_local.patch +Patch2: sphinx-configure-c99.patch +Patch3: sphinx-c99.patch BuildRequires: make BuildRequires: gcc gcc-c++ @@ -116,6 +118,8 @@ designed with indexing database content in mind. %setup -qn %{name}-%{version}-release %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen +%patch2 -p1 +%patch3 -p1 # Fix wrong-file-end-of-line-encoding for f in \ @@ -297,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Tue Jan 10 2023 Florian Weimer - 2.2.11-25 +- C99 compatibility fixes + * Tue Aug 16 2022 Michal Schorm - 2.2.11-24 - Remove the Java binding Resolves: #2104104, #2113735 From fc8be57369cd68112b4744e35e9f4ad2f60eadf1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:50:25 +0000 Subject: [PATCH 09/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 0f371fa..401a12a 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -301,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.2.11-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 10 2023 Florian Weimer - 2.2.11-25 - C99 compatibility fixes From 649b05c21394061460deea54632b24b19e1c499b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 17 May 2023 00:20:40 -0400 Subject: [PATCH 10/19] Disable the Java binding for RHEL 10+ This is needed to fix the ELN build. --- sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 401a12a..7957e70 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -11,7 +11,7 @@ %endif %endif -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 %bcond_with java %else %bcond_without java From 27eb7ce7554e2e7d20cc2be1efc1950a4873ac87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:17:09 +0000 Subject: [PATCH 11/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 7957e70..3ad6e22 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -301,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.2.11-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.2.11-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0827c4c5202e77a2bcd914bf182b24d6f4248c49 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 19 Dec 2023 20:35:03 +0100 Subject: [PATCH 12/19] Additional C compatibility fixes --- sphinx-c99.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++- sphinx.spec | 5 ++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/sphinx-c99.patch b/sphinx-c99.patch index 0fa1580..ffc7fb7 100644 --- a/sphinx-c99.patch +++ b/sphinx-c99.patch @@ -1,5 +1,6 @@ Add missing return types to avoid build failures with C99 compilers. Include to avoid implicit function declarations. +Avoid incompatible pointer types and a format string warning. Partially fixed via: @@ -37,7 +38,7 @@ index 16f7913fa37b3bf3..0530fc2c65f1082c 100644 if ( sock<0 ) return; diff --git a/api/libsphinxclient/test.c b/api/libsphinxclient/test.c -index f779bb1ff638a179..a4806ea9aca9c82c 100644 +index f779bb1ff638a179..670e379b4ad3c36f 100644 --- a/api/libsphinxclient/test.c +++ b/api/libsphinxclient/test.c @@ -16,6 +16,7 @@ @@ -48,3 +49,51 @@ index f779bb1ff638a179..a4806ea9aca9c82c 100644 #if _WIN32 #include +@@ -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) ) % s <-\n\n", name ); ++ printf ( "-> %s <-\n\n", name ); + } + + int main ( int argc, char ** argv ) diff --git a/sphinx.spec b/sphinx.spec index 3ad6e22..84ddd82 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -301,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Tue Dec 19 2023 Florian Weimer - 2.2.11-28 +- Additional C compatibility fixes + * Sat Jul 22 2023 Fedora Release Engineering - 2.2.11-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0a0616218d72ad4a2d762883ad25553cd186a3d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:07:51 +0000 Subject: [PATCH 13/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 84ddd82..3754790 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -301,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.2.11-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 19 2023 Florian Weimer - 2.2.11-28 - Additional C compatibility fixes From 0654578e36ffb215d341c880790757828aee1d48 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 14/19] Eliminate use of obsolete %patchN syntax (#2283636) --- sphinx.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 3754790..ba55423 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -116,10 +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 -%patch2 -p1 -%patch3 -p1 +%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 \ From 25ee1da2c039422bd7f76218915e010079494d97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:12:59 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index ba55423..65d7135 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -301,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.2.11-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.2.11-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1e50bc0ef72b73da47c24b181164271190151580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:02:43 +0200 Subject: [PATCH 16/19] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sphinx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 65d7135..718e7e7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,9 +20,10 @@ Name: sphinx Version: 2.2.11 -Release: 30%{?dist} +Release: 31%{?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 @@ -301,6 +302,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.2.11-31 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.2.11-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4642831466e81c6ddd8d40621e0bea8f2559a95e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:24:04 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 718e7e7..07fbfbe 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Free open-source SQL full-text search engine # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -302,6 +302,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.2.11-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.2.11-31 - convert license to SPDX From 7e51c472a91044fff4dda56332ab84c54114923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:37 +0100 Subject: [PATCH 18/19] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- sphinx.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 07fbfbe..6a34222 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Free open-source SQL full-text search engine # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -45,7 +45,6 @@ Requires(preun): systemd Requires(postun): systemd # Users and groups -Requires(pre): shadow-utils %description @@ -135,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 </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 @@ -282,6 +283,7 @@ 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 %{?with_java: api/java} api/ruby api/*.php api/*.py api/libsphinxclient/README @@ -302,6 +304,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.2.11-33 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.2.11-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 111968c2e9ba497bec3cd57d76ca9779848e5cd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:37:34 +0000 Subject: [PATCH 19/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 6a34222..c9dd0d7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Free open-source SQL full-text search engine # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -304,6 +304,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.2.11-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.2.11-33 - Add sysusers.d config file to allow rpm to create users/groups automatically