[gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     b310451322cf5636466bbc3d2dc36b1d5e498ca3
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 14:52:10 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 14:52:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=b3104513

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 <pb@pbcl.net>
+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 <pb@pbcl.net>
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+(limited to 'libc/sysdeps/linux/common/epoll.c')
+
+diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/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 maxevents,
+ 						int timeout, const sigset_t *set)
+ {
++    int nsig = _NSIG / 8;
+ 	if (SINGLE_THREAD_P)
+-		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ 	else {
+ 		int oldtype = LIBC_CANCEL_ASYNC ();
+-		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		int result = 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/uclibc-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.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
+
+EAPI="4"
+
+inherit eutils
+
+MY_P=uClibc-0.9.32.1
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="http://www.uclibc.org/"
+SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND=""
+DEPEND=""
+
+S=${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 make oldconfig"
+}
+
+src_compile() {
+	emake headers || die "make headers failed"
+	emake || die "make failed"
+	emake utils || die "make utils failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	# remove files coming from kernel-headers
+	rm -rf "${D}"/usr/include/{linux,asm*}
+
+	emake DESTDIR="${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
+}