Bump patcheset; add patch for bug #284393 (compatibility with binutils 2.20 betas), and make nscd init script not use 'strings' at runtime (bug #285308).

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 19 insertions, 11 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 549504de88c7..08f1df850340 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.641 2009/09/13 15:19:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.642 2009/09/18 15:15:06 flameeyes Exp $
+
+  18 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> glibc-2.10.1.ebuild,
+  files/eblits/src_install.eblit:
+  Bump patcheset; add patch for bug #284393 (compatibility with binutils
+  2.20 betas), and make nscd init script not use 'strings' at runtime (bug
+  #285308).
 
   13 Sep 2009; Markus Meier <maekke@gentoo.org>
   glibc-2.9_p20081201-r2.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 20d3b79ae8d5..27314eec981a 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -111,7 +111,7 @@ AUX eblits/pkg_preinst.eblit 3285 RMD160 990d7ee7cfa1ba79a19bc6c01c05817ebfc0ee9
 AUX eblits/pkg_setup.eblit 2814 RMD160 8352c4b9cc460b7193e17be8bca227db5b6df5ba SHA1 8de7ea78e364521b55574b16036d57e7d35a596f SHA256 b803723f75571649e10e0707a6dbe8b459eabdc149ef155558792db736faa201
 AUX eblits/src_compile.eblit 5799 RMD160 d67f00fb2af47136c309b03a1242d9f1f6da3e48 SHA1 5ce394af1f7f0e6871916836dcdd871817d6b05a SHA256 9cfb28aa5acf017d878b95767c401f2949a6c3fae42f91aa1d89af68a56efc2a
 AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e
-AUX eblits/src_install.eblit 7893 RMD160 789a4518bbb0be8a028f331e2673e423d2717a93 SHA1 7288c1bcc7f05e8aa0d4f90d4c63be128a2d225d SHA256 d5f0cb0345c33f66a90d73e7e0264867d9bcf4a137190d6ae4008d63a3b7bd56
+AUX eblits/src_install.eblit 7994 RMD160 0f3fc3715f589ae485f730686acb69a11d31960a SHA1 51db782428290a5a641a48038e6436dd50efca5e SHA256 61ddbb1cf22f79662235a67c29c704059a6dbfaf6f501b6b12c3895c2593747b
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
 AUX eblits/src_unpack.eblit 5134 RMD160 fba35312f25e908fa225a7803d0b194e83579d6a SHA1 e6abd0516994a86ca6836872f5acc39c4d2a866d SHA256 1edd30423009f220d98ae39e2d708fd053edfff302bfd9012b8cc4e6d81eca45
 AUX fix-sysctl_h.patch 376 RMD160 b5dd68158224b09ddc42986be02351c74f81e0a0 SHA1 5601fbea6961368bcc192aef78e96ee2c5310713 SHA256 3a589f63fd1f3f6c5a00c66a10943d3d64630aefb1eb5b37e7f2a856fcea234a
@@ -124,7 +124,7 @@ AUX nscd.conf 1158 RMD160 50651e89a0cb206b1d37dae8840527694fe561b5 SHA1 5f5166aa
 AUX nsswitch.conf 503 RMD160 f375f92f6b41029c93382c39cef896261b140cfc SHA1 42f7f5cc3de75c69bf60d806ac8490106ea63326 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d
 AUX test-__thread.c 53 RMD160 dcc9960f3bf26c935f41dc5c408613963885ad58 SHA1 dcb60595b2730a8a05eb045563f13cd615830acf SHA256 28a7836b810cf21f6071126d6b19dbdbf567f2544f9283700d125ad653d7519e
 AUX test-sysctl_h.c 54 RMD160 b7c2e5956e0a232193610701ccc57a8d56615a36 SHA1 d727fbe809fbec9157661fbdb6c8077a68d95044 SHA256 19337cae62f1ebc23ca8d8de8a98e7f03c9dd77a671100995d6e7c8a3833e759
-DIST glibc-2.10.1-patches-2.tar.bz2 93298 RMD160 23165ef6f61547829531b60e4b628ba927961dcb SHA1 c505e101bda46249fc912a4af8b625f10ea96d79 SHA256 7fac7c333744ea9793918f90d54f1ff6ac996340312c3f56e0eaf7bf2e3ab5e8
+DIST glibc-2.10.1-patches-3.tar.bz2 94174 RMD160 30c60f12792a3e5abfda3c38b83c68d16ee2d7fb SHA1 f27d678001544f8eee4b8bd70139a8d70db1d3ab SHA256 67bef941afa0dbd6d8879680c8bca133d3b3e65c62e253b189ed398635aec867
 DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
 DIST glibc-2.2.5-manpages.tar.bz2 14667 RMD160 4f6e1fde042c19aca4718c8e06e19dc2786a1334 SHA1 7bb5615af98a8b5fb2ef91a47148fedef227c544 SHA256 03850134bd0c670d8b5fe5e3bad0dac2efdb7078ddf69e0dbcdba380f4d5697c
 DIST glibc-2.2.5-patches-1.0.tar.bz2 21176 RMD160 4575e4355a919b7865829d22ab86cbdcd53253ee SHA1 f8fa215694673c5ee69f00b3986bcd34d48c7d85 SHA256 39e20bbd032db00c3b0781a0055ed092e9ebcbc2f71e4c1930fd93cd67d374fd
@@ -189,7 +189,7 @@ DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f
 DIST glibc-ports-2.6.tar.bz2 431332 RMD160 275a10d95b5fa34a7c37469468eddbca928fa225 SHA1 ebc15149c8f6f492256cfab585f969a222e2f396 SHA256 398f56ad651939110ad6af88fdd3e92b5cb0583e6f612f2f12ba0134a22b1fac
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 DIST glibc-powerpc-cpu-addon-v0.01.tgz 22422 RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df SHA1 fd30cde7c7cb42baa2c8fa1ac88eeeeb509cac29 SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9
-EBUILD glibc-2.10.1.ebuild 7672 RMD160 dc0d9195b3c3cb14697805c6c8f7b455abe41b24 SHA1 5381ec052afbcd49617d9f2152d60c6ccd224537 SHA256 13a01e9aea801dd3afccffbc0de5155870dd8a1e3cabc3299d2ab1defb6097f9
+EBUILD glibc-2.10.1.ebuild 7675 RMD160 9dce3a1725644fcbd838d9d3aefe3be8913ac140 SHA1 374b45824b0c57b05c8876f5255b319b7e953953 SHA256 817c39110afb10f1d4569cb35df109df8f84bec3c245df857824d4a664076894
 EBUILD glibc-2.2.5-r10.ebuild 4845 RMD160 aac21107eada185cd0d732414543a4e52676fae6 SHA1 b9d514afa456f93233b0a437ae90512eb9784da0 SHA256 a91c13db667c4f2f5178eb9253d90e101ffb37c7db3b811f30692a681c4f19be
 EBUILD glibc-2.3.2-r12.ebuild 22126 RMD160 ea9d0512b19289efe37e52e8edec5d7044fb9fd2 SHA1 126ed425af51b84fe041e2702af08f6dcdd5e74f SHA256 a5db6f8c648045e9df462f69b360ae877efcdc1be6dd63f7bb91455b1bac5bd7
 EBUILD glibc-2.3.5-r3.ebuild 39024 RMD160 00d8523b78c0f417d326bca5795bd9eae6e279bc SHA1 bbdd9924c2d0805743eecd14bc524232424d6e5d SHA256 c6789db55f562cfb848bfd071133e03bcd81da85788ac6e5a0d92dcd5558654d
@@ -209,12 +209,12 @@ EBUILD glibc-2.9_p20081201-r1.ebuild 13638 RMD160 499cb90beb840dec3630096628a38e
 EBUILD glibc-2.9_p20081201-r2.ebuild 7734 RMD160 a782a26d91a7bfaace730698e60df268cc4e1ed9 SHA1 70ed91a39adc64d6b81234b5787de17e1d8a0ee5 SHA256 421a8da60e127367a7ef4c4ddb5a5e28093d793294acfe6698fd1ef57a8ac25b
 EBUILD glibc-2.9_p20081201-r3.ebuild 7766 RMD160 1d870090445e989fa2965a570c1899443e422a6c SHA1 5def44ecc650bed9b9ce8c5e3aa5acfc6c8c4ab6 SHA256 73925c0794ed85c610a65443a02768ffee60f90d8b607d99a0926aa8b170eb9b
 EBUILD glibc-2.9_p20081201.ebuild 13449 RMD160 ba463ccf508a887cab638d7f65aa809dd1933a2b SHA1 0e7798f24c20e8baaae9fac47c3322eae4e2dda1 SHA256 2da6944caf8bc892bcc05b64eee224946baff8d65e375587dac3582d22766e58
-MISC ChangeLog 119328 RMD160 1712067f5a98c21964025d0ef4638027125f016d SHA1 b51f1aa0c393fcf16b4937789a640df964b83c18 SHA256 d85db42c9707ecc8eb61121ac4dfe949ffd80d4d10eece16af023cc0cd8ff468
+MISC ChangeLog 119603 RMD160 9f353865726c8a9f4565c8ec3273980d3fb25c11 SHA1 cc4e6c3900467b84c25cb4d16c32213ce034ae71 SHA256 4b43727074f7b6a9a19470a380e27025c7bfcd573c919f9db9e02fff9c0e3a71
 MISC metadata.xml 1112 RMD160 1aa9770356149948593ebe35a1bd3940dd72fca2 SHA1 40514cc45c26bab671d78aa1567441bf72b0c6cc SHA256 4acea698dc4f66c17f4f3f81b28cd6b32f5425fd49f380df4a016489f786b1f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqtDcEACgkQkKaRLQcq0GIe8wCeKkXkUncmtFGUEZvjmHAlYz62
-DV8AnR3jjdtMOz8RbfNFJ2RFyiKf3JId
-=ZMKV
+iEYEARECAAYFAkqzpBcACgkQAiZjviIA2XjUOgCfQzx1dQTKVny7ATFk8MSkaVCz
+V9IAoM9n6/oryvPTbhjizENx1E/2Z80i
+=Z4Z2
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index aa1d4e7ad490..39d09e63cdf7 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.7 2008/12/29 09:22:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.8 2009/09/18 15:15:07 flameeyes Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -173,6 +173,8 @@ toolchain-glibc_src_install() {
 	doins "${WORKDIR}"/extra/etc/*.conf || die
 	doinitd "${WORKDIR}"/extra/etc/nscd || die
 
+	sed -i -e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):" "${D}"/etc/init.d/nscd
+
 	dodoc BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README*
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
diff --git a/sys-libs/glibc/glibc-2.10.1.ebuild b/sys-libs/glibc/glibc-2.10.1.ebuild
index baa665b4b06f..c5eeddf7f701 100644
--- a/sys-libs/glibc/glibc-2.10.1.ebuild
+++ b/sys-libs/glibc/glibc-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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.10.1.ebuild,v 1.4 2009/09/07 04:24:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1.ebuild,v 1.5 2009/09/18 15:15:06 flameeyes Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -26,7 +26,7 @@ LIBIDN_VER=${RELEASE_VER}
 fi
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="3"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires