From 143488333503a7e898ab8229456bce2ee2f60c3d Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Fri, 14 Aug 2009 16:35:26 +0000 Subject: [PATCH 01/87] First import. --- .cvsignore | 1 + import.log | 1 + sources | 1 + sphinx.init | 105 +++++++++++++++++++++++++++ sphinx.spec | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 309 insertions(+) create mode 100644 import.log create mode 100755 sphinx.init create mode 100644 sphinx.spec diff --git a/.cvsignore b/.cvsignore index e69de29..2d8eb9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +sphinx-0.9.8.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..c399db1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +sphinx-0_9_8_1-3_fc11:HEAD:sphinx-0.9.8.1-3.fc11.src.rpm:1250267674 diff --git a/sources b/sources index e69de29..d5a6e9c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +428a14df41fb425e664d9e2d6178c037 sphinx-0.9.8.1.tar.gz diff --git a/sphinx.init b/sphinx.init new file mode 100755 index 0000000..76c5892 --- /dev/null +++ b/sphinx.init @@ -0,0 +1,105 @@ +#!/bin/sh +# +# sphinx searchd Free open-source SQL full-text search engine +# +# chkconfig: - 20 80 +# description: Starts and stops the sphinx searchd daemon that handles \ +# all search requests. + +### BEGIN INIT INFO +# Provides: searchd +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Should-Start: $remote_fs +# Should-Stop: $remote_fs +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start and stop sphinx searchd daemon +# Description: Sphinx is a free open-source SQL full-text search engine +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +exec="/usr/bin/searchd" +prog="searchd" +config="/etc/sphinx/sphinx.conf" + +lockfile=/var/lock/subsys/searchd + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + # if not running, start it up here, usually something like "daemon $exec" + daemon $exec --config $config + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + # stop it here, often "killproc $prog" + killproc $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/sphinx.spec b/sphinx.spec new file mode 100644 index 0000000..c9d0a3f --- /dev/null +++ b/sphinx.spec @@ -0,0 +1,201 @@ +Name: sphinx +Version: 0.9.8.1 +Release: 3%{?dist} +Summary: Free open-source SQL full-text search engine + +Group: Applications/Text +License: GPLv2+ +URL: http://sphinxsearch.com +Source0: http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz +Source1: %{name}.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: expat-devel +#Requires: + +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts + + +%description +Sphinx is a full-text search engine, distributed under GPL version 2. +Commercial licensing (eg. 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 +applications. Sphinx was specially designed to integrate well with SQL +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 +designed to be as easy as possible. + +Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also +available as a pluggable 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. + + +%package -n libsphinxclient +Summary: Pure C searchd client API library +Group: Development/Libraries + + +%description -n libsphinxclient +Pure C searchd client API library +Sphinx search engine, http://sphinxsearch.com/ + + +%package -n libsphinxclient-devel +Summary: Development libraries and header files for libsphinxclient +Group: Development/Libraries +Requires: libsphinxclient = %{version}-%{release} + + +%description -n libsphinxclient-devel +Pure C searchd client API library +Sphinx search engine, http://sphinxsearch.com/ + + +%prep +%setup -q + +# Fix wrong-file-end-of-line-encoding +sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql +sed -i 's/\r//' api/java/mk.cmd +sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php +sed -i 's/\r//' api/ruby/lib/sphinx/response.rb + + +%build +%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql +make %{?_smp_mflags} + +# Build libsphinxclient +cd api/libsphinxclient/ +%configure +make #%{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" + +# Install sphinx initscript +install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd + +# Create /var/log/sphinx +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx + +# Create /var/run/sphinx +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx + +# Create /var/lib/sphinx +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx + +# Create sphinx.conf +cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \ + $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf + +# Modify sphinx.conf +sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \ +$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf + +sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \ +$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf + +sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \ +$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf + +sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \ +$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf + +# Create /etc/logrotate.d/sphinx +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF +/var/log/sphinx/*.log { + weekly + rotate 10 + copytruncate + delaycompress + compress + notifempty + missingok +} +EOF + +# Install libsphinxclient +cd api/libsphinxclient/ +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" + +# clean-up .la archives +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +# clean-up .a archives +find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add searchd + +%preun +if [ $1 = 0 ] ; then + /sbin/service searchd stop >/dev/null 2>&1 + /sbin/chkconfig --del searchd +fi + + +%post -p /sbin/ldconfig -n libsphinxclient + + +%postun -p /sbin/ldconfig -n libsphinxclient + + + +%files +%defattr(-,root,root,-) +%doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql +%dir %{_sysconfdir}/sphinx +%config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf +%exclude %{_sysconfdir}/sphinx/*.conf.dist +%exclude %{_sysconfdir}/sphinx/example.sql +%{_initrddir}/searchd +%config(noreplace) %{_sysconfdir}/logrotate.d/sphinx +%{_bindir}/* +%dir %{_localstatedir}/log/sphinx +%dir %{_localstatedir}/run/sphinx +%dir %{_localstatedir}/lib/sphinx + +%files -n libsphinxclient +%defattr(-,root,root,-) +%doc api/java api/ruby api/*.php api/*.py api/libsphinxclient/README +%{_libdir}/libsphinxclient-0*.so + + +%files -n libsphinxclient-devel +%defattr(-,root,root,-) +%{_libdir}/libsphinxclient.so +%{_includedir}/* + +%changelog +* Wed Aug 12 2009 Allisson Azevedo 0.9.8.1-3 +- Fixed macros consistency. +- Modified make install to keep timestamps. +- Added libsphinxclient package. + +* Fri Aug 7 2009 Allisson Azevedo 0.9.8.1-2 +- Added sysv init. +- Added logrotate.d entry. + +* Thu Jul 30 2009 Allisson Azevedo 0.9.8.1-1 +- Initial rpm release. From 93754416b2106ecbd2b1e849d9fedf40f2d97e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Wed, 26 Aug 2009 10:19:59 +0000 Subject: [PATCH 02/87] - Rebuild with new openssl --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index c9d0a3f..a6162af 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -1,6 +1,6 @@ Name: sphinx Version: 0.9.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -188,6 +188,9 @@ fi %{_includedir}/* %changelog +* Wed Aug 26 2009 Tomas Mraz 0.9.8.1-4 +- Rebuild with new openssl + * Wed Aug 12 2009 Allisson Azevedo 0.9.8.1-3 - Fixed macros consistency. - Modified make install to keep timestamps. From 751e53c7b8e2bcea0c6cd69ebf91594047e1fa49 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:15:36 +0000 Subject: [PATCH 03/87] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f02a6a3..91aad04 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: sphinx -# $Id$ +# $Id: Makefile,v 1.1 2009/08/14 16:19:13 tibbs Exp $ NAME := sphinx SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 009535c5744cc80fbe84a0e9b241a266059f1c54 Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Thu, 11 Feb 2010 13:29:50 +0000 Subject: [PATCH 04/87] - Update to 0.9.9 (#556997). - Added sphinx-0.9.9-fix_static.patch to fix FTBS. - Run sphinx searchd as non-root user (#541464). --- .cvsignore | 2 +- import.log | 1 + sources | 2 +- sphinx-0.9.9-fix_static.patch | 12 ++++++++++ sphinx.init | 3 ++- sphinx.spec | 44 ++++++++++++++++++++++++++--------- 6 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 sphinx-0.9.9-fix_static.patch diff --git a/.cvsignore b/.cvsignore index 2d8eb9d..b7cfe5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sphinx-0.9.8.1.tar.gz +sphinx-0.9.9.tar.gz diff --git a/import.log b/import.log index c399db1..cb02658 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ sphinx-0_9_8_1-3_fc11:HEAD:sphinx-0.9.8.1-3.fc11.src.rpm:1250267674 +sphinx-0_9_9-1_fc12:HEAD:sphinx-0.9.9-1.fc12.src.rpm:1265894935 diff --git a/sources b/sources index d5a6e9c..7694026 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -428a14df41fb425e664d9e2d6178c037 sphinx-0.9.8.1.tar.gz +7b9b618cb9b378f949bb1b91ddcc4f54 sphinx-0.9.9.tar.gz diff --git a/sphinx-0.9.9-fix_static.patch b/sphinx-0.9.9-fix_static.patch new file mode 100644 index 0000000..a3a94bf --- /dev/null +++ b/sphinx-0.9.9-fix_static.patch @@ -0,0 +1,12 @@ +diff -up sphinx-0.9.9/api/libsphinxclient/sphinxclient.c.fix_static sphinx-0.9.9/api/libsphinxclient/sphinxclient.c +--- sphinx-0.9.9/api/libsphinxclient/sphinxclient.c.fix_static 2010-02-11 08:32:43.473905916 -0300 ++++ sphinx-0.9.9/api/libsphinxclient/sphinxclient.c 2010-02-11 08:33:23.264905947 -0300 +@@ -277,7 +277,7 @@ static void sphinx_free_results ( sphinx + } + + +-void sock_close ( int sock ); ++static void sock_close ( int sock ); + + void sphinx_destroy ( sphinx_client * client ) + { diff --git a/sphinx.init b/sphinx.init index 76c5892..5a9fb7a 100755 --- a/sphinx.init +++ b/sphinx.init @@ -24,6 +24,7 @@ exec="/usr/bin/searchd" prog="searchd" config="/etc/sphinx/sphinx.conf" +username="sphinx" lockfile=/var/lock/subsys/searchd @@ -32,7 +33,7 @@ start() { [ -f $config ] || exit 6 echo -n $"Starting $prog: " # if not running, start it up here, usually something like "daemon $exec" - daemon $exec --config $config + daemon --user=$username $exec --config $config retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/sphinx.spec b/sphinx.spec index a6162af..d21140f 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -1,6 +1,10 @@ +%global sphinx_user sphinx +%global sphinx_group sphinx +%global sphinx_home %{_localstatedir}/lib/sphinx + Name: sphinx -Version: 0.9.8.1 -Release: 4%{?dist} +Version: 0.9.9 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -8,6 +12,7 @@ License: GPLv2+ URL: http://sphinxsearch.com Source0: http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz Source1: %{name}.init +Patch0: %{name}-%{version}-fix_static.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mysql-devel @@ -15,10 +20,12 @@ BuildRequires: postgresql-devel BuildRequires: expat-devel #Requires: +#Initscripts Requires(post): chkconfig -Requires(preun): chkconfig -# This is for /sbin/service -Requires(preun): initscripts +Requires(preun): chkconfig initscripts + +# Users and groups +Requires(pre): shadow-utils %description @@ -66,6 +73,7 @@ Sphinx search engine, http://sphinxsearch.com/ %prep %setup -q +%patch0 -p1 -b .fix_static # Fix wrong-file-end-of-line-encoding sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql @@ -145,6 +153,13 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT +%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 /sbin/chkconfig --add searchd @@ -154,12 +169,14 @@ if [ $1 = 0 ] ; then /sbin/chkconfig --del searchd fi - %post -p /sbin/ldconfig -n libsphinxclient - %postun -p /sbin/ldconfig -n libsphinxclient - + +%posttrans +chown -R %{sphinx_user}:root %{_localstatedir}/log/sphinx/ +chown -R %{sphinx_user}:root %{_localstatedir}/run/sphinx/ +chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %files @@ -172,9 +189,9 @@ fi %{_initrddir}/searchd %config(noreplace) %{_sysconfdir}/logrotate.d/sphinx %{_bindir}/* -%dir %{_localstatedir}/log/sphinx -%dir %{_localstatedir}/run/sphinx -%dir %{_localstatedir}/lib/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/sphinx %files -n libsphinxclient %defattr(-,root,root,-) @@ -188,6 +205,11 @@ fi %{_includedir}/* %changelog +* Thu Feb 11 2010 Allisson Azevedo 0.9.9-1 +- Update to 0.9.9 (#556997). +- Added sphinx-0.9.9-fix_static.patch to fix FTBS. +- Run sphinx searchd as non-root user (#541464). + * Wed Aug 26 2009 Tomas Mraz 0.9.8.1-4 - Rebuild with new openssl From 19ad8a2bea8d1a0a321e72c9f9a419158b0ff962 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Wed, 14 Jul 2010 18:11:25 +0000 Subject: [PATCH 05/87] add COPYING file to lib package --- sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index d21140f..ffc532e 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 0.9.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -195,7 +195,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %files -n libsphinxclient %defattr(-,root,root,-) -%doc api/java api/ruby api/*.php api/*.py api/libsphinxclient/README +%doc COPYING api/java api/ruby api/*.php api/*.py api/libsphinxclient/README %{_libdir}/libsphinxclient-0*.so @@ -205,6 +205,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_includedir}/* %changelog +* Wed Jul 14 2010 Christof Damian - 0.9.9-2 +- add COPYING file to lib package + * Thu Feb 11 2010 Allisson Azevedo 0.9.9-1 - Update to 0.9.9 (#556997). - Added sphinx-0.9.9-fix_static.patch to fix FTBS. From 736f402b70c375015f98dbd0112d4d6ec1ec7371 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 13:04:54 +0000 Subject: [PATCH 06/87] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 91aad04..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sphinx -# $Id: Makefile,v 1.1 2009/08/14 16:19:13 tibbs Exp $ -NAME := sphinx -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index cb02658..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -sphinx-0_9_8_1-3_fc11:HEAD:sphinx-0.9.8.1-3.fc11.src.rpm:1250267674 -sphinx-0_9_9-1_fc12:HEAD:sphinx-0.9.9-1.fc12.src.rpm:1265894935 From 361f6510f498d142ad676c85abe510ebd3f86a42 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 11 Dec 2010 17:49:40 +0100 Subject: [PATCH 07/87] - change default listen address to localhost ( bug 566792 ) - add ghost for files in /var/run/ ( bug 656694 ) --- sphinx-0.9.9-default_listen.patch | 26 ++++++++++++++++++++++++++ sphinx.spec | 19 ++++++++++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 sphinx-0.9.9-default_listen.patch 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 From 398709d48aa25a4295ecea38a9bd439d745fe238 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 11 Dec 2010 18:06:53 +0100 Subject: [PATCH 08/87] add java + php subpackages ( bug 566787 ) --- sphinx.spec | 75 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 6 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 8ac6115..0e9814b 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 0.9.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -73,6 +73,32 @@ Pure C searchd client API library Sphinx search engine, http://sphinxsearch.com/ +%package java +Summary: Java API for Sphinx +Group: Development/Libraries +BuildRequires: java-devel +Requires: java +Requires: jpackage-utils + + +%description java +This package provides the Java API for Sphinx, +the free, open-source full-text search engine, +designed with indexing database content in mind. + + +%package php +Summary: PHP API for Sphinx +Group: Development/Libraries +Requires: php-common >= 5.1.6 + + +%description php +This package provides the PHP API for Sphinx, +the free, open-source full-text search engine, +designed with indexing database content in mind. + + %prep %setup -q %patch0 -p1 -b .fix_static @@ -90,9 +116,14 @@ sed -i 's/\r//' api/ruby/lib/sphinx/response.rb make %{?_smp_mflags} # Build libsphinxclient -cd api/libsphinxclient/ -%configure -make #%{?_smp_mflags} +pushd api/libsphinxclient + %configure + make #%{?_smp_mflags} +popd + + +# make the java api +make -C api/java %install @@ -145,8 +176,26 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF EOF # Install libsphinxclient -cd api/libsphinxclient/ -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" +pushd api/libsphinxclient/ + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" +popd + +# install the java api +mkdir -p $RPM_BUILD_ROOT%{_javadir} +install -m 0644 api/java/%{name}api.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + +# convenience symlinks +pushd $RPM_BUILD_ROOT%{_javadir} + ln -s %{name}-%{version}.jar %{name}.jar + ln -s %{name}-%{version}.jar %{name}api.jar +popd + +# install the php api +# "Non-PEAR PHP extensions should put their Class files in /usr/share/php." +# - http://fedoraproject.org/wiki/Packaging:PHP +install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/php +install -m 0644 api/%{name}api.php $RPM_BUILD_ROOT%{_datadir}/php # clean-up .la archives find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -213,7 +262,21 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_libdir}/libsphinxclient.so %{_includedir}/* +%files java +%defattr(0644,root,root,0755) +%doc api/java/README COPYING +%{_javadir}/* + + +%files php +%defattr(0644,root,root,0755) +%doc COPYING +%{_datadir}/php/* + %changelog +* Sat Dec 11 2010 Christof Damian - 0.9.9-4 +- add java and php subpackages ( bug 566787 ) + * 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 ) From 02a7ec28412cfd82fc1a6561ec3adae88a4ce747 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 09:33:22 -0600 Subject: [PATCH 09/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 0e9814b..089d4de 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 0.9.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -274,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.9.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Dec 11 2010 Christof Damian - 0.9.9-4 - add java and php subpackages ( bug 566787 ) From d048259acf5c2322aab7c5ce30f39bb898ab18e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 23 Mar 2011 19:51:12 +0100 Subject: [PATCH 10/87] rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 089d4de..238a581 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 0.9.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -274,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Wed Mar 23 2011 Dan Horák - 0.9.9-6 +- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) + * Wed Feb 09 2011 Fedora Release Engineering - 0.9.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e8be166d6eba351a84a614b541f6140a9d70d65f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 22:13:09 -0600 Subject: [PATCH 11/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 238a581..af63479 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 0.9.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -274,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.9.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Mar 23 2011 Dan Horák - 0.9.9-6 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) From 539a61da351666622f5940a7a2276d37b57292e4 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 15 Feb 2012 09:09:55 -0600 Subject: [PATCH 12/87] 2.0.3, systemd, gcc47. --- .gitignore | 1 + searchd.service | 12 +++++ sources | 2 +- sphinx-2.0.3-default_listen.patch | 24 ++++++++++ sphinx-2.0.3-fix_static.patch | 22 ++++++++++ sphinx-2.0.3-gcc47.patch | 29 ++++++++++++ sphinx.spec | 73 ++++++++++++++++++++++++------- 7 files changed, 146 insertions(+), 17 deletions(-) create mode 100644 searchd.service create mode 100644 sphinx-2.0.3-default_listen.patch create mode 100644 sphinx-2.0.3-fix_static.patch create mode 100644 sphinx-2.0.3-gcc47.patch diff --git a/.gitignore b/.gitignore index b7cfe5a..e1c9f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ sphinx-0.9.9.tar.gz +/sphinx-2.0.3-release.tar.gz diff --git a/searchd.service b/searchd.service new file mode 100644 index 0000000..8f3e7e1 --- /dev/null +++ b/searchd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Sphinx - SQL Full Text Search Engine +After=local-fs.target network.target mysqld.service + +[Service] +User=sphinx +Type=forking +PIDFile=/run/sphinx/searchd.pid +ExecStart=/usr/bin/searchd --config /etc/sphinx/sphinx.conf + +[Install] +WantedBy=multi-user.target diff --git a/sources b/sources index 7694026..f2b3e3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b9b618cb9b378f949bb1b91ddcc4f54 sphinx-0.9.9.tar.gz +a1293aecd5034aa797811610beb7ba89 sphinx-2.0.3-release.tar.gz diff --git a/sphinx-2.0.3-default_listen.patch b/sphinx-2.0.3-default_listen.patch new file mode 100644 index 0000000..07b602d --- /dev/null +++ b/sphinx-2.0.3-default_listen.patch @@ -0,0 +1,24 @@ +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 diff --git a/sphinx-2.0.3-fix_static.patch b/sphinx-2.0.3-fix_static.patch new file mode 100644 index 0000000..2e91ee3 --- /dev/null +++ b/sphinx-2.0.3-fix_static.patch @@ -0,0 +1,22 @@ +--- sphinx-2.0.3-release/api/libsphinxclient/sphinxclient.c~ 2011-11-13 06:40:26.000000000 -0600 ++++ sphinx-2.0.3-release/api/libsphinxclient/sphinxclient.c 2012-02-14 13:45:50.444826859 -0600 +@@ -290,7 +290,7 @@ + } + + +-void sock_close ( int sock ); ++static sock_close ( int sock ); + + + #define safe_free(_ptr) \ +--- sphinx-2.0.3-release/api/libsphinxclient/sphinxclient.c~ 2012-02-14 13:50:33.000000000 -0600 ++++ sphinx-2.0.3-release/api/libsphinxclient/sphinxclient.c 2012-02-14 13:54:50.527389085 -0600 +@@ -1253,7 +1253,7 @@ + } + + +-void sock_close ( int sock ) ++static sock_close ( int sock ) + { + if ( sock<0 ) + return; diff --git a/sphinx-2.0.3-gcc47.patch b/sphinx-2.0.3-gcc47.patch new file mode 100644 index 0000000..ed9e93a --- /dev/null +++ b/sphinx-2.0.3-gcc47.patch @@ -0,0 +1,29 @@ +--- src/sphinxexpr.cpp.orig 2012-02-15 08:49:22.012513635 -0600 ++++ src/sphinxexpr.cpp 2012-02-15 08:49:47.634770092 -0600 +@@ -1796,7 +1796,7 @@ + /// evaluate arg, return interval id + virtual int IntEval ( const CSphMatch & tMatch ) const + { +- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage ++ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here + if ( valm_dValues[i] ) + return i; +@@ -1827,7 +1827,7 @@ + /// evaluate arg, return interval id + virtual int IntEval ( const CSphMatch & tMatch ) const + { +- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage ++ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + ARRAY_FOREACH ( i, m_dTurnPoints ) + if ( val < Expr_ArgVsSet_c::ExprEval ( m_dTurnPoints[i], tMatch ) ) + return i; +@@ -1873,7 +1873,7 @@ + /// evaluate arg, check if the value is within set + virtual int IntEval ( const CSphMatch & tMatch ) const + { +- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage ++ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + return this->m_dValues.BinarySearch ( val )!=NULL; + } + diff --git a/sphinx.spec b/sphinx.spec index af63479..b7ceb5a 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,17 +3,18 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 0.9.9 -Release: 7%{?dist} +Version: 2.0.3 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text License: GPLv2+ 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 +Source0: http://sphinxsearch.com/downloads/%{name}-%{version}-release.tar.gz +Source1: searchd.service +Patch0: %{name}-2.0.3-fix_static.patch +Patch1: %{name}-2.0.3-default_listen.patch +Patch2: sphinx-2.0.3-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mysql-devel @@ -23,8 +24,12 @@ BuildRequires: expat-devel #Requires: #Initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts +#Requires(post): chkconfig +#Requires(preun): chkconfig initscripts +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + # Users and groups Requires(pre): shadow-utils @@ -100,9 +105,10 @@ designed with indexing database content in mind. %prep -%setup -q +%setup -qn %{name}-%{version}-release %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen +%patch2 -p0 -b .gcc47 # Fix wrong-file-end-of-line-encoding sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql @@ -131,7 +137,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" # Install sphinx initscript -install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd +#install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd +install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx @@ -215,23 +222,51 @@ useradd -r -g %{sphinx_group} -d %{sphinx_home} -s /bin/bash \ exit 0 %post -/sbin/chkconfig --add searchd +#/sbin/chkconfig --add searchd +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + %preun -if [ $1 = 0 ] ; then - /sbin/service searchd stop >/dev/null 2>&1 - /sbin/chkconfig --del searchd +#if [ $1 = 0 ] ; then +# /sbin/service searchd stop >/dev/null 2>&1 +# /sbin/chkconfig --del searchd +#fi +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable searchd.service > /dev/null 2>&1 || : + /bin/systemctl stop searchd.service > /dev/null 2>&1 || : fi + %post -p /sbin/ldconfig -n libsphinxclient -%postun -p /sbin/ldconfig -n libsphinxclient +%postun +/sbin/ldconfig -n libsphinxclient +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart searchd.service >/dev/null 2>&1 || : +fi + %posttrans chown -R %{sphinx_user}:root %{_localstatedir}/log/sphinx/ chown -R %{sphinx_user}:root %{_localstatedir}/run/sphinx/ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ +%triggerun -- sphinx < 2.0.3-1 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply httpd +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save searchd >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del searchd >/dev/null 2>&1 || : +/bin/systemctl try-restart searchd.service >/dev/null 2>&1 || : + %files %defattr(-,root,root,-) @@ -240,12 +275,14 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf %exclude %{_sysconfdir}/sphinx/*.conf.dist %exclude %{_sysconfdir}/sphinx/example.sql -%{_initrddir}/searchd +#%%{_initrddir}/searchd +%{_unitdir}/searchd.service %config(noreplace) %{_sysconfdir}/logrotate.d/sphinx %{_bindir}/* %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/sphinx %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/sphinx %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/sphinx +%{_mandir}/man1/* %ghost %{_localstatedir}/run/sphinx/searchd.log %ghost %{_localstatedir}/run/sphinx/query.log @@ -274,6 +311,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Tue Feb 14 2012 Jon Ciesla - 2.0.3-1 +- New upstream, migrate to systemd, BZ 692157. +- Patched for gcc47. + * Sat Jan 14 2012 Fedora Release Engineering - 0.9.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 7a0967bcaa1b0a3099d4c978db86b3bd90d9854c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 15:32:43 -0500 Subject: [PATCH 13/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index b7ceb5a..1ed8ef2 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -311,6 +311,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 14 2012 Jon Ciesla - 2.0.3-1 - New upstream, migrate to systemd, BZ 692157. - Patched for gcc47. From 84a3b2467b21de22e7b4c040eefec7993a0c6056 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 18:24:27 -0600 Subject: [PATCH 14/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 1ed8ef2..3424a28 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -311,6 +311,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 2.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8edbc80e10ff9973cc8df251529c2bf2b8b0dde2 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 6 Mar 2013 15:42:39 +0700 Subject: [PATCH 15/87] Update to 2.0.6 - Remove obsoleted patches --- .gitignore | 3 +-- sources | 2 +- sphinx-0.9.9-default_listen.patch | 26 -------------------------- sphinx-0.9.9-fix_static.patch | 12 ------------ sphinx.spec | 31 ++++++++++++++++++++----------- 5 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 sphinx-0.9.9-default_listen.patch delete mode 100644 sphinx-0.9.9-fix_static.patch diff --git a/.gitignore b/.gitignore index e1c9f8a..6691bad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -sphinx-0.9.9.tar.gz -/sphinx-2.0.3-release.tar.gz +/sphinx-2.0.6-release.tar.gz diff --git a/sources b/sources index f2b3e3c..86f0971 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1293aecd5034aa797811610beb7ba89 sphinx-2.0.3-release.tar.gz +de6be5ee20b1bfafa2a0cea7155a8331 sphinx-2.0.6-release.tar.gz diff --git a/sphinx-0.9.9-default_listen.patch b/sphinx-0.9.9-default_listen.patch deleted file mode 100644 index 408df7c..0000000 --- a/sphinx-0.9.9-default_listen.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-0.9.9-fix_static.patch b/sphinx-0.9.9-fix_static.patch deleted file mode 100644 index a3a94bf..0000000 --- a/sphinx-0.9.9-fix_static.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sphinx-0.9.9/api/libsphinxclient/sphinxclient.c.fix_static sphinx-0.9.9/api/libsphinxclient/sphinxclient.c ---- sphinx-0.9.9/api/libsphinxclient/sphinxclient.c.fix_static 2010-02-11 08:32:43.473905916 -0300 -+++ sphinx-0.9.9/api/libsphinxclient/sphinxclient.c 2010-02-11 08:33:23.264905947 -0300 -@@ -277,7 +277,7 @@ static void sphinx_free_results ( sphinx - } - - --void sock_close ( int sock ); -+static void sock_close ( int sock ); - - void sphinx_destroy ( sphinx_client * client ) - { diff --git a/sphinx.spec b/sphinx.spec index 3424a28..9f8635c 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,24 +3,26 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.0.3 -Release: 3%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text License: GPLv2+ URL: http://sphinxsearch.com -Source0: http://sphinxsearch.com/downloads/%{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: %{name}-2.0.3-default_listen.patch -Patch2: sphinx-2.0.3-gcc47.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mysql-devel - BuildRequires: postgresql-devel BuildRequires: expat-devel + +# for fix-ups +BuildRequires: dos2unix #Requires: #Initscripts @@ -108,17 +110,20 @@ designed with indexing database content in mind. %setup -qn %{name}-%{version}-release %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen -%patch2 -p0 -b .gcc47 # Fix wrong-file-end-of-line-encoding -sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql -sed -i 's/\r//' api/java/mk.cmd -sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php -sed -i 's/\r//' api/ruby/lib/sphinx/response.rb +for f in \ + api/java/mk.cmd \ + api/ruby/test.rb \ + api/ruby/spec/sphinx/sphinx_test.sql \ +; do + dos2unix ${f} +done + %build -%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql +%configure --sysconfdir=%{_sysconfdir}/sphinx --with-mysql --with-pgsql make %{?_smp_mflags} # Build libsphinxclient @@ -311,6 +316,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Wed Mar 6 2013 Michel Salim - 2.0.6-1 +- Update to 2.0.6 +- Remove obsoleted patches + * Fri Feb 15 2013 Fedora Release Engineering - 2.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 18399f0fe65ff0c789a25e52e7eaa92f2b8a73ea Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 20 Apr 2013 22:21:55 +0200 Subject: [PATCH 16/87] - upstream 2.0.7 - use tmpfiles.d to create pid directory - move default log file location to /var/log/sphinx --- .gitignore | 1 + sources | 2 +- sphinx.spec | 47 ++++++++++++++++++++++++----------------------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 6691bad..6f1a1e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sphinx-2.0.6-release.tar.gz +/sphinx-2.0.7-release.tar.gz diff --git a/sources b/sources index 86f0971..de9551d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de6be5ee20b1bfafa2a0cea7155a8331 sphinx-2.0.6-release.tar.gz +3ac90957277bdd351c5f167751de9ec5 sphinx-2.0.7-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 9f8635c..89b889d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,7 +3,7 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.0.6 +Version: 2.0.7 Release: 1%{?dist} Summary: Free open-source SQL full-text search engine @@ -25,14 +25,10 @@ BuildRequires: expat-devel BuildRequires: dos2unix #Requires: -#Initscripts -#Requires(post): chkconfig -#Requires(preun): chkconfig initscripts Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units - # Users and groups Requires(pre): shadow-utils @@ -141,17 +137,15 @@ make -C api/java rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" -# Install sphinx initscript -#install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx +touch $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx/searchd.log +touch $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx/query.log # 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 @@ -161,22 +155,22 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \ $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf # Modify sphinx.conf -sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \ -$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/log/searchd.log|%{_localstatedir}/log/sphinx/searchd.log|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf -sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \ -$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/log/query.log|%{_localstatedir}/log/sphinx/query.log|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf -sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \ -$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/log/searchd.pid|%{_localstatedir}/run/sphinx/searchd.pid|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf -sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \ -$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/data|%{_localstatedir}/lib/sphinx|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf # Create /etc/logrotate.d/sphinx mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF -/var/log/sphinx/*.log { +%{_localstatedir}/log/sphinx/*.log { weekly rotate 10 copytruncate @@ -187,6 +181,12 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF } EOF +# Create /etc/logrotate.d/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} +cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf << EOF +d %{_localstatedir}/run/sphinx 755 sphinx root - +EOF + # Install libsphinxclient pushd api/libsphinxclient/ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" @@ -280,19 +280,15 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf %exclude %{_sysconfdir}/sphinx/*.conf.dist %exclude %{_sysconfdir}/sphinx/example.sql -#%%{_initrddir}/searchd %{_unitdir}/searchd.service %config(noreplace) %{_sysconfdir}/logrotate.d/sphinx +%{_tmpfilesdir}/%{name}.conf %{_bindir}/* %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/sphinx %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/sphinx %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/sphinx %{_mandir}/man1/* -%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 @@ -316,6 +312,11 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sat Apr 20 2013 Christof Damian - 2.0.7-1 +- upstream 2.0.7 +- use tmpfiles.d to create pid directory +- move default log file location to /var/log/sphinx + * Wed Mar 6 2013 Michel Salim - 2.0.6-1 - Update to 2.0.6 - Remove obsoleted patches From 2ba893b85296c60857a065c033c07eec86721ea1 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 20 Apr 2013 22:29:56 +0200 Subject: [PATCH 17/87] use systemd macros --- sphinx.spec | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 89b889d..c357119 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -25,9 +25,9 @@ BuildRequires: expat-devel BuildRequires: dos2unix #Requires: -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd # Users and groups Requires(pre): shadow-utils @@ -141,8 +141,6 @@ install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx -touch $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx/searchd.log -touch $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx/query.log # Create /var/run/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx @@ -227,34 +225,15 @@ useradd -r -g %{sphinx_group} -d %{sphinx_home} -s /bin/bash \ exit 0 %post -#/sbin/chkconfig --add searchd -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - +%systemd_post searchd.service %preun -#if [ $1 = 0 ] ; then -# /sbin/service searchd stop >/dev/null 2>&1 -# /sbin/chkconfig --del searchd -#fi -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable searchd.service > /dev/null 2>&1 || : - /bin/systemctl stop searchd.service > /dev/null 2>&1 || : -fi - +%systemd_preun searchd.service %post -p /sbin/ldconfig -n libsphinxclient %postun -/sbin/ldconfig -n libsphinxclient -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart searchd.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart searchd.service %posttrans @@ -316,6 +295,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ - upstream 2.0.7 - use tmpfiles.d to create pid directory - move default log file location to /var/log/sphinx +- use systemd macros BZ 850323 * Wed Mar 6 2013 Michel Salim - 2.0.6-1 - Update to 2.0.6 From c1b3ef6f304d2e963cc20e23ea2de856540d202a Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 20 Apr 2013 22:35:06 +0200 Subject: [PATCH 18/87] add aarch64 patch --- sphinx-aarch64.patch | 2682 ++++++++++++++++++++++++++++++++++++++++++ sphinx.spec | 2 + 2 files changed, 2684 insertions(+) create mode 100644 sphinx-aarch64.patch diff --git a/sphinx-aarch64.patch b/sphinx-aarch64.patch new file mode 100644 index 0000000..e947974 --- /dev/null +++ b/sphinx-aarch64.patch @@ -0,0 +1,2682 @@ +diff -urN sphinx-2.0.3-release/api/libsphinxclient/config.guess sphinx-2.0.3-release-aarch64/api/libsphinxclient/config.guess +--- sphinx-2.0.3-release/api/libsphinxclient/config.guess 2008-10-30 20:43:43.000000000 -0500 ++++ sphinx-2.0.3-release-aarch64/api/libsphinxclient/config.guess 2013-03-03 08:33:43.253900583 -0600 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2003-06-17' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -16,24 +17,24 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -53,7 +54,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -66,11 +68,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -104,7 +106,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -123,7 +125,7 @@ + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -136,19 +138,12 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +-## for Red Hat Linux +-if test -f /etc/redhat-release ; then +- VENDOR=redhat ; +-else +- VENDOR= ; +-fi +- + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -165,6 +160,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -173,7 +169,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -183,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -203,50 +199,36 @@ + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU +@@ -284,42 +266,52 @@ + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -327,32 +319,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -361,10 +372,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -376,10 +387,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -389,38 +400,41 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -444,35 +458,36 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -485,29 +500,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -515,7 +530,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -530,15 +545,19 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -551,28 +570,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -581,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -634,9 +653,19 @@ + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -644,11 +673,11 @@ + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -676,208 +705,269 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; +- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ exit ;; ++ *:FreeBSD:*:*) ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix +- exit 0 ;; ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) ++ # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu +- exit 0 ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu +- exit 0 ;; +- m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips +- #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips +- #else +- CPU= +- #endif ++ #ifdef __dietlibc__ ++ LIBC=dietlibc + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 +- ;; +- mips64:Linux:*:*) ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips64 +- #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; +- ppc:Linux:*:*) +- echo powerpc-${VENDOR:-unknown}-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-${VENDOR:-unknown}-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ or32:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -885,109 +975,71 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-${VENDOR:-unknown}-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -995,15 +1047,16 @@ + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1095,68 +1161,97 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1164,22 +1259,28 @@ + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; +- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1190,33 +1291,55 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -1332,11 +1455,12 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1345,22 +1469,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1371,7 +1495,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- ftp://ftp.gnu.org/pub/gnu/config/ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -urN sphinx-2.0.3-release/api/libsphinxclient/config.sub sphinx-2.0.3-release-aarch64/api/libsphinxclient/config.sub +--- sphinx-2.0.3-release/api/libsphinxclient/config.sub 2008-10-30 20:43:43.000000000 -0500 ++++ sphinx-2.0.3-release-aarch64/api/libsphinxclient/config.sub 2013-03-03 08:33:43.267898967 -0600 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2003-06-18' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -20,23 +21,25 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. +- ++# along with this program; if not, see . ++# + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++ + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -70,7 +73,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -83,11 +87,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -99,7 +103,7 @@ + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -118,10 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -144,10 +156,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -162,13 +177,17 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -185,6 +204,10 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -202,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -226,56 +255,103 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ ++ | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | epiphany \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ +- | ip2k \ +- | m32r | m68000 | m68k | m88k | mcore \ ++ | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ ++ | nios | nios2 \ + | ns16k | ns32k \ +- | openrisc | or32 \ ++ | open8 \ ++ | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | s390 | s390x \ +- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | rl78 | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ +- | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xscale | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and +@@ -291,59 +367,81 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ +- | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ +- | clipper-* | cydra-* \ ++ | avr-* | avr32-* \ ++ | be32-* | be64-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ ++ | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ +- | ip2k-* \ +- | m32r-* \ ++ | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ + | msp430-* \ +- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ ++ | nds32-* | nds32le-* | nds32be-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | s390-* | s390x-* \ +- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ +- | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -361,6 +459,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -378,6 +479,9 @@ + amd64) + basic_machine=x86_64-pc + ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -401,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -409,10 +517,35 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -437,12 +570,27 @@ + basic_machine=j90-cray + os=-unicos + ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; +@@ -465,6 +613,14 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -576,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -615,6 +770,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -626,10 +789,21 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -643,10 +817,6 @@ + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff +@@ -659,10 +829,21 @@ + basic_machine=i386-pc + os=-msdos + ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -727,9 +908,11 @@ + np1) + basic_machine=np1-gould + ;; +- nv1) +- basic_machine=nv1-cray +- os=-unicosmp ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem +@@ -738,9 +921,12 @@ + basic_machine=hppa1.1-oki + os=-proelf + ;; +- or32 | or32-*) ++ openrisc | openrisc-*) + basic_machine=or32-unknown +- os=-coff ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson +@@ -758,6 +944,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -767,6 +961,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -796,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -823,6 +1024,10 @@ + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -833,6 +1038,12 @@ + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; + sa29200) + basic_machine=a29k-amd + os=-udi +@@ -843,6 +1054,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -854,6 +1069,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -875,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -931,17 +1152,9 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff ++ tile*) ++ basic_machine=$basic_machine-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown +@@ -956,6 +1169,10 @@ + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -999,9 +1216,16 @@ + basic_machine=hppa1.1-winbond + os=-proelf + ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1010,6 +1234,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1029,6 +1257,9 @@ + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -1045,13 +1276,10 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sh64) +- basic_machine=sh64-unknown +- ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1095,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1118,25 +1349,31 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1154,12 +1391,15 @@ + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -1172,6 +1412,9 @@ + -opened*) + os=-openedition + ;; ++ -os400*) ++ os=-os400 ++ ;; + -wince*) + os=-wince + ;; +@@ -1193,6 +1436,9 @@ + -atheos*) + os=-atheos + ;; ++ -syllable*) ++ os=-syllable ++ ;; + -386bsd) + os=-bsd + ;; +@@ -1215,6 +1461,9 @@ + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -1251,6 +1500,14 @@ + -kaos*) + os=-kaos + ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1273,6 +1530,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1285,6 +1548,18 @@ + c4x-* | tic4x-*) + os=-coff + ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1303,13 +1578,13 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; +@@ -1328,9 +1603,15 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1433,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +@@ -1463,9 +1744,15 @@ + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; ++ -tpf*) ++ vendor=ibm ++ ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; +@@ -1490,7 +1777,7 @@ + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/sphinx.spec b/sphinx.spec index c357119..d15a35d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -14,6 +14,7 @@ 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 +Patch2: %{name}-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +107,7 @@ designed with indexing database content in mind. %setup -qn %{name}-%{version}-release %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen +%patch2 -p1 -b .aarch64 # Fix wrong-file-end-of-line-encoding for f in \ From 83d12d2111061c0b93201ed2ea7fcb577ff3a0e3 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 11 May 2013 13:21:47 +0200 Subject: [PATCH 19/87] upstream 2.0.8 --- .gitignore | 1 + sources | 2 +- sphinx.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6f1a1e0..7b92e71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /sphinx-2.0.6-release.tar.gz /sphinx-2.0.7-release.tar.gz +/sphinx-2.0.8-release.tar.gz diff --git a/sources b/sources index de9551d..027b34d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ac90957277bdd351c5f167751de9ec5 sphinx-2.0.7-release.tar.gz +bcaf0af0ba403a43b9ef3af6f9599cb4 sphinx-2.0.8-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index d15a35d..bd682e1 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,7 +3,7 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist} Summary: Free open-source SQL full-text search engine @@ -293,6 +293,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sat May 11 2013 Christof Damian - 2.0.8-1 +- upstream 2.0.8 + * Sat Apr 20 2013 Christof Damian - 2.0.7-1 - upstream 2.0.7 - use tmpfiles.d to create pid directory From 26d68f88f84f337cba9ae556437517d012e1fae5 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Fri, 26 Jul 2013 12:03:54 +0200 Subject: [PATCH 20/87] --enable-id64 flag for 64-bit builds --- sphinx.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index bd682e1..a20eb30 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -121,7 +121,12 @@ done %build +%if %{__isa_bits} == 64 +%configure --sysconfdir=%{_sysconfdir}/sphinx --with-mysql --with-pgsql --enable-id64 +%else %configure --sysconfdir=%{_sysconfdir}/sphinx --with-mysql --with-pgsql +%endif + make %{?_smp_mflags} # Build libsphinxclient @@ -293,6 +298,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Fri Jul 26 2013 Christof Damian - 2.0.8-2 +- --enable-id64 flag for 64-bit builds + * Sat May 11 2013 Christof Damian - 2.0.8-1 - upstream 2.0.8 From a062bc0a2d425e4ad7e55d0115c4f7cebd42d889 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 2 Nov 2013 15:00:50 +0100 Subject: [PATCH 21/87] upstream 2.1.2 --- .gitignore | 1 + sources | 2 +- sphinx.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7b92e71..a0a19de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /sphinx-2.0.6-release.tar.gz /sphinx-2.0.7-release.tar.gz /sphinx-2.0.8-release.tar.gz +/sphinx-2.1.2-release.tar.gz diff --git a/sources b/sources index 027b34d..2bd7104 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcaf0af0ba403a43b9ef3af6f9599cb4 sphinx-2.0.8-release.tar.gz +3e828fa58e2e6049f02aa6aef3009d48 sphinx-2.1.2-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index a20eb30..657924b 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,8 +3,8 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.0.8 -Release: 2%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text @@ -298,6 +298,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sat Nov 2 2013 Christof Damian - 2.1.2-1 +- upstream 2.1.2 + * Fri Jul 26 2013 Christof Damian - 2.0.8-2 - --enable-id64 flag for 64-bit builds From 7e7123a3c16e5b6ade7241d2350b974eee26e714 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Jan 2014 06:44:33 +0000 Subject: [PATCH 22/87] Fix build with systemd, Cleanup and modernise spec --- .gitignore | 5 +---- sphinx.spec | 26 ++++++++------------------ 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index a0a19de..19ae80e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/sphinx-2.0.6-release.tar.gz -/sphinx-2.0.7-release.tar.gz -/sphinx-2.0.8-release.tar.gz -/sphinx-2.1.2-release.tar.gz +/sphinx-2.*-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 657924b..723520e 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,27 +4,24 @@ Name: sphinx Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine - Group: Applications/Text License: GPLv2+ 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 Patch2: %{name}-aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +BuildRequires: expat-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel -BuildRequires: expat-devel - +BuildRequires: systemd # for fix-ups BuildRequires: dos2unix -#Requires: Requires(post): systemd Requires(preun): systemd @@ -141,7 +138,6 @@ make -C api/java %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service @@ -221,9 +217,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - %pre getent group %{sphinx_group} >/dev/null || groupadd -r %{sphinx_group} getent passwd %{sphinx_user} >/dev/null || \ @@ -260,7 +253,6 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %files -%defattr(-,root,root,-) %doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql %dir %{_sysconfdir}/sphinx %config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf @@ -276,28 +268,26 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_mandir}/man1/* %files -n libsphinxclient -%defattr(-,root,root,-) %doc COPYING api/java api/ruby api/*.php api/*.py api/libsphinxclient/README %{_libdir}/libsphinxclient-0*.so - %files -n libsphinxclient-devel -%defattr(-,root,root,-) %{_libdir}/libsphinxclient.so %{_includedir}/* %files java -%defattr(0644,root,root,0755) %doc api/java/README COPYING %{_javadir}/* - %files php -%defattr(0644,root,root,0755) %doc COPYING %{_datadir}/php/* %changelog +* Sun Jan 26 2014 Peter Robinson 2.1.2-2 +- Fix build with systemd +- Cleanup and modernise spec + * Sat Nov 2 2013 Christof Damian - 2.1.2-1 - upstream 2.1.2 From 09af004b7336ab7190108e3a9ac4ba8823cfd4bc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Jan 2014 16:22:00 +0000 Subject: [PATCH 23/87] 2.1.5 --- sources | 2 +- sphinx.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2bd7104..35cb298 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e828fa58e2e6049f02aa6aef3009d48 sphinx-2.1.2-release.tar.gz +2f0ca0f4656a8fb5f381a0dfc2b718f5 sphinx-2.1.5-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 723520e..9cddfc6 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,8 +3,8 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.5 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine Group: Applications/Text License: GPLv2+ @@ -284,6 +284,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sun Jan 26 2014 Peter Robinson 2.1.5-1 +- upstream 2.1.5 + * Sun Jan 26 2014 Peter Robinson 2.1.2-2 - Fix build with systemd - Cleanup and modernise spec From 5d8b7a80c602f3b939dc51996ff49b6b627720e7 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 7 Jan 2014 12:14:49 +0100 Subject: [PATCH 24/87] Remove versioned jar symlink (rhbz#1022165) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- sphinx.spec | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 9cddfc6..a6f9aa0 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,9 +4,8 @@ Name: sphinx Version: 2.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine -Group: Applications/Text License: GPLv2+ URL: http://sphinxsearch.com @@ -55,7 +54,6 @@ Phrase Index. Yes, I know about CMU's Sphinx project. %package -n libsphinxclient Summary: Pure C searchd client API library -Group: Development/Libraries %description -n libsphinxclient @@ -65,7 +63,6 @@ Sphinx search engine, http://sphinxsearch.com/ %package -n libsphinxclient-devel Summary: Development libraries and header files for libsphinxclient -Group: Development/Libraries Requires: libsphinxclient = %{version}-%{release} @@ -76,7 +73,6 @@ Sphinx search engine, http://sphinxsearch.com/ %package java Summary: Java API for Sphinx -Group: Development/Libraries BuildRequires: java-devel Requires: java Requires: jpackage-utils @@ -90,7 +86,6 @@ designed with indexing database content in mind. %package php Summary: PHP API for Sphinx -Group: Development/Libraries Requires: php-common >= 5.1.6 @@ -196,13 +191,8 @@ popd # install the java api mkdir -p $RPM_BUILD_ROOT%{_javadir} install -m 0644 api/java/%{name}api.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar - -# convenience symlinks -pushd $RPM_BUILD_ROOT%{_javadir} - ln -s %{name}-%{version}.jar %{name}.jar - ln -s %{name}-%{version}.jar %{name}api.jar -popd + $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +ln -s %{_javadir}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}api.jar # install the php api # "Non-PEAR PHP extensions should put their Class files in /usr/share/php." @@ -284,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Tue Mar 25 2014 Michael Simacek - 2.1.5-2 +- Remove version from JAR name + * Sun Jan 26 2014 Peter Robinson 2.1.5-1 - upstream 2.1.5 From 6fc1299c98783295bd3f6f06e26f1fb39f20f33d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Mar 2014 14:43:10 +0100 Subject: [PATCH 25/87] Move to java-headless - Resolves: rhbz#1068545 --- sphinx.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index a6f9aa0..0ba3b31 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -74,7 +74,7 @@ Sphinx search engine, http://sphinxsearch.com/ %package java Summary: Java API for Sphinx BuildRequires: java-devel -Requires: java +Requires: java-headless Requires: jpackage-utils @@ -274,6 +274,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Tue Mar 25 2014 Mikolaj Izdebski - 2.1.5-2 +- Move to java-headless +- Resolves: rhbz#1068545 + * Tue Mar 25 2014 Michael Simacek - 2.1.5-2 - Remove version from JAR name From a99271c4014bea2fc0b5901d106305a55700aeda Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:56:31 -0500 Subject: [PATCH 26/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 0ba3b31..b347a13 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 2.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -274,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Mar 25 2014 Mikolaj Izdebski - 2.1.5-2 - Move to java-headless - Resolves: rhbz#1068545 From 6ea66e96bd569c07548babb9426e7f09d72a9589 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 03:19:42 +0000 Subject: [PATCH 27/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index b347a13..2a04ff6 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 2.1.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -274,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 2.1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From ba20f26abcc187ec82276979e603051a6714f409 Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 28 Oct 2014 15:37:14 -0700 Subject: [PATCH 28/87] Upstream 2.2.5 --- sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 2a04ff6..1d6ce3c 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,8 +3,8 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.1.5 -Release: 4%{?dist} +Version: 2.2.5 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -274,6 +274,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Tue Oct 28 2014 Gerald Cox - 2.2.5-1 +- Upstream 2.2.5 + * Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b959cfbaf66e059df19658e5c1490e7afe9a02ce Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 28 Oct 2014 19:20:20 -0700 Subject: [PATCH 29/87] Upstream 2.2.5 - ExcludeArch: arm rhbz#1107361 --- sphinx.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 1d6ce3c..29c836f 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,8 @@ 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 -Patch2: %{name}-aarch64.patch + +ExcludeArch: arm BuildRequires: expat-devel BuildRequires: mysql-devel @@ -99,7 +100,6 @@ designed with indexing database content in mind. %setup -qn %{name}-%{version}-release %patch0 -p1 -b .fix_static %patch1 -p1 -b .default_listen -%patch2 -p1 -b .aarch64 # Fix wrong-file-end-of-line-encoding for f in \ @@ -276,6 +276,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %changelog * Tue Oct 28 2014 Gerald Cox - 2.2.5-1 - Upstream 2.2.5 +- ExcludeArch: arm rhbz#1107361 * Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 3d735cdce2239a66498ae4697847a8935afa6dfe Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 28 Oct 2014 19:32:19 -0700 Subject: [PATCH 30/87] Upstream 2.2.5 - ExcludeArch: armv7hl rhbz#1107361 --- sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 29c836f..8af916e 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -14,7 +14,7 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch -ExcludeArch: arm +ExcludeArch: armv7hl BuildRequires: expat-devel BuildRequires: mysql-devel @@ -276,7 +276,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %changelog * Tue Oct 28 2014 Gerald Cox - 2.2.5-1 - Upstream 2.2.5 -- ExcludeArch: arm rhbz#1107361 +- ExcludeArch: armv7hl rhbz#1107361 * Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 204ed97f7fbbf8a0d3ab2b5afcbb5d24f6c12fdf Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 28 Oct 2014 19:58:39 -0700 Subject: [PATCH 31/87] Upstream 2.2.5 - ExcludeArch: armv7hl rhbz#1107361 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 35cb298..ad6ed3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f0ca0f4656a8fb5f381a0dfc2b718f5 sphinx-2.1.5-release.tar.gz +ab0007c9b128b6fde17d936c131f7a17 sphinx-2.2.5-release.tar.gz From c089bb15927440b231e3a1043bbeaa85c0d1e755 Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 28 Oct 2014 20:27:28 -0700 Subject: [PATCH 32/87] Upstream 2.2.5 - ExcludeArch: %{arm} rhbz#1107361 --- sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 8af916e..a513e1d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -14,7 +14,7 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch -ExcludeArch: armv7hl +ExcludeArch: %{arm} BuildRequires: expat-devel BuildRequires: mysql-devel @@ -276,7 +276,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %changelog * Tue Oct 28 2014 Gerald Cox - 2.2.5-1 - Upstream 2.2.5 -- ExcludeArch: armv7hl rhbz#1107361 +- ExcludeArch: %{arm} rhbz#1107361 * Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 3f2726ed17f263fd933377f6ca96eb7825c1a15c Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 28 Oct 2014 20:38:33 -0700 Subject: [PATCH 33/87] Upstream 2.2.5 - ExclusiveArch: %{ix86} x86_64 rhbz#1107361 --- sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index a513e1d..f8d735f 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -14,7 +14,7 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch -ExcludeArch: %{arm} +ExclusiveArch: %{ix86} x86_64 BuildRequires: expat-devel BuildRequires: mysql-devel @@ -276,7 +276,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %changelog * Tue Oct 28 2014 Gerald Cox - 2.2.5-1 - Upstream 2.2.5 -- ExcludeArch: %{arm} rhbz#1107361 +- ExclusiveArch: %{ix86} x86_64 rhbz#1107361 * Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 33f93312371c56ab31af6681121ce75f3f4eb0c7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 10 Nov 2014 20:03:52 +0000 Subject: [PATCH 34/87] Drop ExclusiveArch as armv7hl issue is fixed and aarch64/ppc64/s390 never had issues --- sphinx.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index f8d735f..331a038 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -4,7 +4,7 @@ Name: sphinx Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -14,8 +14,6 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch -ExclusiveArch: %{ix86} x86_64 - BuildRequires: expat-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel @@ -274,9 +272,12 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Mon Nov 10 2014 Peter Robinson 2.2.5-2 +- Drop ExclusiveArch as armv7hl issue is fixed and aarch64/ppc64/s390 never had issues + * Tue Oct 28 2014 Gerald Cox - 2.2.5-1 - Upstream 2.2.5 -- ExclusiveArch: %{ix86} x86_64 rhbz#1107361 +- ExclusiveArch: %%{ix86} x86_64 rhbz#1107361 * Mon Aug 18 2014 Fedora Release Engineering - 2.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 313c6018607f3c9ea4cdf80c30501e716f52a884 Mon Sep 17 00:00:00 2001 From: gbcox Date: Sat, 15 Nov 2014 09:28:37 -0800 Subject: [PATCH 35/87] Upstream 2.2.6 --- sources | 2 +- sphinx.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index ad6ed3e..284b0f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab0007c9b128b6fde17d936c131f7a17 sphinx-2.2.5-release.tar.gz +20e8693a3680f8a65bdad6cd4dae82f5 sphinx-2.2.6-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 331a038..1b69864 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,8 +3,8 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.2.5 -Release: 2%{?dist} +Version: 2.2.6 +Release: 1%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -272,6 +272,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sat Nov 15 2014 Gerald Cox - 2.2.6-1 +- Upstream 2.2.6 + * Mon Nov 10 2014 Peter Robinson 2.2.5-2 - Drop ExclusiveArch as armv7hl issue is fixed and aarch64/ppc64/s390 never had issues From 1f0f38b3b17cf2bd4c4a0efc76310a8928d29682 Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 20 Jan 2015 20:50:14 -0800 Subject: [PATCH 36/87] Upstream 2.2.7 --- sources | 2 +- sphinx.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 284b0f4..4c2cde9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20e8693a3680f8a65bdad6cd4dae82f5 sphinx-2.2.6-release.tar.gz +ac74f013665f473d7ea22623f4b72468 sphinx-2.2.7-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 1b69864..300cd8d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,7 +3,7 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.2.6 +Version: 2.2.7 Release: 1%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ @@ -272,6 +272,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Wed Jan 21 2015 Gerald Cox - 2.2.7-1 +- Upstream 2.2.7 + * Sat Nov 15 2014 Gerald Cox - 2.2.6-1 - Upstream 2.2.6 From a74d4a1b8a09667b5117a97446a7a923059f75ff Mon Sep 17 00:00:00 2001 From: gbcox Date: Sun, 29 Mar 2015 16:17:07 -0700 Subject: [PATCH 37/87] Upstream 2.2.8 rhbz#1201311 --- sources | 2 +- sphinx.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4c2cde9..554dd1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac74f013665f473d7ea22623f4b72468 sphinx-2.2.7-release.tar.gz +4eb54ad6bd9a03b8b39bc10f16e59a63 sphinx-2.2.8-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 300cd8d..1d0e4a6 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -3,7 +3,7 @@ %global sphinx_home %{_localstatedir}/lib/sphinx Name: sphinx -Version: 2.2.7 +Version: 2.2.8 Release: 1%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ @@ -272,6 +272,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sun Mar 29 2015 Gerald Cox - 2.2.8-1 +- Upstream 2.2.8 rhbz#1201311 + * Wed Jan 21 2015 Gerald Cox - 2.2.7-1 - Upstream 2.2.7 From 329155ea2056b9dbb8337d5c5346bf1c36dd25cd Mon Sep 17 00:00:00 2001 From: gbcox Date: Sun, 29 Mar 2015 17:48:47 -0700 Subject: [PATCH 38/87] Upstream 2.2.8 rhbz#1201311 --- sphinx.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sphinx.spec b/sphinx.spec index 1d0e4a6..c97e079 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -2,6 +2,15 @@ %global sphinx_group sphinx %global sphinx_home %{_localstatedir}/lib/sphinx +# rpmbuild < 4.6 support +%if ! 0%{?__isa_bits} +%ifarch x86_64 ia64 ppc64 sparc64 s390x alpha ppc64le aarch64 +%global __isa_bits 64 +%else +%global __isa_bits 32 +%endif +%endif + Name: sphinx Version: 2.2.8 Release: 1%{?dist} From c9338eab4a06e7297379a598fd4f23adbac13400 Mon Sep 17 00:00:00 2001 From: gbcox Date: Mon, 20 Apr 2015 07:33:22 -0700 Subject: [PATCH 39/87] Upstream 2.2.9 rhbz#1201311 --- sources | 2 +- sphinx.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 554dd1b..67ff608 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4eb54ad6bd9a03b8b39bc10f16e59a63 sphinx-2.2.8-release.tar.gz +1fcc3d180c0559bdeb93602ef248caf4 sphinx-2.2.9-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index c97e079..4cffc8b 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -12,7 +12,7 @@ %endif Name: sphinx -Version: 2.2.8 +Version: 2.2.9 Release: 1%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Mon Apr 20 2015 Gerald Cox - 2.2.9-1 +- Upstream 2.2.9 rhbz#1201311 + * Sun Mar 29 2015 Gerald Cox - 2.2.8-1 - Upstream 2.2.8 rhbz#1201311 From d09341b2faa48af1e3d718fb3707f5a6ba4f3ffd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:27:29 +0000 Subject: [PATCH 40/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 4cffc8b..69e9ec7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Apr 20 2015 Gerald Cox - 2.2.9-1 - Upstream 2.2.9 rhbz#1201311 From b11a55a37e3f6b11ed620f62bfc215bfddea2474 Mon Sep 17 00:00:00 2001 From: gbcox Date: Mon, 7 Sep 2015 09:52:42 -0700 Subject: [PATCH 41/87] Upstream 2.2.10 rhbz#1260452 --- sources | 2 +- sphinx.spec | 92 ++++++++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/sources b/sources index 67ff608..f5cb8cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1fcc3d180c0559bdeb93602ef248caf4 sphinx-2.2.9-release.tar.gz +dda52b24d8348fc09e26d8a649a231d2 sphinx-2.2.10-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index 69e9ec7..d1ba782 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -11,31 +11,29 @@ %endif %endif -Name: sphinx -Version: 2.2.9 -Release: 2%{?dist} -Summary: Free open-source SQL full-text search engine -License: GPLv2+ -URL: http://sphinxsearch.com +Name: sphinx +Version: 2.2.10 +Release: 1%{?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 -Source1: searchd.service -Patch0: %{name}-2.0.3-fix_static.patch -Patch1: %{name}-2.0.3-default_listen.patch +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 -BuildRequires: expat-devel -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: systemd -# for fix-ups -BuildRequires: dos2unix +BuildRequires: expat-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: systemd -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd # Users and groups -Requires(pre): shadow-utils +Requires(pre): shadow-utils %description @@ -49,11 +47,11 @@ 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 (e.g. to natively support some other DBMSes) is +format. Adding new drivers (e.g. native support other DBMSes) is designed to be as easy as possible. -Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also -available as a pluggable MySQL storage engine. API is very lightweight so +Search API native ported to PHP, Python, Perl, Ruby, Java, and also +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 @@ -61,29 +59,29 @@ Phrase Index. Yes, I know about CMU's Sphinx project. %package -n libsphinxclient -Summary: Pure C searchd client API library +Summary: Pure C search-d client API library %description -n libsphinxclient -Pure C searchd client API library +Pure C search-d client API library Sphinx search engine, http://sphinxsearch.com/ %package -n libsphinxclient-devel -Summary: Development libraries and header files for libsphinxclient -Requires: libsphinxclient = %{version}-%{release} +Summary: Development libraries and header files for libsphinxclient +Requires: libsphinxclient = %{version}-%{release} %description -n libsphinxclient-devel -Pure C searchd client API library +Pure C search-d client API library Sphinx search engine, http://sphinxsearch.com/ %package java -Summary: Java API for Sphinx -BuildRequires: java-devel -Requires: java-headless -Requires: jpackage-utils +Summary: Java API for Sphinx +BuildRequires: java-devel +Requires: java-headless +Requires: jpackage-utils %description java @@ -93,8 +91,8 @@ designed with indexing database content in mind. %package php -Summary: PHP API for Sphinx -Requires: php-common >= 5.1.6 +Summary: PHP API for Sphinx +Requires: php-common >= 5.1.6 %description php @@ -110,14 +108,16 @@ designed with indexing database content in mind. # Fix wrong-file-end-of-line-encoding for f in \ - api/java/mk.cmd \ - api/ruby/test.rb \ - api/ruby/spec/sphinx/sphinx_test.sql \ + api/java/mk.cmd \ + api/ruby/test.rb \ + api/ruby/spec/sphinx/sphinx_test.sql \ + api/ruby/spec/sphinx/sphinx_test.sql \ ; do - dos2unix ${f} + sed -i 's/\r$//' ${f}; done - +# Fix file not UTF8 +iconv -f iso8859-1 -t utf-8 doc/sphinx.txt > doc/sphinx.txt.conv && mv -f doc/sphinx.txt.conv doc/sphinx.txt %build %if %{__isa_bits} == 64 @@ -142,7 +142,7 @@ make -C api/java %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" -install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service +install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx @@ -184,7 +184,7 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF } EOF -# Create /etc/logrotate.d/sphinx +# Create /etc/logrotate.d/sphinx mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf << EOF d %{_localstatedir}/run/sphinx 755 sphinx root - @@ -227,12 +227,13 @@ exit 0 %preun %systemd_preun searchd.service -%post -p /sbin/ldconfig -n libsphinxclient +%post -n libsphinxclient -p /sbin/ldconfig -%postun +%postun -n libsphinxclient -p /sbin/ldconfig + +%postun %systemd_postun_with_restart searchd.service - %posttrans chown -R %{sphinx_user}:root %{_localstatedir}/log/sphinx/ chown -R %{sphinx_user}:root %{_localstatedir}/run/sphinx/ @@ -281,6 +282,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Sun Sep 6 2015 Gerald Cox - 2.2.10-1 +- Upstream 2.2.10 rhbz#1260452 + * Fri Jun 19 2015 Fedora Release Engineering - 2.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 032b629df5a59006c2b142b51e200242310596a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 00:25:54 +0000 Subject: [PATCH 42/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index d1ba782..a366cdc 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.10 -Release: 1%{?dist} +Release: 2%{?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/sphinx/ %{_datadir}/php/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Sep 6 2015 Gerald Cox - 2.2.10-1 - Upstream 2.2.10 rhbz#1260452 From eda0ebc80816f1b940e3f0d9fa858dd3e352d184 Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 26 Jul 2016 12:21:55 -0700 Subject: [PATCH 43/87] Upstream 2.2.11; remove mysqld.service rhbz#1288815 --- searchd.service | 2 +- sources | 2 +- sphinx.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/searchd.service b/searchd.service index 8f3e7e1..612b97e 100644 --- a/searchd.service +++ b/searchd.service @@ -1,6 +1,6 @@ [Unit] Description=Sphinx - SQL Full Text Search Engine -After=local-fs.target network.target mysqld.service +After=local-fs.target network.target [Service] User=sphinx diff --git a/sources b/sources index f5cb8cc..af4f946 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dda52b24d8348fc09e26d8a649a231d2 sphinx-2.2.10-release.tar.gz +5cac34f3d78a9d612ca4301abfcbd666 sphinx-2.2.11-release.tar.gz diff --git a/sphinx.spec b/sphinx.spec index a366cdc..403f50c 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -12,8 +12,8 @@ %endif Name: sphinx -Version: 2.2.10 -Release: 2%{?dist} +Version: 2.2.11 +Release: 1%{?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/sphinx/ %{_datadir}/php/* %changelog +* Tue Jul 26 2016 Gerald Cox 2.2.11-1 +- Upstream 2.2.11; remove mysqld.service rhbz#1288815 + * Fri Feb 05 2016 Fedora Release Engineering - 2.2.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 63ce93378acea60afe6e39b1a7f3b4b6739f536d Mon Sep 17 00:00:00 2001 From: gbcox Date: Tue, 26 Jul 2016 12:47:57 -0700 Subject: [PATCH 44/87] Upstream 2.2.11; remove mysqld.service rhbz#1288815 --- sphinx.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 403f50c..6e680ac 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -1,6 +1,6 @@ %global sphinx_user sphinx %global sphinx_group sphinx -%global sphinx_home %{_localstatedir}/lib/sphinx +%global sphinx_home %{_tmpfilesdir}/lib/sphinx # rpmbuild < 4.6 support %if ! 0%{?__isa_bits} @@ -145,35 +145,35 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/log/sphinx # Create /var/run/sphinx -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/run/sphinx # Create /var/lib/sphinx -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/lib/sphinx # Create sphinx.conf cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \ $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf # Modify sphinx.conf -sed -i 's|/var/log/searchd.log|%{_localstatedir}/log/sphinx/searchd.log|g' \ +sed -i 's|/var/log/searchd.log|%{_tmpfilesdir}/log/sphinx/searchd.log|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf -sed -i 's|/var/log/query.log|%{_localstatedir}/log/sphinx/query.log|g' \ +sed -i 's|/var/log/query.log|%{_tmpfilesdir}/log/sphinx/query.log|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf -sed -i 's|/var/log/searchd.pid|%{_localstatedir}/run/sphinx/searchd.pid|g' \ +sed -i 's|/var/log/searchd.pid|%{_tmpfilesdir}/run/sphinx/searchd.pid|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf -sed -i 's|/var/data|%{_localstatedir}/lib/sphinx|g' \ +sed -i 's|/var/data|%{_tmpfilesdir}/lib/sphinx|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf # Create /etc/logrotate.d/sphinx mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF -%{_localstatedir}/log/sphinx/*.log { +%{_tmpfilesdir}/log/sphinx/*.log { weekly rotate 10 copytruncate @@ -187,7 +187,7 @@ EOF # Create /etc/logrotate.d/sphinx mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf << EOF -d %{_localstatedir}/run/sphinx 755 sphinx root - +d %{_tmpfilesdir}/run/sphinx 755 sphinx root - EOF # Install libsphinxclient @@ -235,9 +235,9 @@ exit 0 %systemd_postun_with_restart searchd.service %posttrans -chown -R %{sphinx_user}:root %{_localstatedir}/log/sphinx/ -chown -R %{sphinx_user}:root %{_localstatedir}/run/sphinx/ -chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ +chown -R %{sphinx_user}:root %{_tmpfilesdir}/log/sphinx/ +chown -R %{sphinx_user}:root %{_tmpfilesdir}/run/sphinx/ +chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/sphinx/ %triggerun -- sphinx < 2.0.3-1 # Save the current service runlevel info @@ -260,9 +260,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/ %config(noreplace) %{_sysconfdir}/logrotate.d/sphinx %{_tmpfilesdir}/%{name}.conf %{_bindir}/* -%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/sphinx -%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/sphinx -%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/log/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/run/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/lib/sphinx %{_mandir}/man1/* %files -n libsphinxclient From 29db9de0fe82d326140c8a44be81068605e95c05 Mon Sep 17 00:00:00 2001 From: gbcox Date: Thu, 11 Aug 2016 16:36:06 -0700 Subject: [PATCH 45/87] Correct tmpfile.d sphinx.conf rhbz#1366414 --- sphinx.spec | 67 ++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 6e680ac..c05b588 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -110,20 +110,20 @@ designed with indexing database content in mind. for f in \ api/java/mk.cmd \ api/ruby/test.rb \ - api/ruby/spec/sphinx/sphinx_test.sql \ - api/ruby/spec/sphinx/sphinx_test.sql \ + api/ruby/spec/%{name}/%{name}_test.sql \ + api/ruby/spec/%{name}/%{name}_test.sql \ ; do sed -i 's/\r$//' ${f}; done # Fix file not UTF8 -iconv -f iso8859-1 -t utf-8 doc/sphinx.txt > doc/sphinx.txt.conv && mv -f doc/sphinx.txt.conv doc/sphinx.txt +iconv -f iso8859-1 -t utf-8 doc/%{name}.txt > doc/%{name}.txt.conv && mv -f doc/%{name}.txt.conv doc/%{name}.txt %build %if %{__isa_bits} == 64 -%configure --sysconfdir=%{_sysconfdir}/sphinx --with-mysql --with-pgsql --enable-id64 +%configure --sysconfdir=%{_sysconfdir}/%{name} --with-mysql --with-pgsql --enable-id64 %else -%configure --sysconfdir=%{_sysconfdir}/sphinx --with-mysql --with-pgsql +%configure --sysconfdir=%{_sysconfdir}/%{name} --with-mysql --with-pgsql %endif make %{?_smp_mflags} @@ -145,35 +145,35 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/log/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/log/%{name} # Create /var/run/sphinx -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/run/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/run/%{name} # Create /var/lib/sphinx -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/lib/sphinx +mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/lib/%{name} # Create sphinx.conf -cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \ - $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +cp $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-min.conf.dist \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf # Modify sphinx.conf -sed -i 's|/var/log/searchd.log|%{_tmpfilesdir}/log/sphinx/searchd.log|g' \ - $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/log/searchd.log|%{_tmpfilesdir}/log/%{name}/searchd.log|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf -sed -i 's|/var/log/query.log|%{_tmpfilesdir}/log/sphinx/query.log|g' \ - $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/log/query.log|%{_tmpfilesdir}/log/%{name}/query.log|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf -sed -i 's|/var/log/searchd.pid|%{_tmpfilesdir}/run/sphinx/searchd.pid|g' \ - $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf +sed -i 's|/var/log/searchd.pid|%{_tmpfilesdir}/run/%{name}/searchd.pid|g' \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf sed -i 's|/var/data|%{_tmpfilesdir}/lib/sphinx|g' \ - $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf # Create /etc/logrotate.d/sphinx mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF -%{_tmpfilesdir}/log/sphinx/*.log { +cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} << EOF +%{_tmpfilesdir}/log/%{name}/*.log { weekly rotate 10 copytruncate @@ -184,10 +184,10 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF } EOF -# Create /etc/logrotate.d/sphinx +# Create tmpfile run configuration mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf << EOF -d %{_tmpfilesdir}/run/sphinx 755 sphinx root - +d /run/%{name} 755 %{name} root - EOF # Install libsphinxclient @@ -235,9 +235,9 @@ exit 0 %systemd_postun_with_restart searchd.service %posttrans -chown -R %{sphinx_user}:root %{_tmpfilesdir}/log/sphinx/ -chown -R %{sphinx_user}:root %{_tmpfilesdir}/run/sphinx/ -chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/sphinx/ +chown -R %{sphinx_user}:root %{_tmpfilesdir}/log/%{name}/ +chown -R %{sphinx_user}:root %{_tmpfilesdir}/run/%{name}/ +chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %triggerun -- sphinx < 2.0.3-1 # Save the current service runlevel info @@ -253,16 +253,16 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/sphinx/ %files %doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql %dir %{_sysconfdir}/sphinx -%config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf -%exclude %{_sysconfdir}/sphinx/*.conf.dist -%exclude %{_sysconfdir}/sphinx/example.sql +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%exclude %{_sysconfdir}/%{name}/*.conf.dist +%exclude %{_sysconfdir}/%{name}/example.sql %{_unitdir}/searchd.service -%config(noreplace) %{_sysconfdir}/logrotate.d/sphinx +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_tmpfilesdir}/%{name}.conf %{_bindir}/* -%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/log/sphinx -%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/run/sphinx -%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/lib/sphinx +%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/log/%{name} +%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/run/%{name} +%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/lib/%{name} %{_mandir}/man1/* %files -n libsphinxclient @@ -282,6 +282,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/sphinx/ %{_datadir}/php/* %changelog +* Thu Aug 11 2016 Gerald Cox 2.2.11-2 +- Correct tmpfile.d sphinx.conf rhbz#1366414 + * Tue Jul 26 2016 Gerald Cox 2.2.11-1 - Upstream 2.2.11; remove mysqld.service rhbz#1288815 From c24e52e825b210d84c612f84b16a07b88f7365ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:48:47 +0000 Subject: [PATCH 46/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index c05b588..bb66247 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 2%{?dist} +Release: 3%{?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 %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Aug 11 2016 Gerald Cox 2.2.11-2 - Correct tmpfile.d sphinx.conf rhbz#1366414 From 37d8ed99769d1994f509fa98db61fbe4adc49483 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 19:04:49 +0000 Subject: [PATCH 47/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index bb66247..349ac27 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 3%{?dist} +Release: 4%{?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 %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2ab38fae0aa776d6a755de7b98e18407758a9dd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:44:38 +0000 Subject: [PATCH 48/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 349ac27..4ed4568 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 4%{?dist} +Release: 5%{?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 %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.2.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 342af3652ee2367c1529d00b8fc349bb0afe0e2e Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Wed, 20 Sep 2017 19:07:50 -0400 Subject: [PATCH 49/87] Fix RHBZ 1493696 --- sphinx.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 4ed4568..37456d7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -24,7 +24,7 @@ Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch BuildRequires: expat-devel -BuildRequires: mysql-devel +BuildRequires: mariadb-connector-c-devel openssl-devel BuildRequires: postgresql-devel BuildRequires: systemd @@ -282,6 +282,8 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Wed Sep 20 2017 Ben Cotton - 2.2.11-6 +- Change MariaDB interface package dependency rhbz#1493696 * Thu Aug 03 2017 Fedora Release Engineering - 2.2.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 0c32745b1454be621a4ea3e2db7947a768d4571e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 17:23:18 +0000 Subject: [PATCH 50/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 37456d7..d5a35b8 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 6%{?dist} +Release: 7%{?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 %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.2.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Sep 20 2017 Ben Cotton - 2.2.11-6 - Change MariaDB interface package dependency rhbz#1493696 * Thu Aug 03 2017 Fedora Release Engineering - 2.2.11-5 From d6d9605bffca24d4c58081bc3b113e7642d01e7e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:51 +0200 Subject: [PATCH 51/87] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- sphinx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sphinx.spec b/sphinx.spec index d5a35b8..4308ffa 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -23,6 +23,7 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch +BuildRequires: gcc BuildRequires: expat-devel BuildRequires: mariadb-connector-c-devel openssl-devel BuildRequires: postgresql-devel From af995ff02be80d4066bfda5000e8da855bb3c909 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:32:27 +0000 Subject: [PATCH 52/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 4308ffa..41c2cf2 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -283,6 +283,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.2.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 2.2.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 394e50aaaec0d2abf9c83846f1148d272acf0335 Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Fri, 20 Jul 2018 16:18:04 -0400 Subject: [PATCH 53/87] Explicitly require C++ compiler --- sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 41c2cf2..9c0630b 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -23,7 +23,7 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: %{name}-2.0.3-default_listen.patch -BuildRequires: gcc +BuildRequires: gcc gcc-c++ BuildRequires: expat-devel BuildRequires: mariadb-connector-c-devel openssl-devel BuildRequires: postgresql-devel @@ -283,6 +283,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jul 20 2018 Ben Cotton - 2.2.11-9 +- Fix FTBFS rhbz#1606397 + * Sat Jul 14 2018 Fedora Release Engineering - 2.2.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6a6ce6aa2a3fedf14180d61880fcc50d68d61a2c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 6 Sep 2018 10:25:48 +0200 Subject: [PATCH 54/87] BuildRequires: s/postgresql-devel/libpq-devel/ That's because we moved libpq.so.5 into libpq package. Related: rhbz#1618698, rhbz#1623764 --- sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 9c0630b..5adb4a7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -26,7 +26,7 @@ Patch1: %{name}-2.0.3-default_listen.patch BuildRequires: gcc gcc-c++ BuildRequires: expat-devel BuildRequires: mariadb-connector-c-devel openssl-devel -BuildRequires: postgresql-devel +BuildRequires: libpq-devel BuildRequires: systemd Requires(post): systemd From e5c38353cac540e145e665228278d046382b140b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:03 +0100 Subject: [PATCH 55/87] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- sphinx.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 5adb4a7..1f23e04 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -228,9 +228,7 @@ exit 0 %preun %systemd_preun searchd.service -%post -n libsphinxclient -p /sbin/ldconfig - -%postun -n libsphinxclient -p /sbin/ldconfig +%ldconfig_scriptlets -n libsphinxclient %postun %systemd_postun_with_restart searchd.service From 9209669e0661df431cee6f3526c8a4b57dd96883 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 08:18:42 +0000 Subject: [PATCH 56/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 1f23e04..2c96188 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.2.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 20 2018 Ben Cotton - 2.2.11-9 - Fix FTBFS rhbz#1606397 From 0c7c3440aceeb3b0c926ba41bd3f30f7209a53b9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 14 Feb 2019 14:29:16 -0700 Subject: [PATCH 57/87] Revert incorrect use of _tmpfiledir rhbx#1551735 This reverts commit 63ce93378acea60afe6e39b1a7f3b4b6739f536d. Conflicts: sphinx.spec --- sphinx.spec | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 2c96188..0a1472d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -1,6 +1,6 @@ %global sphinx_user sphinx %global sphinx_group sphinx -%global sphinx_home %{_tmpfilesdir}/lib/sphinx +%global sphinx_home %{_localstatedir}/lib/sphinx # rpmbuild < 4.6 support %if ! 0%{?__isa_bits} @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -146,35 +146,35 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c" install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service # Create /var/log/sphinx -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/log/%{name} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} # Create /var/run/sphinx -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/run/%{name} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} # Create /var/lib/sphinx -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/lib/%{name} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} # Create sphinx.conf cp $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-min.conf.dist \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf # Modify sphinx.conf -sed -i 's|/var/log/searchd.log|%{_tmpfilesdir}/log/%{name}/searchd.log|g' \ +sed -i 's|/var/log/searchd.log|%{_localstatedir}/log/%{name}/searchd.log|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf -sed -i 's|/var/log/query.log|%{_tmpfilesdir}/log/%{name}/query.log|g' \ +sed -i 's|/var/log/query.log|%{_localstatedir}/log/%{name}/query.log|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf -sed -i 's|/var/log/searchd.pid|%{_tmpfilesdir}/run/%{name}/searchd.pid|g' \ +sed -i 's|/var/log/searchd.pid|%{_localstatedir}/run/%{name}/searchd.pid|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf -sed -i 's|/var/data|%{_tmpfilesdir}/lib/sphinx|g' \ +sed -i 's|/var/data|%{_localstatedir}/lib/sphinx|g' \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf # Create /etc/logrotate.d/sphinx mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} << EOF -%{_tmpfilesdir}/log/%{name}/*.log { +%{_localstatedir}/log/%{name}/*.log { weekly rotate 10 copytruncate @@ -234,9 +234,9 @@ exit 0 %systemd_postun_with_restart searchd.service %posttrans -chown -R %{sphinx_user}:root %{_tmpfilesdir}/log/%{name}/ -chown -R %{sphinx_user}:root %{_tmpfilesdir}/run/%{name}/ -chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ +chown -R %{sphinx_user}:root %{_localstatedir}/log/%{name}/ +chown -R %{sphinx_user}:root %{_localstatedir}/run/%{name}/ +chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %triggerun -- sphinx < 2.0.3-1 # Save the current service runlevel info @@ -259,9 +259,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_tmpfilesdir}/%{name}.conf %{_bindir}/* -%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/log/%{name} -%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/run/%{name} -%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/lib/%{name} +%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/%{name} +%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/%{name} +%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/%{name} %{_mandir}/man1/* %files -n libsphinxclient @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Thu Feb 14 2019 Orion Poplawski - 2.2.11-11 +- Revert incorrect use of _tmpfiledir rhbx#1551735 + * Sun Feb 03 2019 Fedora Release Engineering - 2.2.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e12cc70bd9315446461cc856b99c8e24a2fa0e8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:53:25 +0000 Subject: [PATCH 58/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 0a1472d..6fa70d4 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.2.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 14 2019 Orion Poplawski - 2.2.11-11 - Revert incorrect use of _tmpfiledir rhbx#1551735 From bdb0727a1d8adf7e08620c422126a7df021931ac Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Thu, 5 Sep 2019 09:38:33 -0400 Subject: [PATCH 59/87] Default to only listening on localhost. Fixes RHBZ 1749190 (CVE-2019-14511) --- listen_local.patch | 26 ++++++++++++++++++++++++++ sphinx-2.0.3-default_listen.patch | 24 ------------------------ sphinx.spec | 7 +++++-- 3 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 listen_local.patch delete mode 100644 sphinx-2.0.3-default_listen.patch diff --git a/listen_local.patch b/listen_local.patch new file mode 100644 index 0000000..46a1342 --- /dev/null +++ b/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 diff --git a/sphinx-2.0.3-default_listen.patch b/sphinx-2.0.3-default_listen.patch deleted file mode 100644 index 07b602d..0000000 --- a/sphinx-2.0.3-default_listen.patch +++ /dev/null @@ -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 diff --git a/sphinx.spec b/sphinx.spec index 6fa70d4..37234b6 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -21,7 +21,7 @@ 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 BuildRequires: gcc gcc-c++ BuildRequires: expat-devel @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Thu Sep 05 2019 Ben Cotton - 2.2.11-13 +- Listen only on localhost (CVE-2019-14511, rhbz#1749190) + * Fri Jul 26 2019 Fedora Release Engineering - 2.2.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 164852abdc626b23ff0abe267bdc8dd0f8a7f3f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:03:13 +0000 Subject: [PATCH 60/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 37234b6..cff44a9 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.2.11-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Sep 05 2019 Ben Cotton - 2.2.11-13 - Listen only on localhost (CVE-2019-14511, rhbz#1749190) From 23d73a4fbacbf71676577d04302fe013186c6ccb Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 06:54:01 +0200 Subject: [PATCH 61/87] Rebuilt for JDK-11 --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index cff44a9..fd9013d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jul 11 2020 Jiri Vanek - 2.2.11-15 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Jan 31 2020 Fedora Release Engineering - 2.2.11-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0e593c3e8949461fddd7a28e4e4ba48c3a0e2525 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:16:22 +0000 Subject: [PATCH 62/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 fd9013d..8b2bbcd 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.11-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 2.2.11-15 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 2b83c81914a67f59bb69fb093c1b9f7163677ed0 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:50:23 +0000 Subject: [PATCH 63/87] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sphinx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sphinx.spec b/sphinx.spec index 8b2bbcd..6acc26c 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -23,6 +23,7 @@ Source1: searchd.service Patch0: %{name}-2.0.3-fix_static.patch Patch1: listen_local.patch +BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: expat-devel BuildRequires: mariadb-connector-c-devel openssl-devel From 3fe839822b630ad30f663056365a87f2f373ad33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:52:04 +0000 Subject: [PATCH 64/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 6acc26c..be3e5fa 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 16%{?dist} +Release: 17%{?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 +* Wed Jan 27 2021 Fedora Release Engineering - 2.2.11-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.2.11-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 69e337d93960157ed7b8dac2d735be5660d11ed9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Feb 2021 10:30:24 +0100 Subject: [PATCH 65/87] rebuild for libpq ABI fix Related: rhbz#1908268 --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index be3e5fa..1b1794d 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 17%{?dist} +Release: 18%{?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 +* Mon Feb 08 2021 Pavel Raiskup - 2.2.11-18 +- rebuild for libpq ABI fix rhbz#1908268 + * Wed Jan 27 2021 Fedora Release Engineering - 2.2.11-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f8883920d4a009a7d6820bf375c0450a971e2edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:17 +0100 Subject: [PATCH 66/87] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- sphinx.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 1b1794d..b733e8b 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -282,6 +282,10 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.11-19 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Feb 08 2021 Pavel Raiskup - 2.2.11-18 - rebuild for libpq ABI fix rhbz#1908268 From e4c4d4cf975d07fe863ef8aaba02967c3a624e1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:05:10 +0000 Subject: [PATCH 67/87] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 b733e8b..4a6751a 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -13,7 +13,7 @@ Name: sphinx Version: 2.2.11 -Release: 19%{?dist} +Release: 20%{?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 +* Fri Jul 23 2021 Fedora Release Engineering - 2.2.11-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.11-19 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 2c8ea9d8f7e4035ad550727bfc634836191f06f0 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Braojos Date: Fri, 5 Nov 2021 11:27:18 +0100 Subject: [PATCH 68/87] - 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 69/87] 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 70/87] - 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 0ee292b172916e4c10f81f18e31a6e2387b98948 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 17:24:57 -0800 Subject: [PATCH 71/87] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index f02a6a3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sphinx -# $Id$ -NAME := sphinx -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 66ea1146467fc3410f6baed9c4e41191122ffca5 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:17:34 +0100 Subject: [PATCH 72/87] 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 73/87] 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 74/87] 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 75/87] 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 76/87] 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 77/87] 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 78/87] 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 79/87] 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 80/87] 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 81/87] 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 82/87] 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 83/87] 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 84/87] 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 85/87] 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 86/87] 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 87/87] 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