summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin F. Quinn <kevquinn@gentoo.org>2006-12-20 10:52:20 +0000
committerKevin F. Quinn <kevquinn@gentoo.org>2006-12-20 10:52:20 +0000
commitdb8aa7f2cab6f2bb218a918840b4199d9fb503b1 (patch)
tree26b0590818fbc4ae0a25fb80bbdae2b6bc7c91e3 /hardened/toolchain/branches
parentNew gcc-glibc-nopie branch; build gcc and glibc with PIE switches _off_. (diff)
downloadkevquinn-db8aa7f2cab6f2bb218a918840b4199d9fb503b1.tar.gz
kevquinn-db8aa7f2cab6f2bb218a918840b4199d9fb503b1.tar.bz2
kevquinn-db8aa7f2cab6f2bb218a918840b4199d9fb503b1.zip
Don't apply hardened-pie patch
svn path=/; revision=130
Diffstat (limited to 'hardened/toolchain/branches')
-rw-r--r--hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/Manifest16
-rw-r--r--hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/glibc-2.4-r4.ebuild5
2 files changed, 11 insertions, 10 deletions
diff --git a/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/Manifest b/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/Manifest
index a83e398..f4d1531 100644
--- a/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/Manifest
+++ b/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/Manifest
@@ -2,10 +2,10 @@ AUX 2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058 RMD160 c98d7007857aeeea00e708e798
MD5 24dfc0b6f2725063612ea5e4e346b6f3 files/2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058
RMD160 c98d7007857aeeea00e708e7989800dad9b07ae3 files/2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058
SHA256 067fba2a36d2630d50198c44395ef208cdf080508f1b716bd3d079f7b964e2df files/2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058
-AUX 2.4/glibc-2.4-hardened-pie.patch 3875 RMD160 82671cc3a508a7aec307b0515a2589fa1e29a291 SHA1 39f07b444bf6eec4a99737e8377a9d3f3f215993 SHA256 1b79594506ba69a7f39dac71c96cd4a0b738caa84ac43768caa1b2aea2805c34
-MD5 ac0a186272000c10eb342bdb64043d44 files/2.4/glibc-2.4-hardened-pie.patch 3875
-RMD160 82671cc3a508a7aec307b0515a2589fa1e29a291 files/2.4/glibc-2.4-hardened-pie.patch 3875
-SHA256 1b79594506ba69a7f39dac71c96cd4a0b738caa84ac43768caa1b2aea2805c34 files/2.4/glibc-2.4-hardened-pie.patch 3875
+AUX 2.4/glibc-2.4-hardened-pie.patch 3277 RMD160 121a25f41f6cac9dabce4270e049690d2b1118be SHA1 15d3b5278c9878a869821ab2108423d3542a05a2 SHA256 69b247256877fd198d7028d00eaeab2d83b08ddf66f1176fe465561f1036aa78
+MD5 00ad489ad6faab45f7b6b1c5e670ffd3 files/2.4/glibc-2.4-hardened-pie.patch 3277
+RMD160 121a25f41f6cac9dabce4270e049690d2b1118be files/2.4/glibc-2.4-hardened-pie.patch 3277
+SHA256 69b247256877fd198d7028d00eaeab2d83b08ddf66f1176fe465561f1036aa78 files/2.4/glibc-2.4-hardened-pie.patch 3277
AUX 2.4/glibc-2.4-linuxssp.patch 5624 RMD160 9769dd67a904488224760d7d009c05d10bdc5a81 SHA1 cdca3580ee24006c42c4ce9c31f9a79005fe625d SHA256 6a5c4cd1b7a9a10a8eac928af8e8f425a07b0ff01a12edbe6c21bcaa20a2762d
MD5 26f0d80267aeef64b552baba9f8b869a files/2.4/glibc-2.4-linuxssp.patch 5624
RMD160 9769dd67a904488224760d7d009c05d10bdc5a81 files/2.4/glibc-2.4-linuxssp.patch 5624
@@ -37,10 +37,10 @@ DIST glibc-linuxthreads-20060605.tar.bz2 247200 RMD160 aaa0a150eec4d63787f86ae04
DIST glibc-ports-2.4.tar.bz2 381472 RMD160 72987098f9fbd5a1ad617bf2136081c0db80a429 SHA1 8b4d93bfbcd5b6a36e09ff08fe0c2a08adc1b886 SHA256 2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a
DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40725 SHA1 7da6257e641759ed29c4d316700fce6f604bc812 SHA256 80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
DIST glibc-powerpc-cpu-addon-v0.01.tgz 22422 RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df SHA1 fd30cde7c7cb42baa2c8fa1ac88eeeeb509cac29 SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9
-EBUILD glibc-2.4-r4.ebuild 40431 RMD160 3f058531de3f6c7eb79c98b206e2348fc71c6b69 SHA1 ac40152f8accee20527f36e833edf55f75fc89d8 SHA256 079e314f625276c314ab8f3ff268f8fac67fae8cfca7923e69b251d076796389
-MD5 6206b5f4be3503779a1b63e4f7279ca2 glibc-2.4-r4.ebuild 40431
-RMD160 3f058531de3f6c7eb79c98b206e2348fc71c6b69 glibc-2.4-r4.ebuild 40431
-SHA256 079e314f625276c314ab8f3ff268f8fac67fae8cfca7923e69b251d076796389 glibc-2.4-r4.ebuild 40431
+EBUILD glibc-2.4-r4.ebuild 40638 RMD160 b33701a08dec313ced3fcaa12c0eb8e7f7fd63d4 SHA1 404d3a22c960caa6a620f2611b0620b100fa38b5 SHA256 ba962f9ad750f067a17ee645bd65c852eec3ff8c3dfc6b4c5a9db524f4813165
+MD5 fb50255f040bfb4066ceb3c15e5983d4 glibc-2.4-r4.ebuild 40638
+RMD160 b33701a08dec313ced3fcaa12c0eb8e7f7fd63d4 glibc-2.4-r4.ebuild 40638
+SHA256 ba962f9ad750f067a17ee645bd65c852eec3ff8c3dfc6b4c5a9db524f4813165 glibc-2.4-r4.ebuild 40638
EBUILD glibc-2.5.ebuild 38595 RMD160 d015a3acff785e4bc5ff65bcd38d488b71efb8cf SHA1 fc36621c35dfd2147be1f70c85f0cc5ebe9f4542 SHA256 cd3061e2795e4d82fbb824466bd1308a1086aaaf2e5f559a698a605c55ec324b
MD5 1c4b9358e448f106af4bce2a625d30a5 glibc-2.5.ebuild 38595
RMD160 d015a3acff785e4bc5ff65bcd38d488b71efb8cf glibc-2.5.ebuild 38595
diff --git a/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/glibc-2.4-r4.ebuild b/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/glibc-2.4-r4.ebuild
index 24dcc3e..3ea83c0 100644
--- a/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/glibc-2.4-r4.ebuild
+++ b/hardened/toolchain/branches/gcc-glibc-nopie/sys-libs/glibc/glibc-2.4-r4.ebuild
@@ -238,8 +238,9 @@ toolchain-glibc_src_unpack() {
einfo "Patching to make test failures clear, and to run all of them."
epatch ${FILESDIR}/2.4/glibc-2.4-testfailobvious.patch
- einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
- epatch ${FILESDIR}/2.4/glibc-2.4-hardened-pie.patch
+# Building -fno-PIE anyway, so don't need this
+# einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+# epatch ${FILESDIR}/2.4/glibc-2.4-hardened-pie.patch
if use hardened; then
einfo "Installing Hardened Gentoo SSP handler"