From 1e512f0e8e185fa22a0e60f172c0a51c00be2242 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 15 Dec 2005 10:43:05 +0000 Subject: [PATCH] Stefan Fiedler: gcc/apply-protector.sh: apply only one .dif (gcc-3.4.4.dif or protector.dif) from the stack protector archive. This fixes an ambigious redirect with gcc2, gcc32 and gcc33. Index: package/base/gcc/apply-protector.sh =================================================================== [2005111513085118277] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6715 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc/apply-protector.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/base/gcc/apply-protector.sh b/package/base/gcc/apply-protector.sh index 80d8eaccc..9dea51738 100644 --- a/package/base/gcc/apply-protector.sh +++ b/package/base/gcc/apply-protector.sh @@ -4,7 +4,8 @@ pfile=$( echo "$3" | grep protector | tr ' ' '\t' | tr -s '\t' | cut -f2 ) if [ "$pfile" ] then tar='tar --use-compress-program=bzip2' - pdif=$($tar -tf $archdir/${pfile/.gz/.bz2} | grep '\.dif$') + pdif=$($tar -tf $archdir/${pfile/.gz/.bz2} | \ + grep '\.dif$' | grep -v 'protectonly.dif') $tar -xf $archdir/${pfile/.gz/.bz2} # Patch protector.dif a bit to apply against current gcc-3