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 openpkg-web openpkg$ Date: 02-Jul-2003 09:31:14
Branch: HEAD Handle: 2003070208311201
Modified files:
openpkg-re/vcheck vc.gcc
openpkg-src/gcc gcc.spec
openpkg-web news.txt
Log:
add optional support for IBM Stack-Smashing-Protection patch
Summary:
Revision Changes Path
1.17 +5 -0 openpkg-re/vcheck/vc.gcc
1.58 +9 -1 openpkg-src/gcc/gcc.spec
1.5141 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.gcc
============================================================================
$ cvs diff -u -r1.16 -r1.17 vc.gcc
--- openpkg-re/vcheck/vc.gcc 25 Jun 2003 07:59:33 -0000 1.16
+++ openpkg-re/vcheck/vc.gcc 2 Jul 2003 07:31:12 -0000 1.17
@@ -13,4 +13,9 @@
url = http://web.inter.nl.net/hcc/Haj.Ten.Brugge/
regex = bounds-checking-gcc-(__VER__).patch.bz2
}
+prog gcc:spp = {
+ version = 3.3-1
+ url = http://www.trl.ibm.com/projects/security/ssp/
+ regex = protector-(__VER__).tar.gz
+}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 gcc.spec
--- openpkg-src/gcc/gcc.spec 1 Jul 2003 15:04:50 -0000 1.57
+++ openpkg-src/gcc/gcc.spec 2 Jul 2003 07:31:13 -0000 1.58
@@ -27,6 +27,7 @@
%define V_full 3.3
%define V_comp %nil
%define V_bounds 1.01
+%define V_spp 1
# package information
Name: gcc
@@ -38,7 +39,7 @@
Group: Language
License: GPL
Version: %{V_full}
-Release: 20030701
+Release: 20030702
# package options
%option with_cxx yes
@@ -46,12 +47,14 @@
%option with_binutils yes
%option with_threads yes
%option with_bounds no
+%option with_spp no
%option with_gcc no
# 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
# build information
Prefix: %{l_prefix}
@@ -77,6 +80,11 @@
%patch0 -p0
%if "%{with_bounds}" == "yes"
%patch1 -p1
+%endif
+%if "%{with_spp}" == "yes"
+ ( cd gcc
+ %{l_gzip} -d -c %{SOURCE protector-%{version}-%{V_spp}.tar.gz} | %{l_tar} xf -
+ %{l_patch} -p1 <protector.dif )
%endif
%{l_shtool} subst -v -s \
-e "s;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5140 -r1.5141 news.txt
--- openpkg-web/news.txt 1 Jul 2003 19:30:29 -0000 1.5140
+++ openpkg-web/news.txt 2 Jul 2003 07:31:12 -0000 1.5141
@@ -1,3 +1,4 @@
+02-Jul-2003: Upgraded package: P<gcc-3.3-20030702>
01-Jul-2003: Upgraded package: P<blender-2.27-20030701>
01-Jul-2003: Upgraded package: P<aica-0.81-20030701>
01-Jul-2003: Upgraded package: P<jabberd-1.4.2-20030701>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
