main/libc0.9.32: resync of upstream kernel features

fixes #1907

4 files changed, 134 insertions, 1 deletions

diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index f10bd11406..a7d16a3fc3 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -4,7 +4,7 @@ pkgname=libc$_abiver
 _gitver=
 pkgver=0.9.33.2
 _ver=${pkgver/_/-}
-pkgrel=20
+pkgrel=21
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -63,6 +63,10 @@ librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal-in-helper-thread.patch
 	0001-ldd-subdepends-check-stderr.patch
 	0001-stdio-inline-getchar-putchar.patch
 
+	uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
+	uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
+	uClibc-0.9.33.2-dup3.patch
+
 	uclibcconfig.x86
 	uclibcconfig.x86_64
 	uclibcconfig.i486
@@ -202,6 +206,9 @@ ffe7564afe846026a278dd8c0251ace9  uclibc-rtld_next-fix.patch
 747efb42244760ad3ae72a42b18ec8c3  libdl.patch
 e5352b7ebaa21e2ed787ce124ef67c9f  0001-ldd-subdepends-check-stderr.patch
 851808f9ec347dce3407d0ad4cb5ee49  0001-stdio-inline-getchar-putchar.patch
+7b6d467ce0cc5cf232f8526a3be5a491  uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
+cbbd96f04cf17a403c1f74767e144fa2  uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
+7671d02a05a074bbcbcd6193492772d6  uClibc-0.9.33.2-dup3.patch
 ce8a33a31f5a53031fbad8b1d1b66d44  uclibcconfig.x86
 e861a17baa541accf4d4d39a98d74c32  uclibcconfig.x86_64
 ce8a33a31f5a53031fbad8b1d1b66d44  uclibcconfig.i486
@@ -239,6 +246,9 @@ b4cd24a506f4f286144080b3e95a2999efb4ec58e759255e82e09a1d7c353549  0001-libm-x86_
 b284cf0f0f19897272ca0c8e10c7aa05a837807efcaad2b44e4f1a2c2fb1bbe4  libdl.patch
 2ec9f978c34e2ce573fc9dc91c70b170c0b7699fd393d0e93b9f1cd312af7532  0001-ldd-subdepends-check-stderr.patch
 703799e579e4c28eda028b49f8212c4d4447ffbcf83fadf48ee10db4eceaa0c4  0001-stdio-inline-getchar-putchar.patch
+1edc91ca3cc16b8786f4ea29fcf3a51db6e04bd3247e72fc3ff12496f52ad479  uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
+a53bbdbe8af14cb6918836bea42ec0c85fca1a0e3de1ba3a3767d0bb97d08c92  uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
+cf0ce515c8d98e68cec01e805cb568371dd6f4aa21c14ea8bf841a0a0c26b358  uClibc-0.9.33.2-dup3.patch
 7f613b473adbbf38701125f3d298d11f91e102e5cda17eec8133e8463bdc10c9  uclibcconfig.x86
 bec76f2c67c0c632b24bb8c3db01396cc56f208a8c5ca16543fd5e71050d8c88  uclibcconfig.x86_64
 7f613b473adbbf38701125f3d298d11f91e102e5cda17eec8133e8463bdc10c9  uclibcconfig.i486
@@ -276,6 +286,9 @@ f6de454c16a56c5978b9e840440baf4b17cd92c30191407fd371a88a5764ea3f119a5b639ca9aab5
 5e03d0a81145e572463642dd90aefe700979df7e5be9e2d3b029a7ff21f5b79064f97676c069cd287e6319b9c9a28ab5703bcc547f901e2d90cb09f85ca74ac6  libdl.patch
 8a3d1ecc97e297be1b998a1117d41ae852a9c3d5e3c8ec0a760d8c29a11107c13875ecda2a7e091efded4e8a454669c9c23a28a7bf564348671e8bf4473b74aa  0001-ldd-subdepends-check-stderr.patch
 984b9ec269ba679d8ad94f62187b0966347adf2b3daea64588f0884df81534687c8e7dad141ad48ff6332334eb3bd158bdd4d2ee22526255105b427cd334ff77  0001-stdio-inline-getchar-putchar.patch
+be0bc446a030b1e59ccd8fa564b773cf12f6aac1ecb645ceeeb54958ebd8dd8619431bc395aeb640a7701cd48af123a50814180e848385f78a7545ae4349e704  uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
+2982f918b8d73cff688fca4363eb9f165bc5383937e5d669e57c35dc2b9d4ec6efa6592ee7450f01382adaf7dbb92f6f7e623e9f885aa698c831cc7861131530  uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
+1e3241a2b8332a23793da9a1dacd3622f38499f1c1a9fe67f5afc5147007693826921d9f3c7521d4bb57d868a349f911db2bb35d2e988080527cce9fb2b187dd  uClibc-0.9.33.2-dup3.patch
 ab04402abefad1f239d27d9638c1d8d76bc6a8edd77bbb8ed5a4b1445dbc44d709bb1b5214fc9a37a2208c2b6e92dd0a147eddea5d0b2e1ca3ec227432fe86eb  uclibcconfig.x86
 063899afb5f3c20e5dae1b613aa8963408b66ef21228df2500366163aeda71ca4163cbef8c3e53f389ba4a85b8eec5991667cdb31576141ce2ccbc1dc3d33cab  uclibcconfig.x86_64
 ab04402abefad1f239d27d9638c1d8d76bc6a8edd77bbb8ed5a4b1445dbc44d709bb1b5214fc9a37a2208c2b6e92dd0a147eddea5d0b2e1ca3ec227432fe86eb  uclibcconfig.i486
diff --git a/main/libc0.9.32/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch b/main/libc0.9.32/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
new file mode 100644
index 0000000000..2ad00328d2
--- /dev/null
+++ b/main/libc0.9.32/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
@@ -0,0 +1,36 @@
+From 3d1b82c7d9dce11c733fe23a85df7f975c7e2486 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Tue, 3 Jul 2012 15:54:57 +0200
+Subject: [PATCH] bits/time.h: sync with glibc 2.16
+
+CLOCK_MONOTONIC_RAW is available since 2.6.28
+(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and
+CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce
+CLOCK_REALTIME_COARSE).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/time.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
+index 7ed54bf..c871223 100644
+--- a/libc/sysdeps/linux/common/bits/time.h
++++ b/libc/sysdeps/linux/common/bits/time.h
+@@ -54,6 +54,12 @@
+ #   define CLOCK_PROCESS_CPUTIME_ID	2
+ /* Thread-specific CPU-time clock.  */
+ #   define CLOCK_THREAD_CPUTIME_ID	3
++/* Monotonic system-wide clock, not adjusted for frequency scaling.  */
++#   define CLOCK_MONOTONIC_RAW		4
++/* Identifier for system-wide realtime clock, updated only on ticks.  */
++#   define CLOCK_REALTIME_COARSE	5
++/* Monotonic system-wide clock, updated only on ticks.  */
++#   define CLOCK_MONOTONIC_COARSE	6
+ 
+ /* Flag to indicate time is absolute.  */
+ #   define TIMER_ABSTIME		1
+-- 
+1.7.10.4
+
diff --git a/main/libc0.9.32/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch b/main/libc0.9.32/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
new file mode 100644
index 0000000000..c699b6b11f
--- /dev/null
+++ b/main/libc0.9.32/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
@@ -0,0 +1,28 @@
+Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
+
+From yocto:
+http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
+
+Upstream-Status: Pending
+
+Index: git/libc/sysdeps/linux/common/bits/socket.h
+===================================================================
+--- git.orig/libc/sysdeps/linux/common/bits/socket.h	2012-01-26 23:23:21.537456132 -0800
++++ git/libc/sysdeps/linux/common/bits/socket.h	2012-01-26 23:25:10.125461388 -0800
+@@ -235,8 +235,15 @@
+ #define	MSG_ERRQUEUE	MSG_ERRQUEUE
+     MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
+ #define	MSG_NOSIGNAL	MSG_NOSIGNAL
+-    MSG_MORE		= 0x8000  /* Sender will send more.  */
++    MSG_MORE		= 0x8000,  /* Sender will send more.  */
+ #define	MSG_MORE	MSG_MORE
++    MSG_WAITFORONE      = 0x10000, /* Wait for at least one packet to return.*/
++#define MSG_WAITFORONE  MSG_WAITFORONE
++
++    MSG_CMSG_CLOEXEC    = 0x40000000    /* Set close_on_exit for file
++                                           descriptor received through
++                                           SCM_RIGHTS.  */
++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
+   };
+ 
+ 
diff --git a/main/libc0.9.32/uClibc-0.9.33.2-dup3.patch b/main/libc0.9.32/uClibc-0.9.33.2-dup3.patch
new file mode 100644
index 0000000000..87fe2a679f
--- /dev/null
+++ b/main/libc0.9.32/uClibc-0.9.33.2-dup3.patch
@@ -0,0 +1,56 @@
+From: Jonas Bonn <jonas@southpole.se>
+Subject: [RFC PATCH 16/38] Add dup3 syscall
+Date: Tue,  6 Sep 2011 10:30:40 +0200
+
+Signed-off-by: Jonas Bonn <jonas@southpole.se>
+---
+ include/unistd.h                 |    4 ++++
+ libc/sysdeps/linux/common/dup3.c |   15 +++++++++++++++
+ 2 files changed, 19 insertions(+), 0 deletions(-)
+ create mode 100644 libc/sysdeps/linux/common/dup3.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 9568790..7c2fa4a 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur;
+ extern int dup2 (int __fd, int __fd2) __THROW;
+ libc_hidden_proto(dup2)
+ 
++/* Duplicate FD to FD2, closing FD2 and making it open on the same file.  */
++extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
++libc_hidden_proto(dup3)
++
+ /* NULL-terminated array of "NAME=VALUE" environment variables.  */
+ extern char **__environ;
+ #ifdef __USE_GNU
+diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c
+new file mode 100644
+index 0000000..5fdab2e
+--- /dev/null
++++ b/libc/sysdeps/linux/common/dup3.c
+@@ -0,0 +1,17 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * dup3() for uClibc
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <unistd.h>
++
++
++#ifdef __NR_dup3
++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
++libc_hidden_def(dup3)
++#endif
+-- 
+1.7.5.4
+
+_______________________________________________
+uClibc mailing list
+uClibc@uclibc.org
+http://lists.busybox.net/mailman/listinfo/uclibc