Add fix from upstream for crashes in nscd code when nscd is not running #416033 by Matthias Dahl.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

3 files changed, 271 insertions, 6 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cd222a3ec20c..2ae7d3663e14 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.850 2012/05/12 16:11:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.851 2012/05/18 05:04:44 vapier Exp $
+
+*glibc-2.15-r2 (18 May 2012)
+
+  18 May 2012; Mike Frysinger <vapier@gentoo.org> +glibc-2.15-r2.ebuild:
+  Add fix from upstream for crashes in nscd code when nscd is not running
+  #416033 by Matthias Dahl.
 
   12 May 2012; Raúl Porcel <armin76@gentoo.org> glibc-2.14.1-r3.ebuild:
   alpha/sparc stable wrt #411903
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index bb8ecd8b2589..54c12b5c6cd6 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,6 +42,7 @@ DIST glibc-2.14.1-patches-9.tar.bz2 163028 RMD160 d1153d10891512005c067bf3a28a83
 DIST glibc-2.14.1.tar.bz2 15650580 RMD160 f6efab63efdddefd7b868ffcba53885450064996 SHA1 f1945eea78bb30563d33c9e6a5f6f97f374135b4 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
 DIST glibc-2.15-patches-13.tar.bz2 154658 RMD160 bd1f45c349e4021ea00cd9de4c3f3212a50f01d9 SHA1 fbc45542d46790860d671497fec690c2c11578a9 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53
+DIST glibc-2.15-patches-14.tar.bz2 155676 RMD160 a6068c1c2581e52c50579f4589bd67739cdace66 SHA1 d4534b59fe915d97bded015f7c9be2313828e936 SHA256 f41fb78960b26703a67443c8d685f1d1990ebe5bc8e6bf09bac77edf56e1cdb1
 DIST glibc-2.15.tar.xz 10280176 RMD160 29afafcb61f5842b6b458e322a004aac06dbf6df SHA1 0a7936be3bd0562b076b95dacb7c9daa3dbc83fc SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
@@ -64,15 +65,26 @@ EBUILD glibc-2.14.1-r2.ebuild 8905 RMD160 fe5975027559e747fcc00af3b4d7e745a82c79
 EBUILD glibc-2.14.1-r3.ebuild 8897 RMD160 291fb01460780f7ab25fa1b15eb97a42a37b32d6 SHA1 47f2f51026ac216ec837ec6ce348a41f68b29ba9 SHA256 9873ecb74ceb69d9a252e3b5d98c54433659e78d44f0c64a505848cd4648af6a
 EBUILD glibc-2.14.ebuild 8739 RMD160 0cf8007db758513dbe73ecb747182591923ea03b SHA1 b9fb14a5c62cc69e827037a7ea3acf56b62dc4e7 SHA256 8a2129dec1c258364aab30c9dc73d9e64e6f167e14f49a3160f41f4674ea714e
 EBUILD glibc-2.15-r1.ebuild 8533 RMD160 2039bf3f8747013a3af426eb5cc58c391826439b SHA1 1db4d84bce4f2132795424e21937edd6c487bced SHA256 0a34f2cd344abdb9f0588a9266d65295d2bfe5f98e990b99dee7fbd25231cee5
+EBUILD glibc-2.15-r2.ebuild 8157 RMD160 8729367a3fb83dd6ef3193e7d5a571ae4326c3b6 SHA1 c4e93aadb25449cfdb6ceb5af28a54841667fa40 SHA256 c136a68d9c9b032538a2570b0fae2e802f9977f342b96f48c81adca1df68f799
 EBUILD glibc-2.9_p20081201-r3.ebuild 7680 RMD160 3baebfd0be6aed5c3d03fdbfd46a19a9dad83428 SHA1 958f7f408c36a584bf4f0151089d5e5dbdb838b5 SHA256 342058f41b7338fc4fdd9e0ba5b4931e0e13babc53c04028f4798906e74ac988
 EBUILD glibc-9999.ebuild 8358 RMD160 317e86067a3688b8f06a40c7a7ebb0f70b473290 SHA1 5a160e2c0b7ff594dd0727751e289650d924e3f0 SHA256 726ccd559e26f740d0607677e7f1512ecf7ab6425ad3e4ea0a27ba3adc9ea752
-MISC ChangeLog 43189 RMD160 781483403a7b44f09d470caffc804d0ff6261ef9 SHA1 58ed726dc2816306eb2406368d53c3f1320498c1 SHA256 b2d145fe66d5ff45b50cd3b9e6c4f5e9b3e7f68857f09ad114586e4682ada3c3
+MISC ChangeLog 43394 RMD160 4f8f906629847afbc757eab22ce92dbdbcbc8972 SHA1 c0f85f342a3b2e38c9efe65d536de9659f79be21 SHA256 2c2d2f09231c65dc3d32dd2154d6f22533af31630880a00e71118e31a8a1f25a
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 276 RMD160 532073ae23585e45260005f9cb7faff78a2f34d4 SHA1 840d8831dbc1a441fe86d812f874961026b5fd66 SHA256 b6767fa81e801d5bb20ba7c96f91674159dddcdedb23e49fb24e93c3a879fd04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ui68ACgkQuQc30/atMkD4wwCeIPZ1gbfC1JPNX6cNtkojClj2
-8BoAoK79r1SFrB52kcQJnf0yzszbhI3o
-=anRd
+iQIcBAEBAgAGBQJPtdiSAAoJELEHsLL7fEFWQqgQAIDCQFTR5V+GeupIBBI2Mux+
+iTyZX7U64E1oHQm6Kj+jPIuPtb9s8G7KoE9f7qnPymmlhXZfK1oWsIKZGbQjCGmM
+i9bI+8Tn6Wud8uKfFg56ZfcLWsU4EcRqDGh45gzI3tzPTOqnejE3aTbgxpyIFh7O
+lcZIsK7xpbIQKYTRs2JPo5i45lbEu0eQQ9wIsbrvzga9wGemBgfVucprFC14cZ8r
+Ro8vXwMgw5pHyIkrvj+aWdpetvIycrx7JIFLBsLFBkLm0ESkLHYEfw/3o3HAwZ9k
+mgosAQFLgwC16FxwjGiWYLzqNSgI2MR1Erbto/dvH/VrVRsJYOdqVsL9m+TJJewt
+4KZTYqpWa2LPUFeiKbnyDbwwwV6tusKm0rFopxEoaU75rbbnw1nNC2ijJvVG+rCM
+hosBw4xJSvI3ehB+UiBK6y1+oGHkwklv2s3cgtcEAJo8xf5f+W465X8Unu54qemv
+jBhG5pb9eZdEo0d7oWodVCHm+h3cOBulwCC7nvtpnic2w8RKJhCUbSsxQdYtwXkQ
+CVT2CdUdAZm9xdQZZWsjRh1AAWqUybWlzSyDw7kjsg0NTxikESHBMPijHkM45PnX
+7M2wA6DoEqeIiEglFwW1tLbyXSrR6G/8fMaKu33S0uCOO4jLYMBRnmJmsj/uGuwc
+A7n605c/WdhYwemnppgT
+=ks9v
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
new file mode 100644
index 000000000000..e1900eff92aa
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.15-r2.ebuild
@@ -0,0 +1,247 @@
+# 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.1 2012/05/18 05:04:44 vapier Exp $
+
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+BRANCH_UPDATE=""
+SNAP_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
+	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
+	inherit git-2
+	;;
+*_p*)
+	RELEASE_VER=${PV%_p*}
+	SNAP_VER=${PV#*_p}
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+MANPAGE_VER=""                                 # pregenerated manpages
+INFOPAGE_VER=""                                # pregenerated infopages
+LIBIDN_VER=""                                  # it's integrated into the main tarball now
+PATCH_VER="14"                                 # 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
+
+IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only"
+[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+alt_libdir() {
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}/$(get_libdir)
+	else
+		echo /$(get_libdir)
+	fi
+}
+
+if is_crosscompile ; then
+	SLOT="${CTARGET}-2.2"
+else
+	# Why SLOT 2.2 you ask yourself while sippin your tea ?
+	# Everyone knows 2.2 > 0, duh.
+	SLOT="2.2"
+fi
+
+# General: We need a new-enough binutils for as-needed
+# arch: we need to make sure our binutils/gcc supports TLS
+DEPEND=">=sys-devel/gcc-3.4.4
+	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
+	x86? ( >=sys-devel/gcc-4.3 )
+	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
+	ppc? ( >=sys-devel/gcc-4.1.0 )
+	ppc64? ( >=sys-devel/gcc-4.1.0 )
+	>=sys-devel/binutils-2.15.94
+	>=app-misc/pax-utils-0.1.10
+	virtual/os-headers
+	!<sys-apps/sandbox-1.2.18.1-r2
+	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+else
+	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
+	RDEPEND="${RDEPEND}
+		vanilla? ( !sys-libs/timezone-data )
+		!vanilla? ( sys-libs/timezone-data )"
+fi
+
+SRC_URI=$(
+	upstream_uris() {
+		echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+	}
+	gentoo_uris() {
+		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+		devspace=${devspace//HTTP/http://dev.gentoo.org/}
+		echo mirror://gentoo/$1 ${devspace//URI/$1}
+	}
+
+	TARNAME=${PN}
+	if [[ -n ${SNAP_VER} ]] ; then
+		TARNAME="${PN}-${RELEASE_VER}"
+		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
+		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
+	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
+		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
+	fi
+	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
+	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
+	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
+	[[ -n ${MANPAGE_VER}   ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2
+	[[ -n ${INFOPAGE_VER}  ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}.tar.bz2
+)
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()  { eblit-run src_unpack  ; }
+src_compile() { eblit-run src_compile ; }
+src_test()    { eblit-run src_test    ; }
+src_install() { eblit-run src_install ; }
+
+# FILESDIR might not be available during binpkg install
+for x in setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-pre() {
+	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
+		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+}
+
+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
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
+
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
+			debug/stack_chk_fail.c || die
+		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
+			debug/chk_fail.c || die
+
+		if use debug ; then
+			# When using Hardened Gentoo stack handler, have smashes dump core for
+			# analysis - debug only, as core could be an information leak
+			# (paranoia).
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug stack handler"
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug fortify handler"
+		fi
+
+		# Build nscd with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			nscd/Makefile \
+			|| die "Failed to ensure nscd builds with ssp-all"
+	fi
+}
+
+maint_pkg_create() {
+	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
+	cd ${base}
+	local stamp=$(date +%Y%m%d)
+	local d
+	for d in libc ports ; do
+		#(cd ${d} && cvs up)
+		case ${d} in
+			libc)  tarball="${P}";;
+			ports) tarball="${PN}-ports-${PV}";;
+		esac
+		rm -f ${tarball}*
+		ln -sf ${d} ${tarball}
+		tar hcf - ${tarball} --exclude-vcs | lzma > "${T}"/${tarball}.tar.lzma
+		du -b "${T}"/${tarball}.tar.lzma
+	done
+}