summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mason <ms13sp@gmail.com>2009-08-05 15:12:15 +0000
committerMichael Mason <ms13sp@gmail.com>2009-08-05 15:12:15 +0000
commitb246cedc29b2ea4ba7e0fa83fa35c5f90459669e (patch)
tree34b855bd78db848529daddf50029dad0f65bf273
parent4735e4a534393751ec8ab0a508f12e793aebff6a (diff)
parentaf3ef82a15ac611eeea4beec92050f80839f4e5e (diff)
downloadaports-b246cedc29b2ea4ba7e0fa83fa35c5f90459669e.tar.bz2
aports-b246cedc29b2ea4ba7e0fa83fa35c5f90459669e.tar.xz
Merge branch 'master' of git://git.alpinelinux.org/aports
-rw-r--r--main/apk-tools/APKBUILD21
-rw-r--r--main/dahdi-linux-grsec/APKBUILD9
-rw-r--r--main/gcc/00_all_gcc-4.0-cvs-incompat.patch11
-rw-r--r--main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch10
-rw-r--r--main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch91
-rw-r--r--main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch384
-rw-r--r--main/gcc/03_all_gcc-4.3.2-hardened-default.patch53
-rw-r--r--main/gcc/APKBUILD99
-rw-r--r--main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch11
-rw-r--r--main/gcc/gcc-spec-env.patch41
-rw-r--r--main/gcc/uclibc-getipinfo.patch (renamed from testing/gcc/uclibc-getipinfo.patch)0
-rw-r--r--main/ipsec-tools/APKBUILD8
-rw-r--r--main/ipsec-tools/racoon.confd1
-rw-r--r--main/ipsec-tools/racoon.initd2
-rw-r--r--main/iscsitarget-grsec/APKBUILD11
-rw-r--r--main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.30.patch37
-rw-r--r--main/xtables-addons-grsec/APKBUILD7
-rw-r--r--testing/gcc/APKBUILD125
-rw-r--r--testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch84
-rw-r--r--testing/gcc/pt_gnu_eh_frame.patch12
20 files changed, 125 insertions, 892 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 7db8f8a3..2f0b37e3 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,13 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.0_pre17
-pkgrel=2
+pkgver=2.0_rc1
+pkgrel=0
pkgdesc="Alpine Package Keeper - package manager for alpine"
+subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-db-fix-checksum-storing-to-db.patch
- 0001-io-fix-corruption-of-big-files-on-mmap-write.patch
"
@@ -17,11 +16,9 @@ license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i -e 's:-Werror::' Make.rules
- patch -p1 -i ../0001-db-fix-checksum-storing-to-db.patch || return 1
- patch -p1 -i ../0001-io-fix-corruption-of-big-files-on-mmap-write.patch\
- || return 1
make || return 1
+ make static || return 1
make DESTDIR="$pkgdir" install
cd "$pkgdir/sbin"
ln -s apk apk_add
@@ -32,6 +29,10 @@ build() {
ln -s apk apk_version
}
-md5sums="4d31c9ae51b357a8514e99a8750af0b6 apk-tools-2.0_pre17.tar.bz2
-d7944308cefe6f5fc45a24e1840d087e 0001-db-fix-checksum-storing-to-db.patch
-57693255bb36abe74423578b83ff2cf4 0001-io-fix-corruption-of-big-files-on-mmap-write.patch"
+static() {
+ pkgdesc="Alpine Package Keeper - static binary"
+ install -Dm755 "$srcdir"/$pkgname-$pkgver/src/apk.static \
+ "$subpkgdir"/sbin/apk.static
+}
+
+md5sums="f790182792a41841e6932ae0b6737a43 apk-tools-2.0_rc1.tar.bz2"
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index 7db4ebc4..f021401a 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -8,18 +8,21 @@ if [ -f ../linux-${_flavor}/APKBUILD ]; then
. ../linux-${_flavor}/APKBUILD
fi
-_abi_release=${pkgver:-2.6.29.5}-${_flavor}
+_kernelver="$pkgver-r$pkgrel"
+_abi_release=${pkgver}-${_flavor}
_realname=dahdi-linux
pkgname=${_realname}-${_flavor}
pkgver=2.2.0
-pkgrel=3
+pkgrel=4
pkgdesc="Digium Asterisk Hardware Device Interface drivers"
url="http://www.asterisk.org"
license="GPL"
-depends="dahdi-linux"
+#depends="dahdi-linux linux-${_flavor}=${_kernelver}"
+depends="dahdi-linux linux-${_flavor}"
# we need wget and tar because make install downloads firmware and uses fancy
# options for tar and wget.
+#makedepends="linux-${_flavor}-dev=${_kernelver} wget tar perl"
makedepends="linux-${_flavor}-dev wget tar perl"
install=
subpackages=
diff --git a/main/gcc/00_all_gcc-4.0-cvs-incompat.patch b/main/gcc/00_all_gcc-4.0-cvs-incompat.patch
deleted file mode 100644
index e5bc302e..00000000
--- a/main/gcc/00_all_gcc-4.0-cvs-incompat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.old/gcc/gcc.c.mps Sun Nov 14 21:10:35 2004
-+++ gcc-4.0/gcc/gcc.c Sun Nov 14 21:43:17 2004
-@@ -794,6 +794,8 @@
- /* NB: This is shared amongst all front-ends. */
- static const char *cc1_options =
- "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
-+ %{shared:%{static|pie|fPIE|fpie|fno-PIC|fno-pic:%e-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible}}\
-+ %{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible}}\
- %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
- %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi}\
diff --git a/main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch b/main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
deleted file mode 100644
index 88715061..00000000
--- a/main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc-4.0.2/gcc/gcc.c.nondef~ 2006-01-09 00:09:50 +0100
-+++ gcc-4.0.2/gcc/gcc.c 2006-01-09 00:15:31 +0100
-@@ -764,6 +764,6 @@
-
- static const char *asm_debug;
- static const char *cpp_spec = CPP_SPEC;
--static const char *cc1_spec = CC1_SPEC;
-+static const char *cc1_spec = CC1_SPEC CC1_HARDENED_SPEC;
- static const char *cc1plus_spec = CC1PLUS_SPEC;
- static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
diff --git a/main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch b/main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch
deleted file mode 100644
index 8bc9a705..00000000
--- a/main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Nru /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config.gcc /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config.gcc
---- gcc-4.3.1/gcc/config.gcc 2008-06-11 04:13:33.000000000 +0200
-+++ gcc-4.3.1/gcc/config.gcc 2008-06-11 04:41:39.000000000 +0200
-@@ -493,7 +493,7 @@
- ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
-- extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-+ extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtbeginTS.o crtend.o crtendS.o"
- extra_options="${extra_options} linux.opt"
- gas=yes
- gnu_ld=yes
-diff -Nru /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/Makefile.in /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/Makefile.in
---- gcc-4.3.1/gcc/Makefile.in 2008-06-11 04:13:37.000000000 +0200
-+++ gcc-4.3.1/gcc/Makefile.in 2008-06-11 04:42:27.000000000 +0200
-@@ -1665,36 +1665,43 @@
- # constructors.
- $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(GCC_FOR_TARGET) -fno-PIE $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
- -o $(T)crtbegin$(objext)
-
- $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(GCC_FOR_TARGET) -fno-PIE $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_END \
- -o $(T)crtend$(objext)
-
- # These are versions of crtbegin and crtend for shared libraries.
- $(T)crtbeginS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
-+ $(GCC_FOR_TARGET) -fno-PIE $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
- -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFS_O \
- -o $(T)crtbeginS$(objext)
-
- $(T)crtendS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
-+ $(GCC_FOR_TARGET) -fno-PIE $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
- -c $(srcdir)/crtstuff.c -DCRT_END -DCRTSTUFFS_O \
- -o $(T)crtendS$(objext)
-
- # This is a version of crtbegin for -static links.
- $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(GCC_FOR_TARGET) -fno-PIE $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
- -o $(T)crtbeginT$(objext)
-
-+# This is a version of crtbegin for -static -fPIE links.
-+$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-+ $(GCC_FOR_TARGET) -fno-PIE $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
-+ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
-+ -o $(T)crtbeginTS$(objext)
-+
- # Compile the start modules crt0.o and mcrt0.o that are linked with
- # every program
- $(T)crt0.o: s-crt0 ; @true
-diff -Nru /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/libgcc/config.host /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/libgcc/config.host
---- gcc-4.3.1/libgcc/config.host 2008-01-25 21:49:04.000000000 +0100
-+++ gcc-4.3.1/libgcc/config.host 2008-06-11 04:42:09.000000000 +0200
-@@ -164,7 +164,7 @@
- ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
-- extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-+ extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtbeginTS.o crtend.o crtendS.o"
- ;;
- *-*-gnu*)
- ;;
-diff -Nru /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/libgcc/Makefile.in /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/libgcc/Makefile.in
---- gcc-4.3.1/libgcc/Makefile.in 2008-06-11 04:13:37.000000000 +0200
-+++ gcc-4.3.1/libgcc/Makefile.in 2008-06-11 04:42:09.000000000 +0200
-@@ -783,6 +783,11 @@
- crtbeginT.o: $(gcc_srcdir)/crtstuff.c
- $(crt_compile) $(CRTSTUFF_T_CFLAGS) \
- -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
-+
-+# This is a version of crtbegin for -static -fPIE links.
-+crtbeginTS.o: $(gcc_srcdir)/crtstuff.c
-+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
-+ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
- endif
-
- # Build extra startfiles in the libgcc directory.
diff --git a/main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch b/main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
deleted file mode 100644
index 75b3654c..00000000
--- a/main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/alpha/elf.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/alpha/elf.h
---- gcc-4.3.1.orig/gcc/config/alpha/elf.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/alpha/elf.h 2008-06-10 05:50:16.000000000 +0200
-@@ -362,12 +362,12 @@
- #undef STARTFILE_SPEC
- #ifdef HAVE_LD_PIE
- #define STARTFILE_SPEC \
-- "%{!shared: %{pg|p:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ "%{!shared: %{pg|p:gcrt1.o%s} %{!pg:%{!p:%(crtfile_pie)}} }\
-+ crti.o%s %{shared:crtbeginS.o%s} %{!shared:%(startfile_pie_t)}"
- #else
- #define STARTFILE_SPEC \
- "%{!shared: %{pg|p:gcrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ crti.o%s %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
-
- /* Provide a ENDFILE_SPEC appropriate for ELF. Here we tack on the
-@@ -376,9 +376,15 @@
- `main', followed by a normal ELF "finalizer" file, `crtn.o'. */
-
- #undef ENDFILE_SPEC
-+#ifdef HAVE_LD_PIE
- #define ENDFILE_SPEC \
- "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-- %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+ %{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s"
-+#else
-+#define ENDFILE_SPEC \
-+ "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-+ %{shared:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#endif
-
- /* We support #pragma. */
- #define HANDLE_SYSV_PRAGMA 1
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/i386/linux64.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/i386/linux64.h
---- gcc-4.3.1.orig/gcc/config/i386/linux64.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/i386/linux64.h 2008-06-10 06:10:18.000000000 +0200
-@@ -76,12 +76,21 @@
-
- /* Similar to standard Linux, but adding -ffast-math support. */
- #undef ENDFILE_SPEC
-+#ifdef HAVE_LD_PIE
- #define ENDFILE_SPEC \
- "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
- %{mpc32:crtprec32.o%s} \
- %{mpc64:crtprec64.o%s} \
- %{mpc80:crtprec80.o%s} \
- %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#else
-+#define ENDFILE_SPEC \
-+ "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-+ %{mpc32:crtprec32.o%s} \
-+ %{mpc64:crtprec64.o%s} \
-+ %{mpc80:crtprec80.o%s} \
-+ %{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s"
-+#endif
-
- #if TARGET_64BIT_DEFAULT
- #define MULTILIB_DEFAULTS { "m64" }
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/i386/linux.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/i386/linux.h
---- gcc-4.3.1/gcc/config/i386/linux.h 2007-11-28 02:04:27.000000000 +0100
-+++ gcc-4.3.1/gcc/config/i386/linux.h 2008-06-10 06:11:35.000000000 +0200
-@@ -118,12 +118,21 @@
-
- /* Similar to standard Linux, but adding -ffast-math support. */
- #undef ENDFILE_SPEC
-+#ifdef HAVE_LD_PIE
-+#define ENDFILE_SPEC \
-+ "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-+ %{mpc32:crtprec32.o%s} \
-+ %{mpc64:crtprec64.o%s} \
-+ %{mpc80:crtprec80.o%s} \
-+ %{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s"
-+#else
- #define ENDFILE_SPEC \
- "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
- %{mpc32:crtprec32.o%s} \
- %{mpc64:crtprec64.o%s} \
- %{mpc80:crtprec80.o%s} \
- %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#endif
-
- /* A C statement (sans semicolon) to output to the stdio stream
- FILE the assembler definition of uninitialized global DECL named
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/ia64/linux.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/ia64/linux.h
---- gcc-4.3.1/gcc/config/ia64/linux.h 2008-06-10 06:15:58.000000000 +0200
-+++ gcc-4.3.1/gcc/config/ia64/linux.h 2008-06-10 05:50:16.000000000 +0200
-@@ -22,19 +22,25 @@
- #undef STARTFILE_SPEC
- #ifdef HAVE_LD_PIE
- #define STARTFILE_SPEC \
-- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s} %{!pg:%{!p:%{!profile:%(crtfile_pie)}}} }\
-+ crti.o%s %{shared:crtbeginS.o%s} %{!shared:%(startfile_pie)}"
- #else
- #define STARTFILE_SPEC \
- "%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ crti.o%s %{shared:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
-
- /* Similar to standard Linux, but adding -ffast-math support. */
- #undef ENDFILE_SPEC
-+#ifdef HAVE_LD_PIE
- #define ENDFILE_SPEC \
- "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-- %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+ %{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s"
-+#else
-+#define ENDFILE_SPEC \
-+ "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-+ %{shared:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#endif
-
- /* Define this for shared library support because it isn't in the main
- linux.h file. */
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/linux.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/linux.h
---- gcc-4.3.1/gcc/config/linux.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/linux.h 2008-06-10 05:50:16.000000000 +0200
-@@ -40,12 +40,12 @@
- #undef STARTFILE_SPEC
- #if defined HAVE_LD_PIE
- #define STARTFILE_SPEC \
-- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s} %{!pg:%{!p:%{!profile:%(crtfile_pie)}}} } \
-+ crti.o%s %{shared:crtbeginS.o%s} %{!shared:%(startfile_pie_t)}"
- #else
- #define STARTFILE_SPEC \
- "%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ crti.o%s %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
-
- /* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on
-@@ -55,8 +55,13 @@
- GNU/Linux "finalizer" file, `crtn.o'. */
-
- #undef ENDFILE_SPEC
-+#ifdef HAVE_LD_PIE
- #define ENDFILE_SPEC \
-- "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+ "%{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s"
-+#else
-+#define ENDFILE_SPEC \
-+ "%{shared:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#endif
-
- /* This is for -profile to use -lc_p instead of -lc. */
- #ifndef CC1_SPEC
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/rs6000/linux64.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/rs6000/linux64.h
---- gcc-4.3.1/gcc/config/rs6000/linux64.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/rs6000/linux64.h 2008-06-10 05:50:16.000000000 +0200
-@@ -151,7 +151,7 @@
- #endif
-
- #define ASM_SPEC32 "-a32 %{n} %{T} %{Ym,*} %{Yd,*} \
--%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
-+%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_pie) \
- %{memb} %{!memb: %{msdata: -memb} %{msdata=eabi: -memb}} \
- %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
- %{mcall-freebsd: -mbig} \
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/rs6000/sysv4.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/rs6000/sysv4.h
---- gcc-4.3.1/gcc/config/rs6000/sysv4.h 2007-08-08 21:33:24.000000000 +0200
-+++ gcc-4.3.1/gcc/config/rs6000/sysv4.h 2008-06-10 05:50:16.000000000 +0200
-@@ -875,19 +875,25 @@
-
- #ifdef HAVE_LD_PIE
- #define STARTFILE_LINUX_SPEC "\
--%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+%{!shared: %{pg|p|profile:gcrt1.o%s} %{!pg:%{!p:%{!profile:%(crtfile_pie)}}} } \
- %{mnewlib:ecrti.o%s;:crti.o%s} \
--%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+%{shared:crtbeginS.o%s} %{!shared:%(startfile_pie_t)}"
- #else
- #define STARTFILE_LINUX_SPEC "\
- %{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \
- %{mnewlib:ecrti.o%s;:crti.o%s} \
--%{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+%{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
-
-+#ifdef HAVE_LD_PIE
- #define ENDFILE_LINUX_SPEC "\
--%{shared|pie:crtendS.o%s;:crtend.o%s} \
-+%{shared:crtendS.o%s} %{!shared:%(endfile_pie)} \
- %{mnewlib:ecrtn.o%s;:crtn.o%s}"
-+#else
-+#define ENDFILE_LINUX_SPEC "\
-+%{shared:crtendS.o%s;:crtend.o%s} \
-+%{mnewlib:ecrtn.o%s;:crtn.o%s}"
-+#endif
-
- #define LINK_START_LINUX_SPEC ""
-
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/sparc/linux64.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/sparc/linux64.h
---- gcc-4.3.1/gcc/config/sparc/linux64.h 2007-10-19 06:29:38.000000000 +0200
-+++ gcc-4.3.1/gcc/config/sparc/linux64.h 2008-06-10 05:50:16.000000000 +0200
-@@ -66,12 +66,12 @@
-
- #ifdef HAVE_LD_PIE
- #define STARTFILE_SPEC \
-- "%{!shared:%{pg|p:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbeginS.o%s}"
-+ "%{!shared: %{pg|p:gcrt1.o%s} %{!pg:%{!p:%(crtfile_pie)}} }\
-+ crti.o%s %{shared:crtbeginS.o%s} %{!shared:%(startfile_pie_t)}"
- #else
- #define STARTFILE_SPEC \
- "%{!shared:%{pg|p:gcrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbeginS.o%s}"
-+ crti.o%s %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbeginS.o%s}"
- #endif
-
- /* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on
-@@ -81,10 +81,15 @@
- GNU/Linux "finalizer" file, `crtn.o'. */
-
- #undef ENDFILE_SPEC
--
-+#ifdef HAVE_LD_PIE
-+#define ENDFILE_SPEC \
-+ "%{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s\
-+ %{ffast-math|funsafe-math-optimizations:crtfastmath.o%s}"
-+#else
- #define ENDFILE_SPEC \
-- "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s\
-+ "%{shared:crtendS.o%s;:crtend.o%s} crtn.o%s\
- %{ffast-math|funsafe-math-optimizations:crtfastmath.o%s}"
-+#endif
-
- /* The GNU C++ standard library requires that these macros be defined. */
- #undef CPLUSPLUS_CPP_SPEC
-@@ -281,7 +286,7 @@
- %{T} \
- %{Ym,*} \
- %{Wa,*:%*} \
---s %{fpic|fPIC|fpie|fPIE:-K PIC} \
-+-s %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_pie) \
- %{mlittle-endian:-EL} \
- %(asm_cpu) %(asm_arch) %(asm_relax)"
-
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/sparc/linux.h /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/config/sparc/linux.h
---- gcc-4.3.1/gcc/config/sparc/linux.h 2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.3.1/gcc/config/sparc/linux.h 2008-06-10 05:50:16.000000000 +0200
-@@ -45,14 +45,14 @@
- object constructed before entering `main'. */
-
- #undef STARTFILE_SPEC
--#if defined HAVE_LD_PIE
-+#ifdef HAVE_LD_PIE
- #define STARTFILE_SPEC \
-- "%{!shared: %{pg|p:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ "%{!shared: %{pg|p:gcrt1.o%s} %{!pg:%{!p:%(crtfile_pie)}} }\
-+ crti.o%s %{shared:crtbeginS.o%s} %{!shared:%(startfile_pie_t)}"
- #else
- #define STARTFILE_SPEC \
- "%{!shared: %{pg|p:gcrt1.o%s;:crt1.o%s}}\
-- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-+ crti.o%s %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
-
- /* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on
-@@ -62,9 +62,15 @@
- GNU/Linux "finalizer" file, `crtn.o'. */
-
- #undef ENDFILE_SPEC
-+#ifdef HAVE_LD_PIE
- #define ENDFILE_SPEC \
- "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-- %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+ %{shared:crtendS.o%s} %{!shared:%(endfile_pie)} crtn.o%s"
-+#else
-+#define ENDFILE_SPEC \
-+ "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-+ %{shared:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#endif
-
- /* This is for -profile to use -lc_p instead of -lc. */
- #undef CC1_SPEC
-@@ -146,7 +152,7 @@
- #undef ASM_SPEC
- #define ASM_SPEC \
- "%{V} %{v:%{!V:-V}} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s \
-- %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_cpu) %(asm_relax)"
-+ %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_pie) %(asm_cpu) %(asm_relax)"
-
- /* Same as sparc.h */
- #undef DBX_REGISTER_NUMBER
-diff -ruN /var/tmp/portage/sys-devel/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/gcc.c /root/hardened/gcc-4.3.1-r1/work/gcc-4.3.1/gcc/gcc.c
---- gcc-4.3.1/gcc/gcc.c 2008-06-10 06:16:06.000000000 +0200
-+++ gcc-4.3.1/gcc/gcc.c 2008-06-10 05:50:16.000000000 +0200
-@@ -704,11 +704,43 @@
- #ifndef LINK_PIE_SPEC
- #ifdef HAVE_LD_PIE
- #define LINK_PIE_SPEC "%{pie:-pie} "
-+#define CC1_PIE_SPEC "%{pie:-fPIE}"
-+#define ASM_PIE_SPEC "%{pie:-K PIC}"
- #else
- #define LINK_PIE_SPEC "%{pie:} "
-+#define CC1_PIE_SPEC ""
-+#define ASM_PIE_SPEC ""
- #endif
- #endif
-
-+#ifndef CC1_HARDENED_SPEC
-+#define CC1_HARDENED_SPEC " %{!D__KERNEL__: %(cc1_pie) %(cc1_ssp) %(cc1_fortify) %(cc1_strict) }"
-+#endif
-+#ifndef CC1_SSP_SPEC
-+#define CC1_SSP_SPEC ""
-+#endif
-+#ifndef CC1_SSP_ALL_SPEC
-+#define CC1_SSP_ALL_SPEC ""
-+#endif
-+#ifndef CRTFILE_PIE_SPEC
-+#define CRTFILE_PIE_SPEC "%{static:crt1.o%s;pie:Scrt1.o%s;:crt1.o%s}"
-+#endif
-+#ifndef STARTFILE_PIE_SPEC
-+#define STARTFILE_PIE_SPEC "%{static:crtbegin.o%s;pie:crtbeginS.o%s;:crtbegin.o%s}"
-+#endif
-+#ifndef STARTFILE_PIE_T_SPEC
-+#define STARTFILE_PIE_T_SPEC "%{static:crtbeginT.o%s;pie:crtbeginS.o%s;:crtbegin.o%s}"
-+#endif
-+#ifndef ENDFILE_PIE_SPEC
-+#define ENDFILE_PIE_SPEC "%{pie:crtendS.o%s;:crtend.o%s}"
-+#endif
-+#ifndef LINK_RELRO_SPEC
-+#define LINK_RELRO_SPEC "%{norelro:}"
-+#endif
-+#ifndef LINK_NOW_SPEC
-+#define LINK_NOW_SPEC "%{nonow:}"
-+#endif
-+
- /* -u* was put back because both BSD and SysV seem to support it. */
- /* %{static:} simply prevents an error message if the target machine
- doesn't handle -static. */
-@@ -718,7 +750,7 @@
- #ifndef LINK_COMMAND_SPEC
- #define LINK_COMMAND_SPEC "\
- %{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
-- %(linker) %l " LINK_PIE_SPEC "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
-+ %(linker) %l %(link_pie) %(link_relro) %(link_now) %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
- %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
- %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
- %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)} %(mflib)\
-@@ -772,6 +804,17 @@
- static const char *sysroot_spec = SYSROOT_SPEC;
- static const char *sysroot_suffix_spec = SYSROOT_SUFFIX_SPEC;
- static const char *sysroot_hdrs_suffix_spec = SYSROOT_HEADERS_SUFFIX_SPEC;
-+static const char *asm_pie_spec = ASM_PIE_SPEC;
-+static const char *cc1_ssp_spec = CC1_SSP_SPEC;
-+static const char *cc1_ssp_all_spec = CC1_SSP_ALL_SPEC;
-+static const char *cc1_pie_spec = CC1_PIE_SPEC;
-+static const char *crtfile_pie_spec = CRTFILE_PIE_SPEC;
-+static const char *endfile_pie_spec = ENDFILE_PIE_SPEC;
-+static const char *startfile_pie_spec = STARTFILE_PIE_SPEC;
-+static const char *startfile_pie_t_spec = STARTFILE_PIE_T_SPEC;
-+static const char *link_relro_spec = LINK_RELRO_SPEC;
-+static const char *link_now_spec = LINK_NOW_SPEC;
-+static const char *link_pie_spec = LINK_PIE_SPEC;
-
- /* Standard options to cpp, cc1, and as, to reduce duplication in specs.
- There should be no need to override these in target dependent files,
-@@ -1605,6 +1648,17 @@
- INIT_STATIC_SPEC ("sysroot_spec", &sysroot_spec),
- INIT_STATIC_SPEC ("sysroot_suffix_spec", &sysroot_suffix_spec),
- INIT_STATIC_SPEC ("sysroot_hdrs_suffix_spec", &sysroot_hdrs_suffix_spec),
-+ INIT_STATIC_SPEC ("asm_pie", &asm_pie_spec),
-+ INIT_STATIC_SPEC ("cc1_ssp", &cc1_ssp_spec),
-+ INIT_STATIC_SPEC ("cc1_ssp_all", &cc1_ssp_all_spec),
-+ INIT_STATIC_SPEC ("cc1_pie", &cc1_pie_spec),
-+ INIT_STATIC_SPEC ("crtfile_pie", &crtfile_pie_spec),
-+ INIT_STATIC_SPEC ("endfile_pie", &endfile_pie_spec),
-+ INIT_STATIC_SPEC ("startfile_pie", &startfile_pie_spec),
-+ INIT_STATIC_SPEC ("startfile_pie_t", &startfile_pie_t_spec),
-+ INIT_STATIC_SPEC ("link_relro", &link_relro_spec),
-+ INIT_STATIC_SPEC ("link_now", &link_now_spec),
-+ INIT_STATIC_SPEC ("link_pie", &link_pie_spec),
- };
-
- #ifdef EXTRA_SPECS /* additional specs needed */
diff --git a/main/gcc/03_all_gcc-4.3.2-hardened-default.patch b/main/gcc/03_all_gcc-4.3.2-hardened-default.patch
deleted file mode 100644
index 04da4ea1..00000000
--- a/main/gcc/03_all_gcc-4.3.2-hardened-default.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-This patch defines the hardened specs hard in the gcc.c file.
---- gcc-4.3.2/gcc/gcc.c.orig2 Sun Nov 23 11:35:41 2008
-+++ gcc-4.3.2/gcc/gcc.c Sun Nov 23 11:51:58 2008
-@@ -703,9 +703,9 @@
-
- #ifndef LINK_PIE_SPEC
- #ifdef HAVE_LD_PIE
--#define LINK_PIE_SPEC "%{pie:-pie} "
--#define CC1_PIE_SPEC "%{pie:-fPIE}"
--#define ASM_PIE_SPEC "%{pie:-K PIC}"
-+#define LINK_PIE_SPEC "%{pie:-pie} %{!pie: %{!A: %{!fno-pie:%{!fno-PIE: %{!shared:%{!static:%{!r: %{!nopie:-pie} }}} }} } }%{pie:-pie} %{!pie: %{!A: %{!fno-pie:%{!fno-PIE: %{!shared:%{!static:%{!r: %{!nopie:-pie} }}} }} } } "
-+#define CC1_PIE_SPEC "%{pie:-fPIE} %{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: %{!shared: %{!nopie:-fPIE} } }}}} }}}} }"
-+#define ASM_PIE_SPEC "%{pie:-K PIC} %{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: %{!shared: %{!nopie:-K PIC} } }}}} }}}} }"
- #else
- #define LINK_PIE_SPEC "%{pie:} "
- #define CC1_PIE_SPEC ""
-@@ -717,28 +717,28 @@
- #define CC1_HARDENED_SPEC " %{!D__KERNEL__: %(cc1_pie) %(cc1_ssp) %(cc1_fortify) %(cc1_strict) }"
- #endif
- #ifndef CC1_SSP_SPEC
--#define CC1_SSP_SPEC ""
-+#define CC1_SSP_SPEC "%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector:%{!fstack-protector:%{!fstack-protector-all:-fstack-protector %(cc1_ssp_all) }}} }}"
- #endif
- #ifndef CC1_SSP_ALL_SPEC
--#define CC1_SSP_ALL_SPEC ""
-+#define CC1_SSP_ALL_SPEC ""
- #endif
- #ifndef CRTFILE_PIE_SPEC
--#define CRTFILE_PIE_SPEC "%{static:crt1.o%s;pie:Scrt1.o%s;:crt1.o%s}"
-+#define CRTFILE_PIE_SPEC "%{fno-pie|fno-PIE|nopie:crt1.o%s;:Scrt1.o%s}"
- #endif
- #ifndef STARTFILE_PIE_SPEC
--#define STARTFILE_PIE_SPEC "%{static:crtbegin.o%s;pie:crtbeginS.o%s;:crtbegin.o%s}"
-+#define STARTFILE_PIE_SPEC "%{fno-pie|fno-PIE|nopie:crtbegin.o%s;:crtbeginS.o%s}"
- #endif
- #ifndef STARTFILE_PIE_T_SPEC
--#define STARTFILE_PIE_T_SPEC "%{static:crtbeginT.o%s;pie:crtbeginS.o%s;:crtbegin.o%s}"
-+#define STARTFILE_PIE_T_SPEC "%{static: %{fno-pie|fno-PIE|nopie:crtbeginT.o%s;:crtbeginTS.o%s} } %{!static: %{fno-pie|fno-PIE|nopie:crtbegin.o%s;:crtbeginS.o%s} }"
- #endif
- #ifndef ENDFILE_PIE_SPEC
--#define ENDFILE_PIE_SPEC "%{pie:crtendS.o%s;:crtend.o%s}"
-+#define ENDFILE_PIE_SPEC "%{fno-pie|fno-PIE|nopie:crtend.o%s;:crtendS.o%s}"
- #endif
- #ifndef LINK_RELRO_SPEC
--#define LINK_RELRO_SPEC "%{norelro:}"
-+#define LINK_RELRO_SPEC "%{!norelro:-z relro}"
- #endif
- #ifndef LINK_NOW_SPEC
--#define LINK_NOW_SPEC "%{nonow:}"
-+#define LINK_NOW_SPEC "%{!nonow:-z now}"
- #endif
-
- /* -u* was put back because both BSD and SysV seem to support it. */
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index dbb65660..0dd1f35b 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,51 +1,43 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gcc
-pkgver=4.3.3
-pkgrel=2
+pkgver=4.4.1
+_specsver=0.1.4
+_espfver=0.3.1
+pkgrel=1
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
license="GPL LGPL"
-depends="gmp mpfr libgcc binutils"
+depends="binutils"
makedepends="bison flex gmp-dev mpfr-dev texinfo"
-subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc"
+subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
- 00_all_gcc-4.0-cvs-incompat.patch
- 01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
- 01_all_gcc-4.3.1-crtbeginTS-stuff.patch
- 02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
- 03_all_gcc-4.3.2-hardened-default.patch
+ http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-espf-$_espfver.tar.bz2
+ http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-specs-$_specsver.tar.bz2
gcc4-stack-protector-uclibc-no_tls.patch
- gcc-4.2.0-cc1-no-stack-protector.patch
pt_gnu_eh_frame.patch
- gcc-spec-env.patch
+ uclibc-getipinfo.patch
"
+# ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
+build ()
+{
+ cd ${srcdir}/gcc-${pkgver}
-build ()
-{
- cd ${srcdir}/gcc-${pkgver};
+ # uclibc patches
for i in ../*.patch; do
- if ! patch -p1 -i $i; then
- error "$i failed"
- return 1
- fi
+ msg "Applying $i"
+ patch -p1 -i $i || return 1
done
- echo ${pkgver} > gcc/BASE-VER;
-
- # Don't build crtbegin/end with ssp
- sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector |' \
- -i gcc/Makefile.in || return 1
-
- # Don't build libgcc with SSP
- sed -e 's|^LIBGCC2_CFLAGS = |LIBGCC2_CFLAGS = -fno-stack-protector -U_FORTIFY_SOURCE |' \
- -i gcc/Makefile.in || return 1
-
- # Use SSP from libc
- msg "Enabling SSP from libc"
- sed -e 's|^LIBGCC2_CFLAGS = |LIBGCC2_CFLAGS = -D_LIBC_PROVIDES_SSP_ |' \
- -i gcc/Makefile.in || return 1
+ # ESPF patches. we dont use objc yet
+ rm -f ../espf-gcc-$pkgver/*_objc*lang-specs*.patch
+ # thanks to Zorry for hard work on those patches
+ for i in ../espf-gcc-$pkgver/*.patch; do
+ msg "Applying $i"
+ patch -p0 -i $i || return 1
+ done
+ echo ${pkgver} > gcc/BASE-VER
mkdir build
cd build
../configure --prefix=/usr \
@@ -59,15 +51,18 @@ build ()
--disable-libstdcxx-pch \
--disable-multilib \
--disable-nls \
+ --disable-threads \
+ --disable-tls \
--disable-werror \
--enable-__cxa_atexit \
--enable-cld \
+ --enable-espf \
--enable-languages=c,c++ \
--enable-shared \
--enable-target-optspace \
- --disable-threads \
--with-arch=i486 \
- --with-system-zlib
+ --with-system-zlib \
+ --without-system-libunwind
make || return 1
make -j1 DESTDIR="${pkgdir}" install || return 1
@@ -75,18 +70,25 @@ build ()
# binutils provides libiberty.a
rm -f "$pkgdir"/usr/lib/libiberty.a
+
+ # install the specs
+ cd "$srcdir"/specs
+ install -d "$pkgdir"/usr/share/gcc
+ for i in *.specs; do
+ install -m644 $i "$pkgdir"/usr/share/gcc/$i || return 1
+ done
}
libcxx() {
pkgdesc="GNU C++ standard runtime library"
- depends="uclibc libgcc"
+ depends=
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libstdc++.so* "$subpkgdir"/usr/lib/
}
gpp() {
pkgdesc="GNU C++ standard library and compiler"
- depends="uclibc libstdc++"
+ depends=
local libexec=usr/libexec/gcc/${CHOST:-i486-alpine-linux-uclibc}/$pkgver
mkdir -p "$subpkgdir/$libexec" \
"$subpkgdir"/usr/bin \
@@ -100,21 +102,24 @@ gpp() {
}
libgcc() {
- pkgdesc="GNU C compiler runtime library"
- depends="uclibc"
+ pkgdesc="GNU C compiler runtime libraries"
+ depends=
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libgcc_s.so* "$subpkgdir"/usr/lib/
}
+libgomp() {
+ pkgdesc="GCC shared-memory parallel programming API library"
+ depends=
+ replaces="gcc"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libgomp.so* "$subpkgdir"/usr/lib/
+}
-md5sums="1739288c2c7b1472796b33d641dbdbbd gcc-core-4.3.3.tar.bz2
-18428e313a9927d38b313e688c62219b gcc-g++-4.3.3.tar.bz2
-f0c6c419318537505ec2717a139a091b 00_all_gcc-4.0-cvs-incompat.patch
-3cb2148075e818f09c34718725f335d9 01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
-1c6294b95f13a59ed7cbf7be2dde7804 01_all_gcc-4.3.1-crtbeginTS-stuff.patch
-019522a38f2e25b6a820766402ff2ee4 02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
-ed3f5a947fed432fbef1dc0e71977ae7 03_all_gcc-4.3.2-hardened-default.patch
+md5sums="d19693308aa6b2052e14c071111df59f gcc-core-4.4.1.tar.bz2
+d449047b5761348ceec23739f5553e0b gcc-g++-4.4.1.tar.bz2
+43d0bbd676bbb2acd67ddabd0ea1bc2b gcc-4.4.1-espf-0.3.1.tar.bz2
+da8d9165e828bbb9809ef86f1c72886f gcc-4.4.1-specs-0.1.4.tar.bz2
15e77082db0e1a131af98debd3016290 gcc4-stack-protector-uclibc-no_tls.patch
-cff2e73a8455bfa844dcdd9c229b0875 gcc-4.2.0-cc1-no-stack-protector.patch
2db1e3482c5dd59dab70f701afa2ca80 pt_gnu_eh_frame.patch
-c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch"
+6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch"
diff --git a/main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch b/main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch
deleted file mode 100644
index cc80d1bc..00000000
--- a/main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gcc/Makefile.in.orig 2007-05-20 14:44:14.000000000 +0200
-+++ b/gcc/Makefile.in 2007-05-20 14:44:27.000000000 +0200
-@@ -2641,7 +2641,7 @@
- output.h $(INSN_ATTR_H) $(SYSTEM_H) toplev.h $(TARGET_H) libfuncs.h \
- $(TARGET_DEF_H) $(FUNCTION_H) $(SCHED_INT_H) $(TM_P_H) $(EXPR_H) \
- langhooks.h $(GGC_H) $(OPTABS_H) $(REAL_H) tm-constrs.h
-- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
-+ $(CC) -c $(ALL_CFLAGS) -fno-stack-protector $(ALL_CPPFLAGS) \
- $(out_file) $(OUTPUT_OPTION)
-
- # Build auxiliary files that support ecoff format.
diff --git a/main/gcc/gcc-spec-env.patch b/main/gcc/gcc-spec-env.patch
deleted file mode 100644
index 9d5e666a..00000000
--- a/main/gcc/gcc-spec-env.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- Add support for external spec file via the GCC_SPECS env var. This
- allows us to easily control pie/ssp defaults with gcc-config profiles.
-
- Original patch by Rob Holland. Extended to support multiple
- entries separated by ':' by Kevin F. Quinn
-
---- gcc-4/gcc/gcc.c
-+++ gcc-4/gcc/gcc.c
-@@ -6482,6 +6482,32 @@
-
- /* Process any user specified specs in the order given on the command
- line. */
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+ /* Add specs listed in GCC_SPECS. Note; in the process of separating
-+ * each spec listed, the string is overwritten at token boundaries
-+ * (':') with '\0', an effect of strtok_r().
-+ */
-+ GET_ENVIRONMENT (specs_file, "GCC_SPECS");
-+ if (specs_file && (strlen(specs_file) > 0))
-+ {
-+ char *spec, *saveptr;
-+ for (spec=strtok_r(specs_file,":",&saveptr);
-+ spec!=NULL;
-+ spec=strtok_r(NULL,":",&saveptr))
-+ {
-+ struct user_specs *user = (struct user_specs *)
-+ xmalloc (sizeof (struct user_specs));
-+
-+ user->next = (struct user_specs *) 0;
-+ user->filename = spec;
-+ if (user_specs_tail)
-+ user_specs_tail->next = user;
-+ else
-+ user_specs_head = user;
-+ user_specs_tail = user;
-+ }
-+ }
-+#endif
- for (uptr = user_specs_head; uptr; uptr = uptr->next)
- {
- char *filename = find_a_file (&startfile_prefixes, uptr->filename,
diff --git a/testing/gcc/uclibc-getipinfo.patch b/main/gcc/uclibc-getipinfo.patch
index 3abbbdd7..3abbbdd7 100644
--- a/testing/gcc/uclibc-getipinfo.patch
+++ b/main/gcc/uclibc-getipinfo.patch
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index b947b9b6..f7a78026 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -2,11 +2,11 @@
pkgname=ipsec-tools
pkgver=0.8_alpha20090422
_myver=0.8-alpha20090422
-pkgrel=0
+pkgrel=1
pkgdesc="User-space IPsec tools for various IPsec implementations"
url="http://ipsec-tools.sourceforge.net/"
license="BSD"
-depends="openssl uclibc"
+depends=""
makedepends="openssl-dev bison flex"
subpackages="$pkgname-doc $pkgname-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_myver.tar.gz
@@ -49,8 +49,8 @@ build() {
}
md5sums="8327401b5d1aa91e9c554d2cc536f823 ipsec-tools-0.8-alpha20090422.tar.gz
-16d66458442750e6401fa459e93172b7 racoon.initd
-788e3de82c1c6532dab0dc0c19c1bf40 racoon.confd
+fce62b52b598be268e27609f470f8e9b racoon.initd
+2d00250cf72da7f2f559c91b65a48747 racoon.confd
e0abf570c29519e8e36406dfc3bbe3c8 00-verify-cert-leak.patch
2adb8796c75f62811b08c8370c75312c 20-natoa-fix.patch
17b3f05426537afa1e94947c39b10163 30-natt-ports-cleanup.patch
diff --git a/main/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd
index 66f8ed76..bf9926c5 100644
--- a/main/ipsec-tools/racoon.confd
+++ b/main/ipsec-tools/racoon.confd
@@ -8,6 +8,7 @@
# for valid command-line options
RACOON_OPTS="-4"
+SETKEY_OPTS=""
RACOON_CONF="/etc/racoon/racoon.conf"
RACOON_PSK_FILE="/etc/racoon/psk.txt"
diff --git a/main/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
index 16fdec7e..0ed4efe5 100644
--- a/main/ipsec-tools/racoon.initd
+++ b/main/ipsec-tools/racoon.initd
@@ -36,7 +36,7 @@ checkconfig() {
start() {
checkconfig || return 1
einfo "Loading ipsec policies from ${SETKEY_CONF}."
- /usr/sbin/setkey -f ${SETKEY_CONF}
+ /usr/sbin/setkey ${SETKEY_OPTS} -f ${SETKEY_CONF}
if [ $? -eq 1 ] ; then
eerror "Error while loading ipsec policies"
fi
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
index a555918a..af00f93f 100644
--- a/main/iscsitarget-grsec/APKBUILD
+++ b/main/iscsitarget-grsec/APKBUILD
@@ -6,6 +6,7 @@ _realname=iscsitarget
if [ -f ../linux-$_flavor/APKBUILD ]; then
. ../linux-$_flavor/APKBUILD
fi
+_kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
# get pkgver from iscsitarget
@@ -14,17 +15,20 @@ if [ -f ../iscsitarget/APKBUILD ]; then
fi
pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-0.4.17}
-pkgrel=3
+pkgrel=4
pkgdesc="$_flavor kernel modules for iscsitarget"
url="http://iscsitarget.sourceforge.net/"
license="GPL-2"
-depends=
+#depends="linux-${_flavor}=${_kernelver}"
+depends="linux-${_flavor}"
install=
+#makedepends="linux-${_flavor}-dev=${_kernelver}"
makedepends="linux-${_flavor}-dev"
subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$pkgver.tar.gz
iscsitarget-0.4.17+linux-2.6.28.patch
iscsitarget-0.4.17+linux-2.6.29.patch
+ iscsitarget-0.4.17+linux-2.6.30.patch
"
build() {
@@ -41,4 +45,5 @@ build() {
}
md5sums="e79b437695fc50e7d054631855a16b1b iscsitarget-0.4.17.tar.gz
f58dde50f72b04b7737b33e517e56208 iscsitarget-0.4.17+linux-2.6.28.patch
-a7be10bb04c9014807e39db75c9cd468 iscsitarget-0.4.17+linux-2.6.29.patch"
+a7be10bb04c9014807e39db75c9cd468 iscsitarget-0.4.17+linux-2.6.29.patch
+2f65d30d1766828fc87cac55a84e0b07 iscsitarget-0.4.17+linux-2.6.30.patch"
diff --git a/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.30.patch b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.30.patch
new file mode 100644
index 00000000..fa420e97
--- /dev/null
+++ b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.30.patch
@@ -0,0 +1,37 @@
+From cb1b94ffa91d71aba8e07ed018e9f43064e05a49 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Wed, 10 Jun 2009 17:24:02 +0200
+Subject: [PATCH 3/3] Fix building with Linux kernel 2.6.30 and later.
+
+With commit 99b76233803beab302123d243eea9e41149804f3 the proc_dir_entry
+structure does not have an owner any longer, this just removes the
+assignment to make the code build with the newer kernel.
+---
+ kernel/config.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/config.c b/kernel/config.c
+index d6c4b5e..34681f5 100644
+--- a/kernel/config.c
++++ b/kernel/config.c
+@@ -5,6 +5,7 @@
+ */
+
+ #include <linux/proc_fs.h>
++#include <linux/version.h>
+
+ #include "iscsi.h"
+ #include "iscsi_dbg.h"
+@@ -43,7 +44,9 @@ int iet_procfs_init(void)
+ if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
+ goto err;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+ proc_iet_dir->owner = THIS_MODULE;
++#endif
+
+ for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
+ ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);
+--
+1.6.3.1
+
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index 59521d59..8b74410b 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -6,6 +6,7 @@ _realname=xtables-addons
if [ -f ../linux-$_flavor/APKBUILD ]; then
. ../linux-$_flavor/APKBUILD
fi
+_kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
# get pkgver from xtables-addons package
@@ -15,11 +16,13 @@ fi
pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-1.17}
-pkgrel=1
+pkgrel=2
pkgdesc="Iptables extensions kernel modules"
url="http://xtables-addons.sourceforge.net/"
license="GPL"
-depends=
+#depends="linux-${_flavor}=${_kernelver}"
+depends="linux-${_flavor}"
+#makedepends="linux-${_flavor}-dev=${_kernelver} iptables-dev pkgconfig"
makedepends="linux-${_flavor}-dev iptables-dev pkgconfig"
install=
subpackages=
diff --git a/testing/gcc/APKBUILD b/testing/gcc/APKBUILD
deleted file mode 100644
index 0dd1f35b..00000000
--- a/testing/gcc/APKBUILD
+++ /dev/null
@@ -1,125 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gcc
-pkgver=4.4.1
-_specsver=0.1.4
-_espfver=0.3.1
-pkgrel=1
-pkgdesc="The GNU Compiler Collection"
-url="http://gcc.gnu.org"
-license="GPL LGPL"
-depends="binutils"
-makedepends="bison flex gmp-dev mpfr-dev texinfo"
-subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
-source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
- http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-espf-$_espfver.tar.bz2
- http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-specs-$_specsver.tar.bz2
- gcc4-stack-protector-uclibc-no_tls.patch
- pt_gnu_eh_frame.patch
- uclibc-getipinfo.patch
- "
-# ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
-build ()
-{
- cd ${srcdir}/gcc-${pkgver}
-
- # uclibc patches
- for i in ../*.patch; do
- msg "Applying $i"
- patch -p1 -i $i || return 1
- done
-
- # ESPF patches. we dont use objc yet
- rm -f ../espf-gcc-$pkgver/*_objc*lang-specs*.patch
- # thanks to Zorry for hard work on those patches
- for i in ../espf-gcc-$pkgver/*.patch; do
- msg "Applying $i"
- patch -p0 -i $i || return 1
- done
-
- echo ${pkgver} > gcc/BASE-VER
- mkdir build
- cd build
- ../configure --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --build=${CHOST:-i486-alpine-linux-uclibc} \
- --disable-altivec \
- --disable-checking \
- --disable-fixed-point \
- --disable-libssp \
- --disable-libstdcxx-pch \
- --disable-multilib \
- --disable-nls \
- --disable-threads \
- --disable-tls \
- --disable-werror \
- --enable-__cxa_atexit \
- --enable-cld \
- --enable-espf \
- --enable-languages=c,c++ \
- --enable-shared \
- --enable-target-optspace \
- --with-arch=i486 \
- --with-system-zlib \
- --without-system-libunwind
-
- make || return 1
- make -j1 DESTDIR="${pkgdir}" install || return 1
- ln -s gcc "$pkgdir"/usr/bin/cc
-
- # binutils provides libiberty.a
- rm -f "$pkgdir"/usr/lib/libiberty.a
-
- # install the specs
- cd "$srcdir"/specs
- install -d "$pkgdir"/usr/share/gcc
- for i in *.specs; do
- install -m644 $i "$pkgdir"/usr/share/gcc/$i || return 1
- done
-}
-
-libcxx() {
- pkgdesc="GNU C++ standard runtime library"
- depends=
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libstdc++.so* "$subpkgdir"/usr/lib/
-}
-
-gpp() {
- pkgdesc="GNU C++ standard library and compiler"
- depends=
- local libexec=usr/libexec/gcc/${CHOST:-i486-alpine-linux-uclibc}/$pkgver
- mkdir -p "$subpkgdir/$libexec" \
- "$subpkgdir"/usr/bin \
- "$subpkgdir"/usr/include \
- "$subpkgdir"/usr/lib \
-
- mv "$pkgdir/$libexec/cc1plus" "$subpkgdir/$libexec/"
- mv "$pkgdir"/usr/lib/*++* "$subpkgdir"/usr/lib/
- mv "$pkgdir"/usr/include/c++ "$subpkgdir"/usr/include/
- mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
-}
-
-libgcc() {
- pkgdesc="GNU C compiler runtime libraries"
- depends=
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libgcc_s.so* "$subpkgdir"/usr/lib/
-}
-
-libgomp() {
- pkgdesc="GCC shared-memory parallel programming API library"
- depends=
- replaces="gcc"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libgomp.so* "$subpkgdir"/usr/lib/
-}
-
-md5sums="d19693308aa6b2052e14c071111df59f gcc-core-4.4.1.tar.bz2
-d449047b5761348ceec23739f5553e0b gcc-g++-4.4.1.tar.bz2
-43d0bbd676bbb2acd67ddabd0ea1bc2b gcc-4.4.1-espf-0.3.1.tar.bz2
-da8d9165e828bbb9809ef86f1c72886f gcc-4.4.1-specs-0.1.4.tar.bz2
-15e77082db0e1a131af98debd3016290 gcc4-stack-protector-uclibc-no_tls.patch
-2db1e3482c5dd59dab70f701afa2ca80 pt_gnu_eh_frame.patch
-6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch"
diff --git a/testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch b/testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch
deleted file mode 100644
index c9b54adb..00000000
--- a/testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -u gcc/config/i386/linux.h gcc/config/i386/linux.h
---- a/gcc/config/i386/linux.h 2 Jul 2005 08:52:20 -0000 1.60
-+++ b/gcc/config/i386/linux.h 2 Jul 2005 08:52:20 -0000 1.60
-@@ -186,7 +186,7 @@
- /* This macro may be overridden in i386/k*bsd-gnu.h. */
- #define REG_NAME(reg) reg
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* i386 glibc provides __stack_chk_guard in %gs:0x14. */
- #define TARGET_THREAD_SSP_OFFSET 0x14
- #endif
-diff -u gcc/config/i386/linux64.h gcc/config/i386/linux64.h
---- a/gcc/config/i386/linux64.h 2 Jul 2005 08:52:20 -0000 1.33
-+++ b/gcc/config/i386/linux64.h 2 Jul 2005 08:52:20 -0000 1.33
-@@ -74,7 +74,7 @@
- /* This macro may be overridden in i386/k*bsd-gnu.h. */
- #define REG_NAME(reg) reg
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* i386 glibc provides __stack_chk_guard in %gs:0x14,
- x86_64 glibc provides it in %fs:0x28. */
- #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? 0x28 : 0x14)
-diff -u gcc/config/rs6000/linux.h gcc/config/rs6000/linux.h
---- a/gcc/config/rs6000/linux.h 2 Jul 2005 08:52:11 -0000 1.53
-+++ b/gcc/config/rs6000/linux.h 2 Jul 2005 08:52:11 -0000 1.53
-@@ -114,7 +114,7 @@
-
- #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* ppc32 glibc provides __stack_chk_guard in -0x7008(2). */
- #define TARGET_THREAD_SSP_OFFSET -0x7008
- #endif
-diff -u gcc/config/rs6000/linux64.h gcc/config/rs6000/linux64.h
---- a/gcc/config/rs6000/linux64.h 2 Jul 2005 08:52:15 -0000 1.81
-+++ b/gcc/config/rs6000/linux64.h 2 Jul 2005 08:52:15 -0000 1.81
-@@ -548,7 +548,7 @@
-
- #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* ppc32 glibc provides __stack_chk_guard in -0x7008(2),
- ppc64 glibc provides it at -0x7010(13). */
- #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? -0x7010 : -0x7008)
-diff -u gcc/config/s390/linux.h gcc/config/s390/linux.h
---- a/gcc/config/s390/linux.h 2005-08-22 15:53:01.000000000 +0200 1.40
-+++ b/gcc/config/s390/linux.h 2005-08-22 15:53:01.000000000 +0200 1.40
-@@ -94,7 +94,7 @@
-
- #define MD_UNWIND_SUPPORT "config/s390/linux-unwind.h"
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* s390 glibc provides __stack_chk_guard in 0x14(tp),
- s390x glibc provides it at 0x28(tp). */
- #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? 0x28 : 0x14)
-diff -u gcc/config/sparc/linux.h gcc/config/sparc/linux.h
---- a/gcc/config/sparc/linux.h 6 Jul 2005 07:48:57 -0000 1.72
-+++ b/gcc/config/sparc/linux.h 6 Jul 2005 07:48:57 -0000 1.72
-@@ -230,7 +230,7 @@
- #undef NEED_INDICATE_EXEC_STACK
- #define NEED_INDICATE_EXEC_STACK 1
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14]. */
- #define TARGET_THREAD_SSP_OFFSET 0x14
- #endif
-diff -u gcc/config/sparc/linux64.h gcc/config/sparc/linux64.h
---- a/gcc/config/sparc/linux64.h 6 Jul 2005 07:48:57 -0000 1.95
-+++ b/gcc/config/sparc/linux64.h 6 Jul 2005 07:48:57 -0000 1.95
-@@ -364,7 +364,7 @@
- #undef NEED_INDICATE_EXEC_STACK
- #define NEED_INDICATE_EXEC_STACK 1
-
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
- /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14],
- sparc64 glibc provides it at [%g7 + 0x28]. */
- #define TARGET_THREAD_SSP_OFFSET (TARGET_ARCH64 ? 0x28 : 0x14)
diff --git a/testing/gcc/pt_gnu_eh_frame.patch b/testing/gcc/pt_gnu_eh_frame.patch
deleted file mode 100644
index 3e029104..00000000
--- a/testing/gcc/pt_gnu_eh_frame.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc-4.3.2/gcc/crtstuff.c.orig Mon Nov 17 16:02:38 2008
-+++ gcc-4.3.2/gcc/crtstuff.c Mon Nov 17 16:02:52 2008
-@@ -94,8 +94,7 @@
- #include <link.h>
- /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
- But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */
--# if !defined(__UCLIBC__) \
-- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-+# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
- # define USE_PT_GNU_EH_FRAME
- # endif