From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1N6Clw-0002Hi-1v for garchives@archives.gentoo.org; Fri, 06 Nov 2009 00:33:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F730E0D35; Fri, 6 Nov 2009 00:33:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2F93AE0D35 for ; Fri, 6 Nov 2009 00:33:47 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C695D66CF8 for ; Fri, 6 Nov 2009 00:33:46 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1N6Clu-0001lE-DP for gentoo-commits@lists.gentoo.org; Fri, 06 Nov 2009 00:33:46 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/glibc: ChangeLog glibc-2.11.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog glibc-2.11.ebuild X-VCS-Directories: sys-libs/glibc X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Fri, 06 Nov 2009 00:33:46 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5f5761b5-f4e6-431c-88f6-25995fc942a1 X-Archives-Hash: a68829fa912905046b629fc6060fa96d vapier 09/11/06 00:33:46 Modified: ChangeLog Added: glibc-2.11.ebuild Log: Version bump. (Portage version: 2.2_rc46/cvs/Linux x86_64) Revision Changes Path 1.651 sys-libs/glibc/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/Cha= ngeLog?rev=3D1.651&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/Cha= ngeLog?rev=3D1.651&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/Cha= ngeLog?r1=3D1.650&r2=3D1.651 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v retrieving revision 1.650 retrieving revision 1.651 diff -u -r1.650 -r1.651 --- ChangeLog 5 Nov 2009 22:31:15 -0000 1.650 +++ ChangeLog 6 Nov 2009 00:33:45 -0000 1.651 @@ -1,6 +1,11 @@ # 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.650 2009= /11/05 22:31:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.651 2009= /11/06 00:33:45 vapier Exp $ + +*glibc-2.11 (06 Nov 2009) + + 06 Nov 2009; Mike Frysinger +glibc-2.11.ebuild: + Version bump. =20 05 Nov 2009; Mike Frysinger glibc-2.9_p20081201-r3.ebuild: 1.1 sys-libs/glibc/glibc-2.11.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/gli= bc-2.11.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/gli= bc-2.11.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: glibc-2.11.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.11.ebuild,v 1.1= 2009/11/06 00:33:45 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig= multilib DESCRIPTION=3D"GNU libc6 (also called glibc2) C library" HOMEPAGE=3D"http://www.gnu.org/software/libc/libc.html" LICENSE=3D"LGPL-2" KEYWORDS=3D"~amd64 ~ia64 ~s390 ~x86" RESTRICT=3D"strip" # strip ourself #46186 EMULTILIB_PKG=3D"true" # Configuration variables if [[ ${PV} =3D=3D *_p* ]] ; then RELEASE_VER=3D${PV%_p*} BRANCH_UPDATE=3D"" SNAP_VER=3D${PV#*_p} else RELEASE_VER=3D${PV} BRANCH_UPDATE=3D"" SNAP_VER=3D"" fi MANPAGE_VER=3D"" # pregenerated manpages INFOPAGE_VER=3D"" # pregenerated infopages LIBIDN_VER=3D"" # it's integrated into t= he main tarball now PATCH_VER=3D"1" # Gentoo patchset PORTS_VER=3D #${RELEASE_VER} # version of glibc ports= addon LT_VER=3D"" # version of linuxthread= s addon NPTL_KERN_VER=3D${NPTL_KERN_VER:-"2.6.9"} # min kernel version npt= l requires #LT_KERN_VER=3D${LT_KERN_VER:-"2.4.1"} # min kernel version lin= uxthreads requires IUSE=3D"debug gd glibc-omitfp hardened multilib nls selinux profile vanil= la crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}= " S=3D${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 !=3D CHOST, it means you want a libc for cross-compiling. # If CHOST !=3D CBUILD, it means you want to cross-compile the libc. # CBUILD =3D CHOST =3D CTARGET - native build/install # CBUILD !=3D (CHOST =3D CTARGET) - cross-compile a native build # (CBUILD =3D CHOST) !=3D CTARGET - libc for cross-compiler # CBUILD !=3D CHOST !=3D CTARGET - cross-compile a libc for a cross-com= piler # For install paths: # CHOST =3D CTARGET - install into / # CHOST !=3D CTARGET - install into /usr/CTARGET/ export CBUILD=3D${CBUILD:-${CHOST}} export CTARGET=3D${CTARGET:-${CHOST}} if [[ ${CTARGET} =3D=3D ${CHOST} ]] ; then if [[ ${CATEGORY/cross-} !=3D ${CATEGORY} ]] ; then export CTARGET=3D${CATEGORY/cross-} fi fi [[ ${CTARGET} =3D=3D hppa* ]] && NPTL_KERN_VER=3D${NPTL_KERN_VER/2.6.9/2.= 6.20} is_crosscompile() { [[ ${CHOST} !=3D ${CTARGET} ]] } alt_libdir() { if is_crosscompile ; then echo /usr/${CTARGET}/$(get_libdir) else echo /$(get_libdir) fi } if is_crosscompile ; then SLOT=3D"${CTARGET}-2.2" else # Why SLOT 2.2 you ask yourself while sippin your tea ? # Everyone knows 2.2 > 0, duh. SLOT=3D"2.2" PROVIDE=3D"virtual/libc" fi # General: We need a new-enough binutils for as-needed # arch: we need to make sure our binutils/gcc supports TLS DEPEND=3D">=3Dsys-devel/gcc-3.4.4 arm? ( >=3Dsys-devel/binutils-2.16.90 >=3Dsys-devel/gcc-4.1.0 ) ppc? ( >=3Dsys-devel/gcc-4.1.0 ) ppc64? ( >=3Dsys-devel/gcc-4.1.0 ) >=3Dsys-devel/binutils-2.15.94 ${LT_VER:+nptl? (} >=3Dsys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VE= R:+)} >=3Dsys-devel/gcc-config-1.3.12 >=3Dapp-misc/pax-utils-0.1.10 virtual/os-headers nls? ( sys-devel/gettext ) >=3Dsys-apps/sandbox-1.2.18.1-r2 >=3Dsys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux )" RDEPEND=3D"!sys-kernel/ps3-sources nls? ( sys-devel/gettext ) selinux? ( sys-libs/libselinux )" if [[ ${CATEGORY/cross-} !=3D ${CATEGORY} ]] ; then DEPEND=3D"${DEPEND} ${CATEGORY}/gcc" [[ ${CATEGORY} =3D=3D *-linux* ]] && DEPEND=3D"${DEPEND} ${CATEGORY}/lin= ux-headers" else DEPEND=3D"${DEPEND} >=3Dsys-libs/timezone-data-2007c" RDEPEND=3D"${RDEPEND} sys-libs/timezone-data" fi SRC_URI=3D$( upstream_uris() { echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases= ,snapshots}/$1 mirror://gentoo/$1 } gentoo_uris() { local devspace=3D"HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" devspace=3D${devspace//HTTP/http://dev.gentoo.org/} echo mirror://gentoo/$1 ${devspace//URI/$1} } TARNAME=3D${PN} if [[ -n ${SNAP_VER} ]] ; then TARNAME=3D"${PN}-${RELEASE_VER}" [[ -n ${PORTS_VER} ]] && PORTS_VER=3D${SNAP_VER} upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2 else upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2 fi [[ -n ${LIBIDN_VER} ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.ta= r.bz2 [[ -n ${PORTS_VER} ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}= .tar.bz2 [[ -n ${LT_VER} ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_= VER}.tar.bz2 [[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-upd= ate-${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}.t= ar.bz2 [[ -n ${INFOPAGE_VER} ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}= .tar.bz2 ) # eblit-include [--skip] [version] eblit-include() { local skipable=3Dfalse [[ $1 =3D=3D "--skip" ]] && skipable=3Dtrue && shift [[ $1 =3D=3D pkg_* ]] && skipable=3Dtrue local e v func=3D$1 ver=3D$2 [[ -z ${func} ]] && die "Usage: eblit-include [version]" for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do e=3D"${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 # run the specified function if it is defined eblit-run-maybe() { [[ $(type -t "$@") =3D=3D "function" ]] && "$@" } # eblit-run [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=3D"${FILESDIR}/eblits/pkg_${x}.eblit" if [[ -e ${e} ]] ; then . "${e}" eval "pkg_${x}() { eblit-run pkg_${x} ; }" fi done 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.5/glibc-2.5-hardened-pie.patch epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patc= h epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch einfo "Patching Glibc to support older SSP __guard" epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-ssp-compat.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 =3D -DSSP_SMASH_DU= MPS_CORE' \ debug/Makefile \ || die "Failed to modify debug/Makefile for debug stack handler" sed -i \ -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c =3D -DSSP_SMASH_DUMPS_CO= RE' \ 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=3D"/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}" cd ${base} local stamp=3D$(date +%Y%m%d) local d for d in libc ports ; do #(cd ${d} && cvs up) case ${d} in libc) tarball=3D"${P}";; ports) tarball=3D"${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 }