Update sys-libs/glibc to mirror portage

3 files changed, 19 insertions, 18 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9dd2d331..5afcbf34 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -4,10 +4,10 @@ AUX 2.6/glibc-2.6-gentoo-chk_fail.c 9407 RMD160 230701dfacfe2481eb49e5384fe4ebb5
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
-AUX eblits/common.eblit 8813 RMD160 8d10f7a7ae5234f508c9ae8e144966a96dc6145c SHA1 ae7c349e21cbda0a9eccadf80dcaf5976e66667d SHA256 e4a5cfe950e47e098af0d82099280578c6894ae8dbda03239be8379c59986a84
+AUX eblits/common.eblit 8750 RMD160 9fa324e817e6e280681af464ff772a9455a7aac1 SHA1 72ba9da3dacc52c5985571e46bbabd9687daf798 SHA256 e92a101501f72fe529bed1c21b6049a7526b4f1658e9cb882b5b9f3bee336440
 AUX eblits/src_compile.eblit 5275 RMD160 053edde7b9ed3b334515e1fbc118c008b7359135 SHA1 a96b8d1732b7eca1336b63ad77d061a6d42a662e SHA256 869f2eec38b883d357ecc63d726bc7fda442301823e88cf8afea10b76ee18e0f
 AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e
-AUX eblits/src_install.eblit 8003 RMD160 449ef3e55a832f8407d4a6fc9237ae32bca922dd SHA1 830f2a841996903a95754f446dbf2cf3acc079f7 SHA256 4b0807f5b716209053fe607f001e80f9d0f818d994f96c294c1cc813be8d9eeb
+AUX eblits/src_install.eblit 7893 RMD160 789a4518bbb0be8a028f331e2673e423d2717a93 SHA1 7288c1bcc7f05e8aa0d4f90d4c63be128a2d225d SHA256 d5f0cb0345c33f66a90d73e7e0264867d9bcf4a137190d6ae4008d63a3b7bd56
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
 AUX eblits/src_unpack.eblit 4971 RMD160 64a210a53ca8b8048e9395ba5b716dd064abf755 SHA1 29b1936f649de5606feb12c29f726e312ed3401f SHA256 047d2b0cf9594333bedbfbf4954f939065e8632617151573edc230d3a5825152
 AUX fix-sysctl_h.patch 376 RMD160 b5dd68158224b09ddc42986be02351c74f81e0a0 SHA1 5601fbea6961368bcc192aef78e96ee2c5310713 SHA256 3a589f63fd1f3f6c5a00c66a10943d3d64630aefb1eb5b37e7f2a856fcea234a
@@ -25,10 +25,10 @@ DIST glibc-2.6.1.tar.bz2 15767401 RMD160 a58226e394780a6996d608febf5881134990919
 DIST glibc-2.7-patches-1.7.tar.bz2 97989 RMD160 f0404ab12f8ed7d6a42449e4366bc5555894fefb SHA1 b0e7b27fadb3c53069bb5568b93e833c0783f9d3 SHA256 4f71345bc2ef73975f921a5bdbc4841e8911a36fec7edc17f1e758a9688a7153
 DIST glibc-2.7.tar.bz2 15976860 RMD160 c5c0b5a611d26956c46a289478b3349cea2ebf72 SHA1 ccc70e95db826e4b1fd3b484154402fdc3df88f7 SHA256 4224a522ac4ee0fd89eb337e7505e280dfb05e2fe1ad44339ba8874081c0451a
 DIST glibc-2.8-20080602.tar.bz2 16235726 RMD160 8781f2b1dbd22c6579208a689be38a444b5242c7 SHA1 68c2bfcf5f385449c3cb7efbf1f0d425d14cdaad SHA256 142eaba19eb85121206ee034fd828ca5dcd1bf2bfa940fef92c37457c06a6d48
-DIST glibc-2.8-patches-4.tar.bz2 97815 RMD160 121cc203c8d52ce4ed26220d3caee4bd2827115d SHA1 0635ba447534fa74febdc7be7d095482f27ad395 SHA256 32117a6cef970c645f2e5293d2e9fffb0e1b32ec2f7578247f271bac76e753e5
+DIST glibc-2.8-patches-5.tar.bz2 102998 RMD160 364bb746714ac782ad4d36c180c3f1f5754cb858 SHA1 5756839e3e6abd7e4e743d78f18d7759e94fc229 SHA256 9014bc3a25e5bbc4e68c7bb4caef50e5e418f2925c62d471a793842a7af928bd
 DIST glibc-2.8-ports-20080602.tar.bz2 469234 RMD160 57ae79a79c6f82f5ff217e9052f4569c136dca7d SHA1 c3a45ea27c9eb1bf99f1caafe085b50951089384 SHA256 1f3665e80b5832f7d281c109bc2f5412521cc9ccc3bd7b499fd493ff5eb9aa9b
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
-DIST glibc-2.9-patches-2.tar.bz2 95889 RMD160 ec322f454862cacfdc6cc2a55da4e18a9b78b09a SHA1 df9beb6254767d1348537d004bd77f001985f95c SHA256 a2706c2562798b72a0b13ab4bf486b2a2f60afe2e83ea1302a925d34886d9d5f
+DIST glibc-2.9-patches-4.tar.bz2 101326 RMD160 b85df75ae68c3a34ea3311cb127e99a0b2e9f230 SHA1 fffe619e2093f27e33dcdc2f7dc9f36c8e7bd277 SHA256 b743a69eedfeb7b3c08a9e7b4fcbeb51f4fbdfd964ac8884c72d2a18e8a2c5f1
 DIST glibc-2.9-ports-20081201.tar.bz2 487663 RMD160 80eb0035ed2e021e79755d4151ccd6d73cd78d8d SHA1 90a6ecbce37aabe6093c4dd0c8817cbf86321627 SHA256 19bb6e89855171d7ae01aef92054dfe4524521fbc13c67bfaa3ee81944210744
 DIST glibc-libidn-2.6.1.tar.bz2 102319 RMD160 20b86f6c40365084898916fe614b210a7b0ec2e7 SHA1 5440648e71078ecb179c4501b5f6717b54294945 SHA256 67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451
 DIST glibc-libidn-2.7.tar.bz2 101939 RMD160 17a9692cc59d9f41d6b9fcd68f283f401e206483 SHA1 2338cc9b5795f5e97a19aac6d7d00ab750e81ac3 SHA256 07de78810a5320d696792b67131c4cf3d6654aee015a6b74820d66fb00799000
@@ -36,5 +36,5 @@ DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 EBUILD glibc-2.6.1.ebuild 12396 RMD160 6e71cb6773c96e650c166589d962487cec7856f2 SHA1 6fcf8e4d8f94854e0be99ff5d4fb938ca382f2f5 SHA256 51ffcb3255af4bc023ad4eba79426d5627e0fd1d1393840c19528b1f9eee3f27
 EBUILD glibc-2.7-r2.ebuild 12474 RMD160 d886de1314f1524d3f3b36394d10f3c280c11882 SHA1 d7941db98fe12bff938fc26b7c42a6ae59096dee SHA256 39ba9d30d3f7f80e3dfab20b251cf03b4ffc29be71cbf419f30f6facf9fe26ce
-EBUILD glibc-2.8_p20080602-r1.ebuild 13281 RMD160 7b73957dbf007233d138d6371ef200f079013854 SHA1 66a748eaacafb341b83be66c864b2ed27d9d361b SHA256 70cae78bf96f58dc4b73c87663c0eb42511c2e7899435382c00114bab987bd6a
-EBUILD glibc-2.9_p20081201-r1.ebuild 13317 RMD160 bda5ea359b05c5bafbc0fa6b7c7f72d8efacb76b SHA1 8199b712a8e63a571ce34022921cd8dcdd5ee4ae SHA256 7b3050cb9449248279569b6a5a1b4bbe8e4bb454287310a9bd88a7e3cbbdcae0
+EBUILD glibc-2.8_p20080602-r2.ebuild 13279 RMD160 c57514cb703698064136fd074793b9dd30218871 SHA1 cc472a4dad7f4f4d37b9e2a484911d39f33b231d SHA256 7028937faf61ac9e087922eb540c527e8a98872bbdd3f981aba7d54924e800d0
+EBUILD glibc-2.9_p20081201-r3.ebuild 13379 RMD160 db6517570a1a1f1e70ab8317e0fa8b08d03c40ed SHA1 23eb7716df5766ff832bc6d80e9b516832633d3e SHA256 14fe5f2ea4014862799b2996f53c229ad6c694815e7f5e5aa8a1ad52b177b617
diff --git a/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild b/sys-libs/glibc/glibc-2.8_p20080602-r2.ebuild
index 4c6329e1..a65e340a 100644
--- a/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.8_p20080602-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild,v 1.1 2008/12/08 01:02:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602-r2.ebuild,v 1.7 2009/02/19 01:02:47 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -24,7 +24,7 @@ SNAP_VER=""
 fi
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
-PATCH_VER="4"                                  # Gentoo patchset
+PATCH_VER="5"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 LIBIDN_VER=""                                  # version of libidn addon
 LT_VER=""                                      # version of linuxthreads addon
diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
index f0dc0706..44638af6 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild,v 1.1 2008/12/27 04:20:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild,v 1.2 2009/02/21 22:56:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -24,7 +24,7 @@ SNAP_VER=""
 fi
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="4"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 LIBIDN_VER=""                                  # version of libidn addon
 LT_VER=""                                      # version of linuxthreads addon
@@ -178,12 +178,12 @@ eblit-src_unpack-post() {
 		epatch "${FILESDIR}"/2.5/glibc-2.5-hardened-configure-picdefault.patch
 		epatch "${FILESDIR}"/2.7/glibc-2.7-hardened-inittls-nosysenter.patch
 
-		einfo "Installing Hardened Gentoo SSP handler"
+		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
-		einfo "Installing Hardened Gentoo FORTIFY handler"
 		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-chk_fail.c \
 			debug/chk_fail.c || die
+		
 		if use debug ; then
 			# When using Hardened Gentoo stack handler, have smashes dump core for
 			# analysis - debug only, as core could be an information leak
@@ -195,7 +195,7 @@ eblit-src_unpack-post() {
 			sed -i \
 				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
 				debug/Makefile \
-				|| die "Failed to modify debug/Makefile for debug fortify handler"
+				|| die "Failed to modify debug/Makefile for debug fortify handler"	
 		fi
 
 		# Build nscd with ssp-all
@@ -352,8 +352,9 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ...
-		/sbin/telinit U
+		# Reload init ... if in a chroot or a diff init package, ignore
+		# errors from this step #253697
+		/sbin/telinit U 2>/dev/null
 
 		# if the host locales.gen contains no entries, we'll install everything
 		local locale_list="${ROOT}etc/locale.gen"