Hello community, here is the log from the commit of package sphinx for openSUSE:Factory checked in at 2020-07-27 17:47:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sphinx (Old) and /work/SRC/openSUSE:Factory/.sphinx.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sphinx" Mon Jul 27 17:47:55 2020 rev:5 rq:822940 version:2.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/sphinx/sphinx.changes 2019-03-24 15:01:24.735168440 +0100 +++ /work/SRC/openSUSE:Factory/.sphinx.new.3592/sphinx.changes 2020-07-27 17:49:26.335524991 +0200 @@ -1,0 +2,11 @@ +Sun Jul 26 14:31:08 UTC 2020 - Bruno Friedmann <[email protected]> + +- Spec cleaner minimal update date +- Minor cosmetic changes +- Close boo#1157590 + + Remove posttrans section with chown + On systems with fs.protected_hardlinks=0 this allows sphinx + to escalate to root. + + Add log directory and files to files section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sphinx.spec ++++++ --- /var/tmp/diff_new_pack.zr6sSo/_old 2020-07-27 17:49:30.699529799 +0200 +++ /var/tmp/diff_new_pack.zr6sSo/_new 2020-07-27 17:49:30.703529803 +0200 @@ -1,7 +1,7 @@ # # spec file for package sphinx # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,9 +54,9 @@ BuildRequires: pkgconfig(libpgtypes) >= 9.6 BuildRequires: pkgconfig(libpq) >= 9.6 Requires: logrotate -Provides: %{daemon} Requires(pre): %{_bindir}/getent -Requires(pre): /usr/sbin/useradd +Requires(pre): %{_sbindir}/useradd +Provides: %{daemon} %if 0%{?suse_version} Requires(post): %fillup_prereq #Requires(pre): permissions >= 2014.11 @@ -142,6 +142,8 @@ # Create /var/log/sphinx mkdir -p %{buildroot}%{_localstatedir}/log/%{name} +touch %{buildroot}%{_localstatedir}/log/%{name}/query.log +touch %{buildroot}%{_localstatedir}/log/%{name}/%{daemon}.log # Create /var/run/sphinx mkdir -p %{buildroot}/run/%{name} @@ -154,13 +156,9 @@ for CONF in %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.dist\ %{buildroot}%{_sysconfdir}/%{name}/%{name}-min.conf.dist; do - sed -i 's|%{_localstatedir}/log/%{daemon}.log|%{_localstatedir}/log/%{name}/%{daemon}.log|g' ${CONF} - sed -i 's|%{_localstatedir}/log/query.log|%{_localstatedir}/log/%{name}/query.log|g' ${CONF} - sed -i 's|%{_localstatedir}/log/%{daemon}.pid|/run/%{name}/%{daemon}.pid|g' ${CONF} - sed -i 's|%{_localstatedir}/data|%{_localstatedir}/lib/%{name}/data|g' ${CONF} done @@ -222,16 +220,6 @@ /sbin/chkconfig --add %{daemon} %endif %endif -# Create empty log files with correct rights if not exist -for LOG in %{_localstatedir}/log/%{name}/%{daemon}.log\ - %{_localstatedir}/log/%{name}/query.log; -do - if [ ! -f ${LOG} ];then - touch ${LOG} - chmod 0640 ${LOG} - chown %{sphinx_user}:root ${LOG} - fi -done %preun %if 0%{?has_systemd} @@ -262,10 +250,6 @@ %endif %endif -%posttrans -# chown -R %%{sphinx_user}:root %%{_localstatedir}/log/sphinx/ -chown -R %{sphinx_user}:%{sphinx_group} %{_localstatedir}/lib/%{name}/ - %post -n libsphinxclient-%{soname} -p /sbin/ldconfig %postun -n libsphinxclient-%{soname} -p /sbin/ldconfig @@ -308,6 +292,9 @@ %dir %attr(0755, %{sphinx_user}, %{sphinx_group}) %{_localstatedir}/lib/%{name} %dir %attr(0755, %{sphinx_user}, %{sphinx_group}) %{_localstatedir}/lib/%{name}/data %dir %attr(0755, %{sphinx_user}, %{sphinx_group}) %{_localstatedir}/lib/%{name}/data/index +%dir %attr(0750, root, root) %{_localstatedir}/log/%{name} +%attr(0640, %{sphinx_user}, root) %{_localstatedir}/log/%{name}/%{daemon}.log +%attr(0640, %{sphinx_user}, root) %{_localstatedir}/log/%{name}/query.log %files -n libsphinxclient-%{soname} %license COPYING
