pool/man
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 745706 from Base:System

Browse Source 
- Avoid racy bash code on waiting on find in do_mandb (boo#1155879) 

- Use %{_prefix}/lib for tmpfiles.d directory to avoid to get this
  nonexecutable location below new location of %{_libexecdir}

OBS-URL: https://build.opensuse.org/request/show/745706
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2019-11-11 11:57:13 +00:00 committed by Git OBS Bridge
commit a84e985cf2
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cron.daily.do_mandb
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# #
# do_mandb. This script was split off cron.daily. # do_mandb. This script was split off cron.daily.
@ -10,7 +10,7 @@
# #
# please send bugfixes or comments to feedback@suse.de. # please send bugfixes or comments to feedback@suse.de.
# #
# Author: Werner Fink <feedback@suse.de>, 2008 # Author: Werner Fink <feedback@suse.de>, 2008, 2019
# Burchard Steinbild <feedback@suse.de>, 1996 # Burchard Steinbild <feedback@suse.de>, 1996
# Florian La Roche <feedback@suse.de>, 1996 # Florian La Roche <feedback@suse.de>, 1996
# #
@ -49,8 +49,8 @@ if test "$REINIT_MANDB" = yes ; then
test -d "${cp}" || continue test -d "${cp}" || continue
db=${cp}/index.db db=${cp}/index.db
if test -e ${db} ; then if test -e ${db} ; then
find $mp -follow -newer $db | read -t 1 line path="$(find $mp -follow -newer $db 2>/dev/null)"
test $? -eq 0 || continue test -n "$path" || continue
fi fi
nice -n 5 ionice -c 3 mandb -qs ${mp} > /dev/null 2>&1 || let errors++ nice -n 5 ionice -c 3 mandb -qs ${mp} > /dev/null 2>&1 || let errors++
done done

11
man.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Nov 6 08:48:22 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Avoid racy bash code on waiting on find in do_mandb (boo#1155879)
-------------------------------------------------------------------
Sun Nov 3 11:37:28 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Use %{_prefix}/lib for tmpfiles.d directory to avoud to get this
nonexecutable location below new location of %{_libexecdir}
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 11 12:49:35 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> Tue Jun 11 12:49:35 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

10
man.spec
View File

@ -37,10 +37,10 @@ BuildRequires: libzio-devel
BuildRequires: man-pages BuildRequires: man-pages
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: po4a BuildRequires: po4a
BuildRequires: pkgconfig(systemd)
BuildRequires: update-alternatives BuildRequires: update-alternatives
BuildRequires: xz-devel BuildRequires: xz-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(systemd)
Version: 2.8.4 Version: 2.8.4
Release: 0 Release: 0
Summary: A Program for Displaying man Pages Summary: A Program for Displaying man Pages
@ -87,7 +87,7 @@ Patch11: man-MAN_POSIXLY_CORRECT-man1.dif
Patch12: reproducible.patch Patch12: reproducible.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global _has_tmpfiled %(rpm -q -f /usr/lib/tmpfiles.d | grep -c filesystem) %global _has_tmpfiled %(rpm -q -f %{_prefix}/lib/tmpfiles.d | grep -c filesystem)
%description %description
A program for displaying man pages on the screen or sending them to a A program for displaying man pages on the screen or sending them to a
@ -326,7 +326,7 @@ fi
%endif %endif
%posttrans %posttrans
%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf} %{?tmpfiles_create:%tmpfiles_create %{_prefix}/lib/tmpfiles.d/man-db.conf}
if test -d %{_localstatedir}/cache/man if test -d %{_localstatedir}/cache/man
then then
mandb --quiet --create || : mandb --quiet --create || :
@ -368,9 +368,9 @@ fi
%{_libdir}/libman*.so %{_libdir}/libman*.so
%{_libexecdir}/man-db/zsoelim %{_libexecdir}/man-db/zsoelim
%if 0%{?_has_tmpfiled} == 0 %if 0%{?_has_tmpfiled} == 0
%dir %{_libexecdir}/tmpfiles.d %dir %{_prefix}/lib/tmpfiles.d
%endif %endif
%{_libexecdir}/tmpfiles.d/man-db.conf %{_prefix}/lib/tmpfiles.d/man-db.conf
%if %{with sdtimer} %if %{with sdtimer}
%{_unitdir}/man-db-create.service %{_unitdir}/man-db-create.service
%if 0%{suse_version} >= 1500 %if 0%{suse_version} >= 1500