summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/glibc-2.15-r2.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 01f4d0d63e39..6853d37954e9 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.860 2012/06/14 18:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.861 2012/06/18 04:34:17 vapier Exp $
+
+ 18 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild:
+ Add fix from upstream for getconf writing too many bytes to local buffer
+ #411905 by Ryan Hill.
14 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15-r2.ebuild:
Fix from upstream to for strtok on x32 #420951.
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index 2bdb346e0eb2..e7bd4fd7532b 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r2.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.15-r2.ebuild,v 1.8 2012/06/14 18:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.9 2012/06/18 04:34:17 vapier Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
@@ -33,7 +33,7 @@ esac
MANPAGE_VER="" # pregenerated manpages
INFOPAGE_VER="" # pregenerated infopages
LIBIDN_VER="" # it's integrated into the main tarball now
-PATCH_VER="17" # Gentoo patchset
+PATCH_VER="18" # Gentoo patchset
PORTS_VER=${RELEASE_VER} # version of glibc ports addon
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires