OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jun-2004 13:02:57
Branch: HEAD Handle: 2004060812025600
Modified files:
openpkg-src/gcc33 gcc33.patch gcc33.spec
Log:
upgrade to gcc 3.3.4 and remove bounds checking patch (not available
for this version and makes trouble all the time anyway)
Summary:
Revision Changes Path
1.6 +2 -2 openpkg-src/gcc33/gcc33.patch
1.46 +4 -20 openpkg-src/gcc33/gcc33.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc33/gcc33.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 gcc33.patch
--- openpkg-src/gcc33/gcc33.patch 21 Apr 2004 07:56:23 -0000 1.5
+++ openpkg-src/gcc33/gcc33.patch 8 Jun 2004 11:02:56 -0000 1.6
@@ -14,8 +14,8 @@
please modify this string to indicate that, e.g. by putting your
organization's name in parentheses at the end of the string. */
--const char version_string[] = "3.3.3";
-+const char version_string[] = "3.3.3 (@l_openpkg_release@)";
+-const char version_string[] = "3.3.4";
++const char version_string[] = "3.3.4 (@l_openpkg_release@)";
/* This is the location of the online document giving instructions for
reporting bugs. If you distribute a modified version of GCC,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc33/gcc33.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 gcc33.spec
--- openpkg-src/gcc33/gcc33.spec 11 May 2004 07:02:51 -0000 1.45
+++ openpkg-src/gcc33/gcc33.spec 8 Jun 2004 11:02:56 -0000 1.46
@@ -24,10 +24,9 @@
##
# package version
-%define V_full 3.3.3
+%define V_full 3.3.4
%define V_comp 33
-%define V_bounds 3.3.3-1.00
-%define V_ssp 3.3-7
+%define V_ssp 3.3.2-2
# package information
Name: gcc33
@@ -40,7 +39,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20040511
+Release: 20040608
# package options
%option with_cxx yes
@@ -50,20 +49,13 @@
%option with_optimize yes
%option with_binutils yes
%option with_threads yes
-%option with_bounds no
%option with_ssp no
%option with_gcc no
-# options sanity check
-%if "%{with_bounds}" == "yes" && "%{with_ssp}" == "yes"
- %{error:build-time options 'with_bounds' and 'with_ssp' conflict}
-%endif
-
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
Patch0: gcc33.patch
-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_ssp}.tar.gz
+Patch1:
http://www.trl.ibm.com/projects/security/ssp/gcc3_3_2/protector-%{V_ssp}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -92,11 +84,6 @@
url = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
regex = gcc-(__VER__)\.tar\.bz2
}
- prog gcc33:bounds = {
- version = %{V_bounds}
- url = http://web.inter.nl.net/hcc/Haj.Ten.Brugge/
- regex = bounds-checking-gcc-(3\.3\.\d+-__VER__).patch.bz2
- }
prog gcc33:spp = {
version = %{V_ssp}
url = http://www.trl.ibm.com/projects/security/ssp/
@@ -106,9 +93,6 @@
%prep
%setup -q -n gcc-%{version}
%patch -p0
-%if "%{with_bounds}" == "yes"
- %patch -p1 -P 1
-%endif
%if "%{with_ssp}" == "yes"
( cd gcc
%{l_gzip} -d -c %{PATCH protector-%{V_ssp}.tar.gz} | %{l_tar} xf -
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
