Update hardened patch by Alphat-PC #448876.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 65 insertions, 18 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 96efa64d63d9..a80e980a6677 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,9 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.912 2012/12/28 19:20:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.913 2012/12/28 19:25:42 vapier Exp $
+
+  28 Dec 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/2.17/glibc-2.17-hardened-pie.patch, glibc-2.17.ebuild:
+  Update hardened patch by Alphat-PC #448876.
 
   28 Dec 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild:
   Fix building w/sed-4.2.2+ #448224 by Viacheslav Gagara.  Fix use of gcc-4.2
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4c7e1cda500a..771fee0c37f0 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -8,6 +8,7 @@ AUX 2.10/glibc-2.10-hardened-ssp-compat.patch 4802 SHA256 bd6f0aa8eace0a93573174
 AUX 2.11/glibc-2.11-hardened-pie.patch 1492 SHA256 74277f76ace9cb6b408ef7c1d43a3604ae0d6c1af539055aeaeb542d2bfa2a46 SHA512 31ad12fdafc20f783bde32fa3cb477e18d19c5436309b0023284c3134f99c849b0281ea7815ae7509b96f1a88e9c24d52805044cd1c65a88a1a62eebc519a0e5 WHIRLPOOL cf3fe8c5e164623bf553487cf589f85eff28d1073e55a87ef14da716ce313bfaec0dadbf322f2e705c1d4f975458d9cbd6f2eca268a9dc5dce16e54305907aa7
 AUX 2.12/glibc-2.12-hardened-pie.patch 1542 SHA256 9d11da52900a4cfdaa9052476029cb1b4c8004dfaef3cf446f3b728035f75fbe SHA512 97abb62a72d95b07f546658846718755ed78286b11cb72b2cf6ebc809afb1e775ca860e3903f9936ee54761b6d6bb309e822957387900454dd3c66be35ba8148 WHIRLPOOL 4b9b95d1c6c6e02ba21ec43f382a1d932ed8be5ff548a828c3e9a1d945c44cb8435fd502f6c8becf6a2c19bd23c77ad003598b3b3b68b7bad5a5af79e92d6077
 AUX 2.16/glibc-2.16-hardened-pie.patch 1570 SHA256 9a8d8a8268605251782b1fba509cda090f39f56edc8a5497c7b4acfc428041f7 SHA512 1dff16b1ce4ba6246336d19fac21ea6e8d5710e138a23603fa6b79896d895834b6d28bb1948c83648120ca1d038805db7dd7138ba3e28e9071254d6320cdc092 WHIRLPOOL f96487ac4bd95a99e9e70204c686c3f19bb8238cfd4a9856b031be58ac23927886f228a8b4add14213e0489a204c51ebbeb8a376311305025116b8ae45fc90c2
+AUX 2.17/glibc-2.17-hardened-pie.patch 1784 SHA256 bba32e40c73aef20122b2825f31e5c3aa058b61feae4f32f336e1941f83f82d1 SHA512 9ecfe2b6c8c982a42786181d6507d5fa588a6868109065451f58a779848837bd5e69c32a24e43a186c2ff63a9784015c51487e342c87982ac074139e36c169fc WHIRLPOOL 1baffbef9e6d870ea2f2ae5be014b71020a213a1a11e9856fa207545867de444ed164cb926b2aac23471854eaaf72a87e38760702b32bfcfa639add8733d925e
 AUX 2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329 SHA256 b5cf51d1ff5479d09fbc82992f126ca4969006c90c3a2ae94ad586d4902d791b SHA512 939ec7da977837ef46aa8894f99ac06b3fccfc36dd672889b85ae8cbbfc9a963c5d0c031d776aa2feee29ddf8341b4cc7a50ea19b7c6f7e80df74eef5f1fd977 WHIRLPOOL 47d248ddba815a517aed9b7dbfa247bdedf293cb5adad8079be803ea4a682136f01b47fd3817a1696b3758c4631d1a25376bf58ef039998ace4a6b65807fe75e
 AUX 2.5/glibc-2.5-gentoo-stack_chk_fail.c 9058 SHA256 067fba2a36d2630d50198c44395ef208cdf080508f1b716bd3d079f7b964e2df SHA512 2d404bec1e009d111b775fde620102b3d0ea7614d07ba31350940f2693e937e825acc43d1ab94bad2eecac61d47c696098327096dff8f08b4b7312d0873d71a6 WHIRLPOOL bb27ef90afb256d3822787b93574d4f4f5632995663e08b7201db17a4f38f6e2a8fd6368aaf699a808cd8f7acc346625b5607dcbf1e88f8b28dcc6d3dba92399
 AUX 2.5/glibc-2.5-hardened-configure-picdefault.patch 794 SHA256 0c0359f567e4ad2d3184618bf6ac7e6102b703eab6227c7e9a4ff4dcdeed2c91 SHA512 99caace6c3528db400f8039c3f5aa65a2d5088d9758894c8a49df2b5045226a4056972de2d162411617162edd9023b6c6f80d85509638b5d68a8d0cda40adafe WHIRLPOOL 1271cea2155149e789f1242759e516443c5cf152ae9612d91d2a25a727952684eb043fbcfb38186a31fc6a1568201de5ef40af45436b137453e0582f2f6facde
@@ -75,26 +76,26 @@ EBUILD glibc-2.15-r1.ebuild 8424 SHA256 edb4f7bc8cd74932b2fac8de0b0bc443f65ac444
 EBUILD glibc-2.15-r2.ebuild 7973 SHA256 a18a1a3912c994995010860a0bcd5e08fb58ad04e04fe0a0c74866fcbd89cf8f SHA512 a4d66311bf59b2568950d4f3a24e215347c7dc0ebc726bb5b3afd0a20c1068f72b1719195d3112c7619bf4e8345a61ecce96eee57832589854b377ad3afd1619 WHIRLPOOL e7106b12d58b1c77e7861addffa46a7c4ce134aa17373dc87f1b806dfa9bca369ffaeffe07b1991d4e4b1fea5307f52ec88077d5dec9e730c8599a8391e4af42
 EBUILD glibc-2.15-r3.ebuild 7978 SHA256 a8b190ff718372c1e0e84dba9cc2131bb7109bb30cf537fc5ce9ea08ba84adc3 SHA512 234eed1321220d0f0b494a436fbd475b8a4e577c1d4c855b0cfee60c092c412f03aac603f12db2b2b473f8f41bdbfd0082ffbc7a22a7bce6e3388352f347dd8c WHIRLPOOL a0f2226bad463249bb0227f8a884f4c9eb7e9d2db9e2604b970f58ba6cf17dae81c9062676f4439e7b1187f50c3a048e7b8f250cd0ec04862eb3514766a4d01d
 EBUILD glibc-2.16.0.ebuild 7777 SHA256 a7d7a8f1629e33e599d5349aacfff3335ebde0646c070ca6a0f54fa879e8f1b7 SHA512 3d05e394ce3722fce974a6da5c62a0ae55eb181429dad1cab6662aa724998f8c9521a3a98430bc27f41f44296e43822e5a718acff5aa5d6379280e7c0b2f330a WHIRLPOOL a13f35b732df783398045bb5da05eca944e8d3f67b8868c79c68b7db8c8410f3126892968c26bb8478d5adae70a3db592e8e6dd31f15672c7c9e03ead0afb245
-EBUILD glibc-2.17.ebuild 6578 SHA256 3ea11c6e3bd321dc4ceabb2e6ad34c4676cf45199e111dae087f6b9d37a68fbe SHA512 9fca50721f8cb68c4526aeb8baeecdb17c22b1c1f6e1cf69414871730fa5cecc8bd231d1f59c6fe0254086958872fc51663f1e996bb36f8a4802cd1c61b8b997 WHIRLPOOL 5f74a786fe61bf2d6f306ded4edb87cd4f7c79d1738be0d7db31ba45b87320c5f1e607f1f785556017d38f6d688d93eeb5e89213ea62663df3197bf8671f3ab9
+EBUILD glibc-2.17.ebuild 6578 SHA256 866642f50c759a5caf8ee19c221fdd39947fd0221f3be02b1cf8d68cc1663080 SHA512 7d5477cf93bcf338041754bd7ce25e89cb5253463ba47a7aad3237aed2cef3cb91cd5a5e3432db2f1f3fa2c832818ca3f8b3d8c75a925d1adf0292e49c1e77f1 WHIRLPOOL 462a91a518c3ae114650c12c45b6f819bb54442f6703c109ec16dea820047b9ce8beddb75bead1c9613c8c6db1cac460285e6ac366773ccafacb771d84aab93c
 EBUILD glibc-2.9_p20081201-r3.ebuild 7057 SHA256 f3b5387b76cc73f1af5af72b2b301bfd78774cc352572c1d824d3d9424c39e81 SHA512 d4c9396a6c62c5f76b92120788bff5b74cea5e2750d5e4306fdd1fde2039e8963eee429ad7a2be37681ef4b53b1b30effeab485f506bffc75d549536a7702292 WHIRLPOOL 2d403f60e15c7a508dbe240de1ba7682b5cb104c7d081ffda05eeff4c96877e6a8d291bc6dd9aae39752ac35685c44c09be81854ab1ad1b9a2aaf27685170e06
 EBUILD glibc-9999.ebuild 6579 SHA256 dede0348d5973356cb704ac9c5c23c9ccfe9fef3cc873ff031802048ffcf1ebb SHA512 278fdddd26982feb33e053b24ad1daf11f077d2453bf7db98d3620269eae3abe363434041f64b57d22853d67aafdab3de07ee8167a20a7a6ea91d19881d7ec82 WHIRLPOOL 788958819b71524b79995acd6253fdd974463a2bad55bf75cd334619ebe87ba8d5074e86375bc45ae95e8f68f3dd98030b566234a205d560dcfcd1473000db96
-MISC ChangeLog 53350 SHA256 6216f3e1dd9ec19b6b01e55da8ee502757eeb1d416751c943c404a7b7931d6f3 SHA512 9ec833307206c266a0ee58d99814e1cb4da6c47b18735c4c95f766abfe028c15b7f1f0deee0ebfc6d25f44d5fad1e10499d2ac09940da15dc9757a38f43f10e9 WHIRLPOOL 4abe0608ed09d011fcca69dea9e8dea84a21f811daa4860f683d0baec289c408820facb4aff48d8733dcfe7e3fe3acaeb104cec85d94c206228e804f1120fd3f
+MISC ChangeLog 53511 SHA256 d7483722e1d5dbc80b2b50d694d0cd160497232a226550a4a69931ecca7651ea SHA512 07c1351a68570360e1850b299c53cbcb62c5c9e7187fb8fbc663ea61c4a9fa7030e7e8556e0978f964b95413fe2ab4b852686e489e56643b95bfb71a3423b49c WHIRLPOOL 9b03bedd0e0e410f64255e3b27c91364887eb2522bbdb4615cef4842e54444fd107945f608f7937bb17c79e866c0783914a290116a974120395ba5e48639faff
 MISC ChangeLog-2007 108587 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17 SHA512 405c93cd08d102ad1a9e40975563e645e982b5baa238280c38118b46b7c828ca924c73766c254cf24eaff255b16b3f4c8133d2e174cf3e47b704ff49d754640e WHIRLPOOL 4ab79bcd243bd4281898e93987b49a2dc44fb7ef2df9073708dd12223bd01f595dab8f08f342bd5dd8d0fc955ee031b11ce70e1cdc118f7dcc5b63f90d785e9b
 MISC metadata.xml 406 SHA256 e6cbc11651d304035d704081701900a8b373ee3a0ed2f3f4a7e3f3a8d926a731 SHA512 3afe4ea0be7d1707571c23a7aae8490620a83d748ad672a18ce602503f37179cfc12d3bed0c18398c2cc8e74005d2c51ac320fd1722364e5df2cb3599488c164 WHIRLPOOL 1c3f5e0cc851c976259c6749f6a611d6cf415a063b2229e65ae9dea80e623a52514acbf977b3e439009379c4ea9aa491e6c423c7aac70a1c8fd573c4f40816dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ3fFIAAoJELEHsLL7fEFW6X4QAMMK79Zz4zG06tsAf3QFHDip
-oMaaysnLjXyPLT3KcY8F6CzY1DNQnHnehPgiTQf8iJqqn5bg2tqHFWDUeqJ5f3rt
-fR90hp6Zg03GOdjSMOfStCsorFnW+fnAM+hbvxZCMj9sfUhJf4QBmM+uwLLmwZ02
-hA6aAIiIrSnDxxndIzHCNlZw/Gn1WFjOhIMn9O4zNG8vJeLqUjr3zC+Ditu9ooj9
-gx41nj795oZ227N+Bg6hoo9GYm3T8LZkeCa+RSXuhs4JI6ltCCf5RnRzTpBdMSNW
-G2lgQd9fn1WKjVYY+vzyMNPEb2XTqFxPw3nwLA3DV+3BWV4gW8E/2JXcsgMpUWaE
-unclMkRLdznZUDtAVpq9zRhLpTmL1waBtn865vLezNoAoijEua6ZfOITRHmgtC9i
-2EYnkH5F8DvRNYnWPLEvksv6m1avlT8OMGHLu2PoXEvP9SU9M0lXgZsjD/w9VNvn
-VNVuuC1RNf4Gk4EYJFItuxszjTO/sLPQ9m0EjTxLq7WUb5SS19xitnhgHQ/3oEd0
-Wo5+b71F/0NyQrr2L2b/JEgeCDdBF3GujQnxS8bbbKpnxy6jLJy457O1+a/8f510
-vVqU9jg3+F4rBh1p8rcPAz3B/xW4gZD55OEnYyVlqZ0coMF8sJGEbfEv9U/QsG78
-qo+GC5mpl9iC5t9mfS7S
-=2czy
+iQIcBAEBCAAGBQJQ3fJ4AAoJELEHsLL7fEFWfGMQALxUfVS2lemUIGGakeHBBrMn
+nFz8pvvOnRlX/0jN1xu2gET2ey83ejGXBfOG5Zx0xNGv7F37NZkHdxaAbn5BLpcx
+V9RKGvs4hFoKRUihDE/fMW90no5xH3sFTC1cCtnf7IfbUkOpdk86HaDRWE+EmMdG
+jaau4UZZdEqDYwZmpXYcJQk86NgfMSOvANEqa8eF9Ic2ajXORhxCVMOvyhNMWzAn
+wyO7OmT9MlxXJ7+v7hambtMROlJBXCXK1xxvZypZHtoSh1cmRqXbYqN9baJq0m0p
+i+wjhmeMTStTUFl6UjAajEw1auOVuY/FGM6/pbnPRlBTmOrnId93d8qDWGsiAsxt
+K2K14rnM9BeO4SJJEvl9xnhEObC2GHwkCrJGOXmloaUOdl3GkJQZKX8Ji2JFKXY9
+kaDL9UMG8ZIjc187VR/xNz7eKgRpxz54ApP+oU7x+Nek+tdHhRpn7SmaOX4/xkgp
+Vyy/Z5gr1T+0NuTFmA39buRIugetVkE0Mp0gUUmuNnMBTl9MC5OP1NbGVxIxHmGS
+3x9HZ8cSo0MKmLj6V/ZziJzP7jG90YAzdSjzQSstL7RHyIyRI8OEfPBlxJlnWqBc
+yKu4N/bkVatwHjWJCAZ4UW6vprF/+V/V8j0WERiUPy1oS4HoW9sgQSIs0tDIwAY4
+/23xwssvKEj2+IyYToHr
+=vUN5
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
new file mode 100644
index 000000000000..da4fb82539cf
--- /dev/null
+++ b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
@@ -0,0 +1,42 @@
+2012-11-11  Magnus Granberg  <zorry@gentoo.org>
+
+	#442712
+	* Makeconfig (+link): Set to +link-pie.
+	(+link-static-before-libc): Change $(static-start-installed-name) to
+	S$(static-start-installed-name).
+	(+prector): Set to +prectorS.
+	(+postctor): Set to +postctorS.
+
+--- libc/Makeconfig
++++ libc/Makeconfig
+@@ -447,11 +447,12 @@
+ 	     $(common-objpfx)libc% $(+postinit),$^) \
+ 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
+ endif
+++link = $(+link-pie)
+ # Command for statically linking programs with the C library.
+ ifndef +link-static
+ +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
+ 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
+-	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
++	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
+ 	      $(+preinit) $(+prectorT) \
+ 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
+ 						     $(start-installed-name))\
+@@ -549,11 +550,10 @@
+ ifeq ($(elf),yes)
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+ +postinit = $(addprefix $(csu-objpfx),crtn.o)
+-+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
+-+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
+-# Variants of the two previous definitions for linking PIE programs.
+ +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
+ +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
+++prector = $(+prectorS)
+++postctor = $(+postctorS)
+ # Variants of the two previous definitions for statically linking programs.
+ +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o`
+ +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
+ +interp = $(addprefix $(elf-objpfx),interp.os)
+ endif
+ csu-objpfx = $(common-objpfx)csu/
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index b3504014415c..85aed10d9395 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.1 2012/12/25 21:48:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.2 2012/12/28 19:25:42 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -155,7 +155,7 @@ eblit-src_unpack-post() {
 	if use hardened ; then
 		cd "${S}"
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch
+		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
 		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
 		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch