Accepting request 741492 from home:StefanBruens:branches:Base:System

Untangle Rings:0 build loop to some degree

- Replace find invocation in self test by recursive bash glob,
  drop findutils BuildRequires.

OBS-URL: https://build.opensuse.org/request/show/741492
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=197

file.changes

@@ -4,6 +4,12 @@ Tue Oct 22 13:24:26 UTC 2019 - Dr. Werner Fink <werner@suse.de>
 - Add temporary patch CVE-2019-18218-46a8443f.patch from upstream
   to fix bsc#1154661 -- heap-based buffer overflow in cdf_read_property_info in cdf.c
 
+-------------------------------------------------------------------
+Mon Oct 21 11:44:02 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Replace find invocation in self test by recursive bash glob,
+  drop findutils BuildRequires.
+
 -------------------------------------------------------------------
 Mon Oct 14 13:40:13 UTC 2019 - Dr. Werner Fink <werner@suse.de>
 

file.spec

@@ -20,7 +20,7 @@
 %define libname libmagic%{somajor}
 
 Name:           file
-BuildRequires:  findutils
+BuildRequires:  bash >= 4.0
 BuildRequires:  libtool
 BuildRequires:  zlib-devel
 Url:            http://www.darwinsys.com/file/
@@ -81,9 +81,7 @@ Summary:        Database for libmagic to help identify files
 Group:          Productivity/File utilities
 Obsoletes:      libmagic-data < %{version}
 Provides:       libmagic-data = %{version}
-%if 0%{?suse_version} >= 1200
 BuildArch:      noarch
-%endif
 
 %description magic
 This package contains the basic magic files that libmagic reads and uses
@@ -162,11 +160,16 @@ echo '#     global magic file is %{_miscdir}/magic(.mgc)'	>> %{buildroot}%{_sysc
 %if %{with decore}
 install -s dcore %{buildroot}%{_bindir}
 %endif
+
 # Check out that the binary does not bail out:
 LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 export LD_LIBRARY_PATH
-find %{buildroot}%{_bindir}/file %{_bindir}/ /%{_lib}/ %{_libdir}/ | \
+%{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic %{buildroot}%{_bindir}/file
+shopt -s globstar
+for dir in %{_bindir} /%{_lib} %{_libdir} ; do
+	echo $dir/** | \
 	xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic
+done
 unset LD_LIBRARY_PATH
 rm -f %{buildroot}%{_libdir}/*.la