From 649b05c21394061460deea54632b24b19e1c499b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 17 May 2023 00:20:40 -0400 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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