Browse Source

upgrading package: gcc 3.3 -> 3.3.1

master
parent
commit
9bdcb61169
  1. 22
      gcc/gcc.patch
  2. 16
      gcc/gcc.spec

22
gcc/gcc.patch

@ -18,25 +18,3 @@
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1
--- gcc/configure.dist 2003-06-11 11:23:53.000000000 +0200
+++ gcc/configure 2003-06-11 11:23:53.000000000 +0200
@@ -8259,7 +8259,7 @@
&& $gcc_cv_ld -shared -o conftest1.so conftest1.o \
conftest2.o conftest3.o; then
gcc_cv_ld_ro_rw_mix=`$gcc_cv_objdump -h conftest1.so \
- | grep -A1 myfoosect`
+ | sed -ne '/myfoosect/{N;p;}'`
if echo "$gcc_cv_ld_ro_rw_mix" | grep CONTENTS > /dev/null; then
if echo "$gcc_cv_ld_ro_rw_mix" | grep READONLY > /dev/null; then
gcc_cv_ld_ro_rw_mix=read-only
--- gcc/configure.in.dist 2003-06-11 11:23:53.000000000 +0200
+++ gcc/configure.in 2003-06-11 11:23:53.000000000 +0200
@@ -2319,7 +2319,7 @@
&& $gcc_cv_ld -shared -o conftest1.so conftest1.o \
conftest2.o conftest3.o; then
gcc_cv_ld_ro_rw_mix=`$gcc_cv_objdump -h conftest1.so \
- | grep -A1 myfoosect`
+ | sed -ne '/myfoosect/{N;p;}'`
if echo "$gcc_cv_ld_ro_rw_mix" | grep CONTENTS > /dev/null; then
if echo "$gcc_cv_ld_ro_rw_mix" | grep READONLY > /dev/null; then
gcc_cv_ld_ro_rw_mix=read-only

16
gcc/gcc.spec

@ -23,11 +23,13 @@
## SUCH DAMAGE.
##
# FIXME: rse: bounds checking patch requires never version
# package version
%define V_full 3.3
%define V_full 3.3.1
%define V_comp %nil
%define V_bounds 1.01
%define V_spp 3
%define V_bounds 3.3-1.01
%define V_spp 3.3-3
# package information
Name: gcc
@ -39,7 +41,7 @@ Distribution: OpenPKG [CORE]
Group: Compiler
License: GPL
Version: %{V_full}
Release: 20030731
Release: 20030808
# package options
%option with_cxx yes
@ -58,8 +60,8 @@ RPM ERROR: options with_bounds and with_ssp conflict
# list of sources
Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
Patch0: gcc.patch
Patch1: http://web.inter.nl.net/hcc/Haj.Ten.Brugge/bounds-checking-gcc-%{version}-%{V_bounds}.patch.bz2
Patch2: http://www.trl.ibm.com/projects/security/ssp/gcc3_3/protector-%{version}-%{V_spp}.tar.gz
Patch1: http://web.inter.nl.net/hcc/Haj.Ten.Brugge/bounds-checking-gcc-%{V_bounds}.patch.bz2
Patch2: http://www.trl.ibm.com/projects/security/ssp/gcc3_3/protector-%{V_spp}.tar.gz
# build information
Prefix: %{l_prefix}
@ -88,7 +90,7 @@ Provides: gcc = %{version}-%{release}
%endif
%if "%{with_spp}" == "yes"
( cd gcc
%{l_gzip} -d -c %{PATCH protector-%{version}-%{V_spp}.tar.gz} | %{l_tar} xf -
%{l_gzip} -d -c %{PATCH protector-%{V_spp}.tar.gz} | %{l_tar} xf -
%{l_patch} -p1 <protector.dif ) || exit $?
%endif
%{l_shtool} subst -v -s \

Loading…
Cancel
Save