summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2011-02-06 15:59:39 +0000
committerMagnus Granberg <zorry@gentoo.org>2011-02-06 15:59:39 +0000
commit30855d3e206d6b3dccdeec32796979ee045caf4d (patch)
tree3fa440f44ca874d5909ed477a4ff7dfffc025a7c /sys-libs
parentAdd dummy src_test since there are no tests; update my name in metadata. (diff)
downloadgentoo-2-30855d3e206d6b3dccdeec32796979ee045caf4d.tar.gz
gentoo-2-30855d3e206d6b3dccdeec32796979ee045caf4d.tar.bz2
gentoo-2-30855d3e206d6b3dccdeec32796979ee045caf4d.zip
Fix bug #353811
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/glibc-2.13.ebuild5
2 files changed, 5 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a2cc788087f6..d7de33d08fb4 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.739 2011/02/05 19:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.740 2011/02/06 15:59:39 zorry Exp $
+
+ 06 Feb 2011; Magnus Granberg <zorry@gentoo.org> glibc-2.13.ebuild:
+ We do not longer support old SSP for GCC 3.X and patch fail #353811
*glibc-2.13 (05 Feb 2011)
diff --git a/sys-libs/glibc/glibc-2.13.ebuild b/sys-libs/glibc/glibc-2.13.ebuild
index 5dd21af24f6f..7596918f7807 100644
--- a/sys-libs/glibc/glibc-2.13.ebuild
+++ b/sys-libs/glibc/glibc-2.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.1 2011/02/05 19:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.2 2011/02/06 15:59:39 zorry Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -207,9 +207,6 @@ eblit-src_unpack-post() {
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
- einfo "Patching Glibc to support older SSP __guard"
- epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-ssp-compat.patch
-
einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
debug/stack_chk_fail.c || die