summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2004-12-05 20:47:32 +0000
committerNed Ludd <solar@gentoo.org>2004-12-05 20:47:32 +0000
commitdd75ccc462793f3cc5cb04ef0d26d01d887ffe18 (patch)
treea63330ee9802a007e2f3c8a538054e8119a93dc6 /sys-libs
parentmoved from kernel-mod to linux-info eclass as per bug #73472 (Manifest recommit) (diff)
downloadgentoo-2-dd75ccc462793f3cc5cb04ef0d26d01d887ffe18.tar.gz
gentoo-2-dd75ccc462793f3cc5cb04ef0d26d01d887ffe18.tar.bz2
gentoo-2-dd75ccc462793f3cc5cb04ef0d26d01d887ffe18.zip
- q/a - missed glibc-2.3.4.20041102 in last fix
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/Manifest14
-rw-r--r--sys-libs/glibc/glibc-2.3.4.20041102.ebuild4
3 files changed, 7 insertions, 16 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 97c47980a421..569af0fa4e18 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.295 2004/12/05 20:17:51 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.296 2004/12/05 20:47:32 solar Exp $
+
+ 05 Dec 2004; <solar@gentoo.org> glibc-2.3.4.20041102.ebuild:
+ - q/a - missed glibc-2.3.4.20041102 in last fix
05 Dec 2004; <solar@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
- q/a fix - hppa is the only arch with an upwords growing stack and thus can
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d741f5c4ced5..d1798271dba8 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 d59fdfb3aca88476d792b71922c765a5 glibc-2.3.3.20040420-r2.ebuild 21630
MD5 48dcbf88afd15efb62b4313337261968 glibc-2.3.4.20040619-r2.ebuild 21077
-MD5 c6dbd9da0f3713498ad1de30636ac8f2 glibc-2.3.4.20041102.ebuild 28083
+MD5 e40adbd7f73d27637bba5b0697584c78 glibc-2.3.4.20041102.ebuild 28084
MD5 53024f9633fba13ec0666419d16f75e1 glibc-2.3.4.20040808-r1.ebuild 23328
MD5 c0396354563519610892affaeffcbf99 ChangeLog 62306
MD5 e4f211c5762191a6fce67b15caf38c31 glibc-2.3.2-r12.ebuild 20537
@@ -134,12 +131,3 @@ MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
MD5 ad71dc5c3f84f026c6e28865b2e90fbb files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch 2337
MD5 973e31ce24c9622234c4293b367de6b3 files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch 2288
MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iQCVAwUBQbNtGZ4WFLgrx1GWAQLW9gP+Prttcxm3jXyexMJPF+gOYiWqG1MFkFq+
-FOGC6rk7mhl73YLrBceGxDwubBQVxelkf+E5ZYHc6vzbrS/56lOwjWbCWaQLa/Zk
-TBgc4f/Yqg5+XBpStounOepub6hsz1vi8Nwg9WLGDIfoGmpk001+kd1NzAEI21TQ
-f/SaSqHqXAc=
-=0b6Y
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 7265b34fd93d..c552f55abaab 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.10 2004/12/04 07:23:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.11 2004/12/05 20:47:32 solar Exp $
inherit eutils flag-o-matic gcc versionator
@@ -461,7 +461,7 @@ do_ssp_patches() {
# __guard_setup__stack_smash_handler
#
# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
- if use hppa ; then
+ if use !hppa ; then
epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"