summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-09-18 15:15:07 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-09-18 15:15:07 +0000
commit8be8c99b00357263e656587b5b715803077851ce (patch)
tree8cdaccf57638b88da32944b10f07de306f442eee /sys-libs
parentMigrate to EAPI 2 in order to remove built_with_use usage. (diff)
downloadgentoo-2-8be8c99b00357263e656587b5b715803077851ce.tar.gz
gentoo-2-8be8c99b00357263e656587b5b715803077851ce.tar.bz2
gentoo-2-8be8c99b00357263e656587b5b715803077851ce.zip
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).
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog8
-rw-r--r--sys-libs/glibc/files/eblits/src_install.eblit4
-rw-r--r--sys-libs/glibc/glibc-2.10.1.ebuild4
3 files changed, 12 insertions, 4 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/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