Update the hardened pie patch for glibc-2.16, bug #442712

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xFD79807F

4 files changed, 52 insertions, 18 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index dacc5ec8b0ad..ae3dad94a76d 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.905 2012/11/11 07:24:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.906 2012/11/11 15:23:16 zorry Exp $
+
+  11 Nov 2012; Magnus Granberg <zorry@gentoo.org> glibc-2.16.0.ebuild,
+  +files/2.16/glibc-2.16-hardened-pie.patch:
+  Update the hardened pie patch for 2.16, bug #442712
 
   11 Nov 2012; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_install.eblit, files/eblits/src_unpack.eblit,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cfeeb321d03e..513b59e5be1e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -7,6 +7,7 @@ AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 SHA256 dcf78c6524c222
 AUX 2.10/glibc-2.10-hardened-ssp-compat.patch 4802 SHA256 bd6f0aa8eace0a935731749e101d5fe30210f9edb65f2f5ccd425cef581ddce4 SHA512 16fc6cbf366c3a0f476f28da8d4e465b1d894f68d33ebdb02de60d6b22bdc6341915d8529952fa4213b11c377302f18a63c462898fe0e4b13f5ec9e3ceda96c7 WHIRLPOOL 059e84269286b285261cc57846b34462524661fef3582396a6b301ee2dd156d2511c88f17f52679e4d5fd96ae0ed6673c8b75a32048e40efa87fad34da6cc066
 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.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
@@ -71,26 +72,16 @@ EBUILD glibc-2.14.ebuild 8689 SHA256 db0b38c819328375f61f1eeb0b22c5e2c8df1ec9329
 EBUILD glibc-2.15-r1.ebuild 8424 SHA256 edb4f7bc8cd74932b2fac8de0b0bc443f65ac4444ac15832b953c3672aeec7b8 SHA512 a5a622d2c0059d8176bb51db8106ba1baf97edbcbad31dd6a9f955a5b5a98abf857e56be82dd3abd6d36d2f34875a4dda09f0fd9103a215d0f080ab5d06e90ec WHIRLPOOL a0740d6c99d4443c4ff5f8b9632fc5992d39a175dc6d058673f7944c16f63017023ef57f3fcac1e7832a249f2cdd930ed8bfcad32bdf41764d8160297f7f04de
 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 e5dfda061820bbe571fdcf47adc4eaab8ce43a7c78274f97fee50895ce736240 SHA512 b1d62e45ea83f7a83bb4e4aec0e1404f7cf435ce78a848942285ed7d8523d4436f46a1a3e75c9904b864f1da186efca0b13c77db33da790f41e1b7b6dd65171b WHIRLPOOL d884f4a57626083e8ae60f02789ef0895362a36672ce8d17b4710759cf4a0baae548884aae19f63f2cb1460e4309c1e31f9ee81c63b1ec5d5dbe01dcc85c64e0
+EBUILD glibc-2.16.0.ebuild 7776 SHA256 73114ca14769945bc21b913072da02f092c2dea74c08e6379c330fa96d09b3fc SHA512 7e1d69bac18668560ce06ca09e525cdf994329230e82232bf1758a1d35b68d621ee8cfe613245dbdc68c17c9aa2cd85bf89a38e434da36ecefaea853615a6cd5 WHIRLPOOL 4c83ca63518f9fe953c27fa6483f591d1d010461b6bf87b35f4b3b2868a23deb15287a21f74cfba59cc7aad2fd4a4d32a72bfdc63aa5bfc43d8a2f5869c60932
 EBUILD glibc-2.9_p20081201-r3.ebuild 7057 SHA256 f3b5387b76cc73f1af5af72b2b301bfd78774cc352572c1d824d3d9424c39e81 SHA512 d4c9396a6c62c5f76b92120788bff5b74cea5e2750d5e4306fdd1fde2039e8963eee429ad7a2be37681ef4b53b1b30effeab485f506bffc75d549536a7702292 WHIRLPOOL 2d403f60e15c7a508dbe240de1ba7682b5cb104c7d081ffda05eeff4c96877e6a8d291bc6dd9aae39752ac35685c44c09be81854ab1ad1b9a2aaf27685170e06
 EBUILD glibc-9999.ebuild 6555 SHA256 98b8a8e43682c3efd5d9ff6153d23c6d94bd163154a0dc984133d618bfdc037e SHA512 659ac9fa22d214b360cd8124a0af59fa7ad1ab5fecba529e7c0cfc2704de447c56bd7e63856f6d60805c015f86ee467f365c952ae92f7bca402509d1a25f44fc WHIRLPOOL 9cae2e03e5d5c16d99016b4848708f4c5e89934e5cce4268350132d5b94725af6d1d597ccabf156169010e02e42e65c230da4a99f3a64a190f3193e3d92d8512
-MISC ChangeLog 52196 SHA256 3daf3d70c984a08600f5fe65144ea6d7e7cce65f1af697a74eb94b1a6d764e03 SHA512 93df4ba24af804c1cbbbd7b4cc945b88967f156064e2a76ffc9926741f93165ad66fb121c37879c0a3e83dd655f918eba6221f9dddb6f8cd12dee5c189106813 WHIRLPOOL 727de01c8128d9b00d2a19b4c46e8ab4f1c5881b48bd69d0ee3b9e250345b80634abd6e287d298f8a1cfdb6a8c3dc159e23176d643aea1b54efbedb35997bf2f
+MISC ChangeLog 52366 SHA256 290de47a384f48ed3994a76ace80e3eee41ce21cffbfb92f6ff2e377717a56c3 SHA512 0c96c3ff397853e73eceec8c5b2dbd6c92059f1acdee6de999cf2c14a1e8e33b6a23f2c9ff0897bbbb9327ce84e98df4eb9697251bcd716be041441b32de3bc3 WHIRLPOOL 3306584008902a7cf17093a67a2a7db60cb22fbe513fec64673f0c707ce1caa0788ed93eda8e288ce2f1448d98134fe08b3b98a9fc5db85232347496971ecdd5
 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)
 
-iQIcBAEBCAAGBQJQn1LJAAoJELEHsLL7fEFWVPcQALPy/Qtof8Du6pFvEdOXyAlz
-yr3vJ5DsV/6CGYSSwPW0A1YddJuzzHjLCuUZDDxTveH9wn/MdRh6IkBrfjAkgfxJ
-aLPo/HiMTiWocARFBrq9Afu+KkvYqD0pkcpyDaeCWeWcpw29aOZ3yy5PU4D+7Tyq
-DNCSXlRQy5enKDFmR4M7oahDgiWhjVhF20RXuJSmZy4KFt0faG4p48sUEGabEK3P
-TPE8/uOEqRXsmeACBZpNWaOIG8fHc5achs0cJFGz2t5C82yVzZ99SCkAm5ZGCgiP
-yqPwue4MX4+A65nGtXx17T4AOQ++wj3Lf7nFv6YVn/c3dlR/gztb55PwrWICK+K/
-fxL9u2um9WVOPyoWCBANvkyJwkXbUPrRsaHZ1a0+/23h6eUvki/3addf31wjZ7HD
-u7yDeTN78flWLMQdTenDE5ihKNRqac78Yln+dVAR5VbmK6fdmGCOnvJkTkb7r9bQ
-gn3IfmipsWF9sErVvfBVWUz7n8UUu9kcYkO+eWiadufH/bkRqggZUC4G9JE2tG4d
-FgAhFB4xQCIeKu6l05nZ5fJBE89N4R2C2apxaPiaSNNiH9k1sYWuU9G7Vl1Hzifo
-LDZuR3D4boX6otVVO9zJZBhAE5RAq9QspE1wwQkYjdTIUfzguy8zEfWNsHg3fVMd
-0aRcCL8nm+3BYBv++Mns
-=NETE
+iEYEAREIAAYFAlCfwuoACgkQe6JQqv15gH+iowCfUk3oXhVWdHmb9suBS4fg+s55
+jtcAn0ziEeWXNNYfV630lHEaUPF0a99M
+=vrzW
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch b/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch
new file mode 100644
index 000000000000..a850a61a272a
--- /dev/null
+++ b/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch
@@ -0,0 +1,39 @@
+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) $(+prector) \
+ 	      $(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)
+ +interp = $(addprefix $(elf-objpfx),interp.os)
+ endif
+ csu-objpfx = $(common-objpfx)csu/
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
index 40f28f981bb9..10171877ae98 100644
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ b/sys-libs/glibc/glibc-2.16.0.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.16.0.ebuild,v 1.14 2012/11/11 07:24:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.15 2012/11/11 15:23:16 zorry Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -178,7 +178,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.12/glibc-2.12-hardened-pie.patch
+		gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-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