From 5bdc16771c07e45c54e02a611a050b5e76df8d8063e09d9834fcdb4b383302ad Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 3 Nov 2019 11:39:31 +0000 Subject: [PATCH 1/2] _libexecdir OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=105 --- man.changes | 6 ++++++ man.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/man.changes b/man.changes index 10f8ee0..57ef926 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 3 11:37:28 UTC 2019 - Dr. Werner Fink + +- 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 diff --git a/man.spec b/man.spec index e681d2d..cbc075b 100644 --- a/man.spec +++ b/man.spec @@ -37,10 +37,10 @@ BuildRequires: libzio-devel BuildRequires: man-pages BuildRequires: pkg-config BuildRequires: po4a -BuildRequires: pkgconfig(systemd) BuildRequires: update-alternatives BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(systemd) Version: 2.8.4 Release: 0 Summary: A Program for Displaying man Pages @@ -87,7 +87,7 @@ Patch11: man-MAN_POSIXLY_CORRECT-man1.dif Patch12: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %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 A program for displaying man pages on the screen or sending them to a @@ -326,7 +326,7 @@ fi %endif %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 then mandb --quiet --create || : @@ -368,9 +368,9 @@ fi %{_libdir}/libman*.so %{_libexecdir}/man-db/zsoelim %if 0%{?_has_tmpfiled} == 0 -%dir %{_libexecdir}/tmpfiles.d +%dir %{_prefix}/lib/tmpfiles.d %endif -%{_libexecdir}/tmpfiles.d/man-db.conf +%{_prefix}/lib/tmpfiles.d/man-db.conf %if %{with sdtimer} %{_unitdir}/man-db-create.service %if 0%{suse_version} >= 1500 From fcf3a57ccb510a40a2346ee6f38c2fd6a566deae93d24a5d058ce1ae65062b6b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 6 Nov 2019 08:51:24 +0000 Subject: [PATCH 2/2] boo#1155879 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=106 --- cron.daily.do_mandb | 8 ++++---- man.changes | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cron.daily.do_mandb b/cron.daily.do_mandb index 5422a5b..74fa679 100644 --- a/cron.daily.do_mandb +++ b/cron.daily.do_mandb @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # # do_mandb. This script was split off cron.daily. @@ -10,7 +10,7 @@ # # please send bugfixes or comments to feedback@suse.de. # -# Author: Werner Fink , 2008 +# Author: Werner Fink , 2008, 2019 # Burchard Steinbild , 1996 # Florian La Roche , 1996 # @@ -49,8 +49,8 @@ if test "$REINIT_MANDB" = yes ; then test -d "${cp}" || continue db=${cp}/index.db if test -e ${db} ; then - find $mp -follow -newer $db | read -t 1 line - test $? -eq 0 || continue + path="$(find $mp -follow -newer $db 2>/dev/null)" + test -n "$path" || continue fi nice -n 5 ionice -c 3 mandb -qs ${mp} > /dev/null 2>&1 || let errors++ done diff --git a/man.changes b/man.changes index 57ef926..34f9b8f 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 6 08:48:22 UTC 2019 - Dr. Werner Fink + +- Avoid racy bash code on waiting on find in do_mandb (boo#1155879) + ------------------------------------------------------------------- Sun Nov 3 11:37:28 UTC 2019 - Dr. Werner Fink