Browse Source

giftnuss:


			
			
				rocklinux
			
			
		
Sebastian Knapp 19 years ago
parent
commit
bb51d5f273
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      package/base/gcc/apply-protector.sh
  2. +1
    -1
      package/base/gcc/gcc.desc

+ 4
- 2
package/base/gcc/apply-protector.sh

@ -3,7 +3,9 @@ pfile=$( echo "$3" | grep protector | tr ' ' '\t' | tr -s '\t' | cut -f2 )
if [ "$pfile" ]
then
tar --use-compress-program=bzip2 -xf $archdir/${pfile/.gz/.bz2}
tar='tar --use-compress-program=bzip2'
pdif=$($tar -tf $archdir/${pfile/.gz/.bz2} | grep '\.dif$')
$tar -xf $archdir/${pfile/.gz/.bz2}
# Patch protector.dif a bit to apply against current gcc-3
if test -f $1/package/base/gcc/$2/protector-hotfix.diff; then
@ -14,7 +16,7 @@ then
# Set -fstack-protector as default?
# [ $ROCKCFG_PKG_GCC[23]_STACKPRO = 1 ] && patch -p0 < protectonly.dif
patch -p0 < protector.dif
patch -p0 < $pdif
if [ $2 != gcc34 ]; then
mv protector.{c,h} gcc/
fi

+ 1
- 1
package/base/gcc/gcc.desc

@ -67,7 +67,7 @@
#if xpkg == gcc34.*
[V] 3.4.4
[D] 1929991607 gcc-3.4.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.4/
#[D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/
[D] 365541092 protector-3.4.4-1.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4_4/
#endif
#if xpkg == gcc40

Loading…
Cancel
Save