From 8b0871f86b8684045a9295d6f1cefdc3a04726df Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 6 Aug 2012 10:11:33 +0200 Subject: [PATCH] uclibc: Updated (0.9.32.1 -> 0.9.33.2) --- base/uclibc/add-dns-skipname.patch | 104 ------------------ ...c_epoll_pwait-compile-failure-on-x86.patch | 59 ---------- ...0-__fe_nomask_env-use-of-__set_errno.patch | 50 --------- ...libc-0.9.32.1-linuxthreads-errno-fix.patch | 84 -------------- .../uClibc-0.9.32.1-sparc-errno-fix.patch | 27 ----- base/uclibc/uClibc-0.9.32.1-unshare.patch | 98 ----------------- ...ibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch | 44 ++++++++ base/uclibc/uClibc-0.9.33.2-dup3.patch | 70 ++++++++++++ base/uclibc/uclibc.desc | 4 +- 9 files changed, 116 insertions(+), 424 deletions(-) delete mode 100644 base/uclibc/add-dns-skipname.patch delete mode 100644 base/uclibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch delete mode 100644 base/uclibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch delete mode 100644 base/uclibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch delete mode 100644 base/uclibc/uClibc-0.9.32.1-sparc-errno-fix.patch delete mode 100644 base/uclibc/uClibc-0.9.32.1-unshare.patch create mode 100644 base/uclibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch create mode 100644 base/uclibc/uClibc-0.9.33.2-dup3.patch diff --git a/base/uclibc/add-dns-skipname.patch b/base/uclibc/add-dns-skipname.patch deleted file mode 100644 index 3b8d39446..000000000 --- a/base/uclibc/add-dns-skipname.patch +++ /dev/null @@ -1,104 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/add-dns-skipname.patch -# Copyright (C) 2009 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- ---- uClibc-0.9.27/libc/inet/resolv.c.orig 2005-02-01 11:16:03.000000000 -0800 -+++ uClibc-0.9.27/libc/inet/resolv.c 2005-02-01 11:27:30.000000000 -0800 -@@ -2543,4 +2543,85 @@ - return (len); - } - libc_hidden_def(ns_name_unpack) -+ -+#define NS_TYPE_ELT 0x40 /* EDNS0 extended label type */ -+#define DNS_LABELTYPE_BITSTRING 0x41 -+ -+int -+__labellen(const u_char *lp) -+{ -+ int bitlen; -+ u_char l = *lp; -+ -+ if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) { -+ /* should be avoided by the caller */ -+ return(-1); -+ } -+ -+ if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) { -+ if (l == DNS_LABELTYPE_BITSTRING) { -+ if ((bitlen = *(lp + 1)) == 0) -+ bitlen = 256; -+ return((bitlen + 7 ) / 8 + 1); -+ } -+ return(-1); /* unknwon ELT */ -+ } -+ return(l); -+} -+ -+/* -+ * ns_name_skip(ptrptr, eom) -+ * Advance *ptrptr to skip over the compressed name it points at. -+ * return: -+ * 0 on success, -1 (with errno set) on failure. -+ */ -+int -+__ns_name_skip(const u_char **ptrptr, const u_char *eom) -+{ -+ const u_char *cp; -+ u_int n; -+ int l; -+ -+ cp = *ptrptr; -+ while (cp < eom && (n = *cp++) != 0) { -+ /* Check for indirection. */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: /* normal case, n == len */ -+ cp += n; -+ continue; -+ case NS_TYPE_ELT: /* EDNS0 extended label */ -+ if ((l = __labellen(cp - 1)) < 0) { -+ __set_errno(EMSGSIZE); -+ return(-1); -+ } -+ cp += l; -+ continue; -+ case NS_CMPRSFLGS: /* indirection */ -+ cp++; -+ break; -+ default: /* illegal type */ -+ __set_errno(EMSGSIZE); -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) { -+ __set_errno(EMSGSIZE); -+ return (-1); -+ } -+ *ptrptr = cp; -+ return (0); -+} -+ -+/* -+ * Skip over a compressed domain name. Return the size or -1. -+ */ -+int -+__dn_skipname(const u_char *ptr, const u_char *eom) { -+ const u_char *saveptr = ptr; -+ -+ if (__ns_name_skip(&ptr, eom) == -1) -+ return (-1); -+ return (ptr - saveptr); -+} - #endif /* L_ns_name */ diff --git a/base/uclibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/base/uclibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch deleted file mode 100644 index b1f43ecbb..000000000 --- a/base/uclibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From 8245f3b4638fdff2011c2657af1bb211def704bc Mon Sep 17 00:00:00 2001 -From: Phil Blundell -Date: Sat, 11 Jun 2011 01:10:46 -0400 -Subject: [PATCH] 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 ---- - libc/sysdeps/linux/common/epoll.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -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; - } --- -1.7.5.4 - diff --git a/base/uclibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch b/base/uclibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch deleted file mode 100644 index c15d3a558..000000000 --- a/base/uclibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch +++ /dev/null @@ -1,50 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ->From 49f58308779cb0b798f5e7bc902bbc515c1ec394 Mon Sep 17 00:00:00 2001 -From: Jason Woodward -Date: Sat, 11 Jun 2011 22:00:59 -0400 -Subject: [PATCH] Fix e500 __fe_nomask_env use of __set_errno w/o CFLAGS-libm - -Since the new _LIBC guard in 96c9a8f7d00cdf6bb7968a2390b9d87da8a45e2d we need -to use CFLAGS-libm (-DNOT_IN_libc -DIS_IN_libm) or we end up with linker -errors like: - - lib/libm.a(fe_nomask.os): In function `__fe_nomask_env': - fe_nomask.c:(.text+0x26): undefined reference to `__libc_errno' - collect2: ld returned 1 exit status - -Signed-off-by: Jason Woodward ---- - libm/powerpc/e500/fpu/Makefile.arch | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/libm/powerpc/e500/fpu/Makefile.arch b/libm/powerpc/e500/fpu/Makefile.arch -index 904561e..a64843f 100644 ---- a/libm/powerpc/e500/fpu/Makefile.arch -+++ b/libm/powerpc/e500/fpu/Makefile.arch -@@ -11,6 +11,8 @@ libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c) - libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC)) - endif - -+CFLAGS-fe_nomask.c := $(CFLAGS-libm) -+ - libm_ARCH_OBJS:=$(libm_ARCH_OBJ) - - ifeq ($(DOPIC),y) --- -1.7.0.4 - diff --git a/base/uclibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch b/base/uclibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch deleted file mode 100644 index 20fd96170..000000000 --- a/base/uclibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch +++ /dev/null @@ -1,84 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 5 Jul 2010 14:08:17 +0200 -Subject: [PATCH] don't make __errno_location / __h_errno_location hidden - -Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089) - -__errno_location / __h_errno_location access has to go through the PLT -like malloc/free, so the linuxthread variants gets used instead when -compiling with -pthread. - -Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b - -Signed-off-by: Peter Korsgaard ---- - include/netdb.h | 1 - - libc/misc/internals/__errno_location.c | 3 --- - libc/misc/internals/__h_errno_location.c | 1 - - libc/sysdeps/linux/common/bits/errno.h | 1 - - 6 files changed, 0 insertions(+), 11 deletions(-) - -diff --git a/include/netdb.h b/include/netdb.h -index 9d3807d..ac411ab 100644 ---- a/include/netdb.h -+++ b/include/netdb.h -@@ -59,7 +59,6 @@ __BEGIN_DECLS - - /* Function to get address of global `h_errno' variable. */ - extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); --libc_hidden_proto(__h_errno_location) - - /* Macros for accessing h_errno from inside libc. */ - #ifdef _LIBC -diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c -index 487a9c2..0620860 100644 ---- a/libc/misc/internals/__errno_location.c -+++ b/libc/misc/internals/__errno_location.c -@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void) - { - return &errno; - } --#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */ --libc_hidden_weak(__errno_location) --#endif -diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c -index 213d398..235df4e 100644 ---- a/libc/misc/internals/__h_errno_location.c -+++ b/libc/misc/internals/__h_errno_location.c -@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void) - { - return &h_errno; - } --libc_hidden_weak(__h_errno_location) -diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c -index 6e520fa..f4a9ebb 100644 ---- a/libc/sysdeps/linux/common/bits/errno.h -+++ b/libc/sysdeps/linux/common/bits/errno.h -@@ -43,7 +43,6 @@ - # ifndef __ASSEMBLER__ - /* Function to get address of global `errno' variable. */ - extern int *__errno_location (void) __THROW __attribute__ ((__const__)); --libc_hidden_proto(__errno_location) - - # ifdef __UCLIBC_HAS_THREADS__ - /* When using threads, errno is a per-thread value. */ --- -1.7.1 - diff --git a/base/uclibc/uClibc-0.9.32.1-sparc-errno-fix.patch b/base/uclibc/uClibc-0.9.32.1-sparc-errno-fix.patch deleted file mode 100644 index 7aef3a923..000000000 --- a/base/uclibc/uClibc-0.9.32.1-sparc-errno-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/uClibc-0.9.32.1-sparc-errno-fix.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S 2011-06-08 21:35:20.000000000 +0200 -+++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S 2011-11-11 15:57:25.000000000 +0100 -@@ -52,7 +52,7 @@ - restore %g0,%g0,%o0 - - .Lerror: -- call HIDDEN_JUMPTARGET(__errno_location) -+ call __errno_location - or %g0,EINVAL,%i0 - st %i0,[%o0] - ret diff --git a/base/uclibc/uClibc-0.9.32.1-unshare.patch b/base/uclibc/uClibc-0.9.32.1-unshare.patch deleted file mode 100644 index 96af40158..000000000 --- a/base/uclibc/uClibc-0.9.32.1-unshare.patch +++ /dev/null @@ -1,98 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/uClibc-0.9.32.1-unshare.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Backport of unshare() syscall. -From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581 - -Signed-off-by: Gustavo Zacarias - ---- -diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h ---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h 2011-12-02 23:54:30.571841170 -0300 -+++ uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h 2011-12-02 23:57:45.874205079 -0300 -@@ -58,7 +58,13 @@ - force CLONE_PTRACE on this clone. */ - # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in - the child. */ --# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */ -+# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */ -+# define CLONE_NEWUTS 0x04000000 /* New utsname group. */ -+# define CLONE_NEWIPC 0x08000000 /* New ipcs. */ -+# define CLONE_NEWUSER 0x10000000 /* New user namespace. */ -+# define CLONE_NEWPID 0x20000000 /* New pid namespace. */ -+# define CLONE_NEWNET 0x40000000 /* New network namespace. */ -+# define CLONE_IO 0x80000000 /* Clone I/O context. */ - #endif - - /* The official definition. */ -@@ -74,11 +80,9 @@ - extern int clone (int (*__fn) (void *__arg), void *__child_stack, - int __flags, void *__arg, ...) __THROW; - --#if 0 - /* Unshare the specified resources. */ - extern int unshare (int __flags) __THROW; - #endif --#endif - - __END_DECLS - -diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in ---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in 2011-12-02 23:54:30.577841215 -0300 -+++ uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in 2011-12-02 23:56:08.801527166 -0300 -@@ -24,7 +24,8 @@ - remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \ - sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \ - splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \ -- sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c -+ sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \ -+ vhangup.c - # NPTL needs these internally: madvise.c - CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c - ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c ---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c 2011-12-02 23:54:30.577841215 -0300 -+++ uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c 2011-12-02 23:58:18.803435042 -0300 -@@ -278,6 +278,10 @@ - make_stub(umount2) - #endif - -+#if !defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__ -+make_stub(unshare) -+#endif -+ - #ifndef __NR_utimensat - make_stub(futimens) - make_stub(utimensat) -diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c ---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c 1969-12-31 21:00:00.000000000 -0300 -+++ uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c 2011-12-02 23:58:42.693601880 -0300 -@@ -0,0 +1,15 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * unshare() for uClibc -+ * -+ * Copyright (C) 2011 Henning Heinold -+ * -+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -+ */ -+ -+#include -+#include -+ -+#if defined __NR_unshare -+_syscall1(int, unshare, int, flags) -+#endif diff --git a/base/uclibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch b/base/uclibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch new file mode 100644 index 000000000..93b2bd836 --- /dev/null +++ b/base/uclibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch @@ -0,0 +1,44 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../uclibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch +# Copyright (C) 2012 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +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/base/uclibc/uClibc-0.9.33.2-dup3.patch b/base/uclibc/uClibc-0.9.33.2-dup3.patch new file mode 100644 index 000000000..98e12a528 --- /dev/null +++ b/base/uclibc/uClibc-0.9.33.2-dup3.patch @@ -0,0 +1,70 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../uclibc/uClibc-0.9.33.2-dup3.patch +# Copyright (C) 2012 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From: Jonas Bonn +Subject: [RFC PATCH 16/38] Add dup3 syscall +Date: Tue, 6 Sep 2011 10:30:40 +0200 + +Signed-off-by: Jonas Bonn +--- + 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,15 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * dup3() for uClibc ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++ ++ ++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags) ++libc_hidden_def(dup3) +-- +1.7.5.4 + +_______________________________________________ +uClibc mailing list +uClibc@uclibc.org +http://lists.busybox.net/mailman/listinfo/uclibc diff --git a/base/uclibc/uclibc.desc b/base/uclibc/uclibc.desc index fd65093b3..f1cd77f76 100644 --- a/base/uclibc/uclibc.desc +++ b/base/uclibc/uclibc.desc @@ -36,7 +36,7 @@ [L] LGPL [S] Stable -[V] 0.9.32.1 +[V] 0.9.33.2 [P] O 01---5---9 101.700 -[D] 3229280891 uClibc-0.9.32.1.tar.bz2 http://www.uclibc.org/downloads/ +[D] 4076618481 uClibc-0.9.33.2.tar.bz2 http://www.uclibc.org/downloads/