diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 07e8a82..d3fd47b 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 110 -Release: 2%{?dist} +Version: 111 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog +* Fri May 01 2020 David Woodhouse - 111-1 +- Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233) + * Wed Jan 29 2020 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/mingw-find-provides.sh b/mingw-find-provides.sh index 30c6150..1bcb2da 100755 --- a/mingw-find-provides.sh +++ b/mingw-find-provides.sh @@ -11,10 +11,10 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') +dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep '\.dll$') for f in $dlls; do - basename=`basename $f | tr [:upper:] [:lower:]` + basename=`basename $f | tr '[:upper:]' '[:lower:]'` for target in $targets; do host_triplet=`rpm --eval "%{${target}_target}"` [[ $f =~ .*$host_triplet.* ]] && echo "$target($basename)" diff --git a/mingw-find-requires.sh b/mingw-find-requires.sh index 84686c1..d824272 100755 --- a/mingw-find-requires.sh +++ b/mingw-find-requires.sh @@ -15,8 +15,8 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') -pkgconfig_files=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(pc)$') +dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(dll|exe)$') +pkgconfig_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pc)$') for target in $targets; do dll_found=false @@ -24,7 +24,7 @@ for target in $targets; do for f in $dlls; do if [[ $f =~ .*$host_triplet.* ]]; then $OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' | - tr [:upper:] [:lower:] | + tr '[:upper:]' '[:lower:]' | sed "s/\(.*\)/$target(\1)/" dll_found=true fi