rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Quote sequences to tr to avoid the shell handling them (#1830233)

Browse Source
This commit is contained in:
David Woodhouse 2020-05-01 09:55:55 +01:00
parent 3ca816d704
commit 64521a8bdb
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mingw-filesystem.spec
View File

@ -6,8 +6,8 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem Name: mingw-filesystem
Version: 110 Version: 111
Release: 2%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
License: GPLv2+ License: GPLv2+
@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 111-1
- Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

4
mingw-find-provides.sh
View File

@ -11,10 +11,10 @@ fi
filelist=`sed "s/['\"]/\\\&/g"` 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 for f in $dlls; do
basename=`basename $f | tr [:upper:] [:lower:]` basename=`basename $f | tr '[:upper:]' '[:lower:]'`
for target in $targets; do for target in $targets; do
host_triplet=`rpm --eval "%{${target}_target}"` host_triplet=`rpm --eval "%{${target}_target}"`
[[ $f =~ .*$host_triplet.* ]] && echo "$target($basename)" [[ $f =~ .*$host_triplet.* ]] && echo "$target($basename)"

6
mingw-find-requires.sh
View File

@ -15,8 +15,8 @@ fi
filelist=`sed "s/['\"]/\\\&/g"` filelist=`sed "s/['\"]/\\\&/g"`
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') dlls=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(dll|exe)$')
pkgconfig_files=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(pc)$') pkgconfig_files=$(echo $filelist | tr '[:blank:]' '\n' | grep -Ei '\.(pc)$')
for target in $targets; do for target in $targets; do
dll_found=false dll_found=false
@ -24,7 +24,7 @@ for target in $targets; do
for f in $dlls; do for f in $dlls; do
if [[ $f =~ .*$host_triplet.* ]]; then if [[ $f =~ .*$host_triplet.* ]]; then
$OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' | $OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' |
tr [:upper:] [:lower:] | tr '[:upper:]' '[:lower:]' |
sed "s/\(.*\)/$target(\1)/" sed "s/\(.*\)/$target(\1)/"
dll_found=true dll_found=true
fi fi