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 1RhjFl-0004yd-Jv for garchives@archives.gentoo.org; Mon, 02 Jan 2012 14:52:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75DBA21C233; Mon, 2 Jan 2012 14:52:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3888F21C233 for ; Mon, 2 Jan 2012 14:52:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2AC51B4012 for ; Mon, 2 Jan 2012 14:52:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DCD7A80042 for ; Mon, 2 Jan 2012 14:52:16 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-libs/uclibc/files/uclibc-0.9.32.1-fix_epoll.patch sys-libs/uclibc/uclibc-0.9.32.1.ebuild X-VCS-Directories: sys-libs/uclibc/ sys-libs/uclibc/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b310451322cf5636466bbc3d2dc36b1d5e498ca3 Date: Mon, 2 Jan 2012 14:52:16 +0000 (UTC) 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: f3663d5b-2f1e-4afe-b2fe-588f32ca599e X-Archives-Hash: efc9a1cb9943920de5b72817e3f896f3 commit: b310451322cf5636466bbc3d2dc36b1d5e498ca3 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jan 2 14:52:10 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jan 2 14:52:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3Db3104513 sys-libs/uclibc: bump to 0.9.32.1 --- .../uclibc/files/uclibc-0.9.32.1-fix_epoll.patch | 42 ++++++++++++++= + sys-libs/uclibc/uclibc-0.9.32.1.ebuild | 55 ++++++++++++++= ++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/sys-libs/uclibc/files/uclibc-0.9.32.1-fix_epoll.patch b/sys-= libs/uclibc/files/uclibc-0.9.32.1-fix_epoll.patch new file mode 100644 index 0000000..6e32d38 --- /dev/null +++ b/sys-libs/uclibc/files/uclibc-0.9.32.1-fix_epoll.patch @@ -0,0 +1,42 @@ +From 8245f3b4638fdff2011c2657af1bb211def704bc Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Sat, 11 Jun 2011 05:10:46 +0000 +Subject: Fix __libc_epoll_pwait compile failure on x86 + +This prevents "memory input 7 is not directly addressable" errors. + +| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait': +| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not = directly addressable +| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not = directly addressable +| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1 +| make: *** Waiting for unfinished jobs.... + +Signed-off-by: Phil Blundell +Signed-off-by: Jason Woodward +Signed-off-by: Khem Raj +--- +(limited to 'libc/sysdeps/linux/common/epoll.c') + +diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/comm= on/epoll.c +index 85b0cfd..ab3e73b 100644 +--- a/libc/sysdeps/linux/common/epoll.c ++++ b/libc/sysdeps/linux/common/epoll.c +@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait; + int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxeve= nts, + int timeout, const sigset_t *set) + { ++ int nsig =3D _NSIG / 8; + if (SINGLE_THREAD_P) +- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeou= t, set, _NSIG / 8); ++ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeou= t, set, nsig); + # ifdef __UCLIBC_HAS_THREADS_NATIVE__ + else { + int oldtype =3D LIBC_CANCEL_ASYNC (); +- int result =3D INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents= , timeout, set, _NSIG / 8); ++ int result =3D INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents= , timeout, set, nsig); + LIBC_CANCEL_RESET (oldtype); + return result; + } +-- +cgit v0.9.0.1-2-gef13 + diff --git a/sys-libs/uclibc/uclibc-0.9.32.1.ebuild b/sys-libs/uclibc/ucl= ibc-0.9.32.1.ebuild new file mode 100644 index 0000000..dd60f75 --- /dev/null +++ b/sys-libs/uclibc/uclibc-0.9.32.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.eb= uild,v 1.9 2011/04/20 18:10:38 ulm Exp $ + +EAPI=3D"4" + +inherit eutils + +MY_P=3DuClibc-0.9.32.1 +DESCRIPTION=3D"C library for developing embedded Linux systems" +HOMEPAGE=3D"http://www.uclibc.org/" +SRC_URI=3D"http://uclibc.org/downloads/${MY_P}.tar.bz2" + +LICENSE=3D"LGPL-2" +SLOT=3D"0" +KEYWORDS=3D"-* amd64 x86" +IUSE=3D"" +RESTRICT=3D"strip" + +RDEPEND=3D"" +DEPEND=3D"" + +S=3D${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix_epoll.patch +} + +src_configure() { + cp "${FILESDIR}"/uclibc.config .config + yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not m= ake oldconfig" +} + +src_compile() { + emake headers || die "make headers failed" + emake || die "make failed" + emake utils || die "make utils failed" +} + +src_install() { + emake DESTDIR=3D"${D}" install || die "install failed" + + # remove files coming from kernel-headers + rm -rf "${D}"/usr/include/{linux,asm*} + + emake DESTDIR=3D"${D}" install_utils || die "install-utils failed" + dobin extra/scripts/getent + dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 +} + +pkg_postinst() { + echo "UTC" > "${ROOT}"/etc/TZ + /sbin/ldconfig + [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null +}