* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc: glibc-2.13.ebuild ChangeLog
@ 2011-02-05 19:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2011-02-05 19:13 UTC (permalink / raw
To: gentoo-commits
vapier 11/02/05 19:13:29
Modified: ChangeLog
Added: glibc-2.13.ebuild
Log:
Version bump.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Revision Changes Path
1.739 sys-libs/glibc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.739&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.739&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.738&r2=1.739
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v
retrieving revision 1.738
retrieving revision 1.739
diff -u -r1.738 -r1.739
--- ChangeLog 9 Jan 2011 00:55:38 -0000 1.738
+++ ChangeLog 5 Feb 2011 19:13:28 -0000 1.739
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.738 2011/01/09 00:55:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.739 2011/02/05 19:13:28 vapier Exp $
+
+*glibc-2.13 (05 Feb 2011)
+
+ 05 Feb 2011; Mike Frysinger <vapier@gentoo.org> +glibc-2.13.ebuild:
+ Version bump.
*glibc-2.12.2 (09 Jan 2011)
1.1 sys-libs/glibc/glibc-2.13.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?rev=1.1&content-type=text/plain
Index: glibc-2.13.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.1 2011/02/05 19:13:28 vapier Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
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
if [[ ${PV} == *_p* ]] ; then
RELEASE_VER=${PV%_p*}
BRANCH_UPDATE=""
SNAP_VER=${PV#*_p}
else
RELEASE_VER=${PV}
BRANCH_UPDATE=""
SNAP_VER=""
fi
MANPAGE_VER="" # pregenerated manpages
INFOPAGE_VER="" # pregenerated infopages
LIBIDN_VER="" # it's integrated into the main tarball now
PATCH_VER="1" # Gentoo patchset
PORTS_VER="2.12.1" # 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
#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires
IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
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"
PROVIDE="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=">=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
${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
>=sys-devel/gcc-config-1.3.12
>=app-misc/pax-utils-0.1.10
virtual/os-headers
nls? ( sys-devel/gettext )
>=sys-apps/sandbox-1.2.18.1-r2
!<sys-apps/portage-2.1.2
selinux? ( sys-libs/libselinux )"
RDEPEND="!sys-kernel/ps3-sources
nls? ( sys-devel/gettext )
selinux? ( sys-libs/libselinux )"
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
else
upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
fi
[[ -n ${LIBIDN_VER} ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.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-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
pkg_setup() {
eblit-run pkg_setup
# Static binary sanity check #332927
if [[ ${ROOT} == "/" ]] && \
has_version "<${CATEGORY}/${P}" && \
built_with_use sys-apps/coreutils static
then
eerror "Please rebuild coreutils with USE=-static, then install"
eerror "glibc, then you may rebuild coreutils with USE=static."
die "Avoiding system meltdown #332927"
fi
}
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 "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 = -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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc: glibc-2.13.ebuild ChangeLog
@ 2011-02-06 15:59 Magnus Granberg (zorry)
0 siblings, 0 replies; 3+ messages in thread
From: Magnus Granberg (zorry) @ 2011-02-06 15:59 UTC (permalink / raw
To: gentoo-commits
zorry 11/02/06 15:59:39
Modified: glibc-2.13.ebuild ChangeLog
Log:
Fix bug #353811
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-libs/glibc/glibc-2.13.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?r1=1.1&r2=1.2
Index: glibc-2.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-2.13.ebuild 5 Feb 2011 19:13:28 -0000 1.1
+++ glibc-2.13.ebuild 6 Feb 2011 15:59:39 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.1 2011/02/05 19:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.2 2011/02/06 15:59:39 zorry Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -207,9 +207,6 @@
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
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
1.740 sys-libs/glibc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.740&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.740&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.739&r2=1.740
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v
retrieving revision 1.739
retrieving revision 1.740
diff -u -r1.739 -r1.740
--- ChangeLog 5 Feb 2011 19:13:28 -0000 1.739
+++ ChangeLog 6 Feb 2011 15:59:39 -0000 1.740
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.739 2011/02/05 19:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.740 2011/02/06 15:59:39 zorry Exp $
+
+ 06 Feb 2011; Magnus Granberg <zorry@gentoo.org> glibc-2.13.ebuild:
+ We do not longer support old SSP for GCC 3.X and patch fail #353811
*glibc-2.13 (05 Feb 2011)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc: glibc-2.13.ebuild ChangeLog
@ 2011-02-07 19:18 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-02-07 19:18 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/02/07 19:18:12
Modified: glibc-2.13.ebuild ChangeLog
Log:
Abort if sys-devel/prelink is installed wrt #353814.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-libs/glibc/glibc-2.13.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild?r1=1.2&r2=1.3
Index: glibc-2.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glibc-2.13.ebuild 6 Feb 2011 15:59:39 -0000 1.2
+++ glibc-2.13.ebuild 7 Feb 2011 19:18:12 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.2 2011/02/06 15:59:39 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.3 2011/02/07 19:18:12 ssuominen Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -197,6 +197,12 @@
eerror "glibc, then you may rebuild coreutils with USE=static."
die "Avoiding system meltdown #332927"
fi
+
+ if has_version sys-devel/prelink; then
+ eerror "Aborting. Your system might be prelinked."
+ eerror "Unprelink your system and uninstall sys-devel/prelink first."
+ die "Avoid system meltdown #353814"
+ fi
}
eblit-src_unpack-post() {
1.743 sys-libs/glibc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.743&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.743&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.742&r2=1.743
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- ChangeLog 7 Feb 2011 07:27:39 -0000 1.742
+++ ChangeLog 7 Feb 2011 19:18:12 -0000 1.743
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.742 2011/02/07 07:27:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.743 2011/02/07 19:18:12 ssuominen Exp $
+
+ 07 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> glibc-2.13.ebuild:
+ Abort if sys-devel/prelink is installed wrt #353814.
07 Feb 2011; Joshua Kinard <kumba@gentoo.org> glibc-2.5-r4.ebuild,
glibc-2.5.1.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-07 19:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-07 19:18 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc: glibc-2.13.ebuild ChangeLog Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2011-02-06 15:59 Magnus Granberg (zorry)
2011-02-05 19:13 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox