From 0c3968055b878d01f4bc00f58ba882f621a8edc6 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 22 Mar 2010 18:23:33 +0000 Subject: [PATCH] uclibc: Updated (0.9.30.1 -> 0.9.30.3) Note: This commit is including a rediff of the ldconfig-glob.patch, as well as removing obsolete patches. --- base/uclibc/160-unifdef_fix.patch | 47 -------- base/uclibc/180-dl_sysdep_inline.patch | 57 --------- base/uclibc/300-fix-ppoll.patch | 55 --------- base/uclibc/430-i386_copysign.patch | 113 ------------------ ...r_dereference_in_getaddrinfo.patch.disable | 29 ----- base/uclibc/ldconfig-glob.patch | 22 ++-- .../binutils/300-006_better_file_error.patch | 60 ---------- base/uclibc/uclibc.desc | 6 +- 8 files changed, 15 insertions(+), 374 deletions(-) delete mode 100644 base/uclibc/160-unifdef_fix.patch delete mode 100644 base/uclibc/180-dl_sysdep_inline.patch delete mode 100644 base/uclibc/300-fix-ppoll.patch delete mode 100644 base/uclibc/430-i386_copysign.patch delete mode 100644 base/uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable delete mode 100644 base/uclibc/pkg_patch/binutils/300-006_better_file_error.patch diff --git a/base/uclibc/160-unifdef_fix.patch b/base/uclibc/160-unifdef_fix.patch deleted file mode 100644 index 7bdc38f95..000000000 --- a/base/uclibc/160-unifdef_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/160-unifdef_fix.patch -# Copyright (C) 2009 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 --- - -https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch ---- ./extra/scripts/unifdef.c.orig 2008-04-28 01:10:00.000000000 +0200 -+++ ./extra/scripts/unifdef.c 2009-08-25 15:20:08.000000000 +0200 -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; - diff --git a/base/uclibc/180-dl_sysdep_inline.patch b/base/uclibc/180-dl_sysdep_inline.patch deleted file mode 100644 index 6e6c87191..000000000 --- a/base/uclibc/180-dl_sysdep_inline.patch +++ /dev/null @@ -1,57 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/180-dl_sysdep_inline.patch -# Copyright (C) 2009 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 --- - -https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/180-dl_sysdep_inline.patch -Index: uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h -=================================================================== ---- ./ldso/ldso/arm/dl-sysdep.h.orig (revision 25503) -+++ ./ldso/ldso/arm/dl-sysdep.h (working copy) -@@ -15,7 +15,7 @@ - GOT_BASE[1] = (unsigned long) MODULE; \ - } - --static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p) -+static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p) - { - unsigned long i,t,inc; - i=p; t=0; -@@ -72,7 +72,7 @@ - first element of the GOT. We used to use the PIC register to do this - without a constant pool reference, but GCC 4.2 will use a pseudo-register - for the PIC base, so it may not be in r10. */ --static __inline__ Elf32_Addr __attribute__ ((unused)) -+static __always_inline Elf32_Addr __attribute__ ((unused)) - elf_machine_dynamic (void) - { - Elf32_Addr dynamic; -@@ -104,7 +104,7 @@ - } - - /* Return the run-time load address of the shared object. */ --static __inline__ Elf32_Addr __attribute__ ((unused)) -+static __always_inline Elf32_Addr __attribute__ ((unused)) - elf_machine_load_address (void) - { - extern void __dl_start __asm__ ("_dl_start"); -@@ -128,7 +128,7 @@ - return pcrel_addr - got_addr; - } - --static __inline__ void -+static __always_inline void - elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, - Elf32_Word relative_count) - { diff --git a/base/uclibc/300-fix-ppoll.patch b/base/uclibc/300-fix-ppoll.patch deleted file mode 100644 index 8b3c140cd..000000000 --- a/base/uclibc/300-fix-ppoll.patch +++ /dev/null @@ -1,55 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/300-fix-ppoll.patch -# Copyright (C) 2009 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 --- - -https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/300-fix-ppoll.diff - -It will match kernel's sigset_t starting from 0.9.31. - -Please try attached patch. --- -vda - ---- ./libc/sysdeps/linux/common/ppoll.c.orig -+++ ./libc/sysdeps/linux/common/ppoll.c -@@ -17,6 +17,7 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include - #include - #include - -@@ -26,9 +27,9 @@ - - # define __NR___libc_ppoll __NR_ppoll - static __always_inline --_syscall4(int, __libc_ppoll, struct pollfd *, fds, -+_syscall5(int, __libc_ppoll, struct pollfd *, fds, - nfds_t, nfds, const struct timespec *, timeout, -- const __sigset_t *, sigmask) -+ const __sigset_t *, sigmask, size_t, sigsetsize) - - int - ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, -@@ -43,7 +44,7 @@ - timeout = &tval; - } - -- return __libc_ppoll(fds, nfds, timeout, sigmask); -+ return __libc_ppoll(fds, nfds, timeout, sigmask, _NSIG / 8); - } - libc_hidden_def(ppoll) - diff --git a/base/uclibc/430-i386_copysign.patch b/base/uclibc/430-i386_copysign.patch deleted file mode 100644 index d2e0f0c1a..000000000 --- a/base/uclibc/430-i386_copysign.patch +++ /dev/null @@ -1,113 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/430-i386_copysign.patch -# Copyright (C) 2009 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 --- - -https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/430-i386_copysign.patch ---- ./libc/sysdeps/linux/i386/Makefile.arch.orig -+++ ./libc/sysdeps/linux/i386/Makefile.arch -@@ -9,6 +9,7 @@ CSRC := brk.c sigaction.c __syscall_erro - - SSRC := \ - __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ -- sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S -+ sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S \ -+ s_copysign.S s_copysignf.S s_copysignl.S - - include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch ---- /dev/null -+++ ./libc/sysdeps/linux/i386/s_copysign.S -@@ -0,0 +1,25 @@ -+/* -+ * Written by J.T. Conklin . -+ * Public domain. -+ */ -+ -+#define _ERRNO_H 1 -+#include -+#include -+ -+.text -+.global copysign -+.type copysign,%function -+copysign: -+ movl 16(%esp),%edx -+ movl 8(%esp),%eax -+ andl $0x80000000,%edx -+ andl $0x7fffffff,%eax -+ orl %edx,%eax -+ movl %eax,8(%esp) -+ fldl 4(%esp) -+ ret -+.size copysign,.-copysign -+ -+libc_hidden_def(copysign) -+ ---- /dev/null -+++ ./libc/sysdeps/linux/i386/s_copysignf.S -@@ -0,0 +1,25 @@ -+/* -+ * Written by J.T. Conklin . -+ * Public domain. -+ */ -+ -+#define _ERRNO_H 1 -+#include -+#include -+ -+.text -+.global copysignf -+.type copysignf,%function -+copysignf: -+ movl 8(%esp),%edx -+ movl 4(%esp),%eax -+ andl $0x80000000,%edx -+ andl $0x7fffffff,%eax -+ orl %edx,%eax -+ movl %eax,4(%esp) -+ flds 4(%esp) -+ ret -+.size copysignf,.-copysignf -+ -+libc_hidden_def(copysignf) -+ ---- /dev/null -+++ ./libc/sysdeps/linux/i386/s_copysignl.S -@@ -0,0 +1,26 @@ -+/* -+ * Written by J.T. Conklin . -+ * Changes for long double by Ulrich Drepper -+ * Public domain. -+ */ -+ -+#define _ERRNO_H 1 -+#include -+#include -+ -+.text -+.global copysignl -+.type copysignl,%function -+copysignl: -+ movl 24(%esp),%edx -+ movl 12(%esp),%eax -+ andl $0x8000,%edx -+ andl $0x7fff,%eax -+ orl %edx,%eax -+ movl %eax,12(%esp) -+ fldt 4(%esp) -+ ret -+.size copysignl,.-copysignl -+ -+libc_hidden_def(copysignl) -+ diff --git a/base/uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable b/base/uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable deleted file mode 100644 index 9805fb8de..000000000 --- a/base/uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable +++ /dev/null @@ -1,29 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch.disable -# Copyright (C) 2009 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 --- - -https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.30.1/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.patch -[toolchain] uClibc-0.9.30.1: fix possible NULL pointer dereference (closes #5242) ---- ./libc/inet/getaddrinfo.c.orig -+++ ./libc/inet/getaddrinfo.c -@@ -187,6 +187,8 @@ - } - - for (runp = ifa; runp != NULL; runp = runp->ifa_next) { -+ if (runp->ifa_addr == NULL) -+ continue; - #if defined __UCLIBC_HAS_IPV4__ - if (runp->ifa_addr->sa_family == PF_INET) - seen |= SEEN_IPV4; diff --git a/base/uclibc/ldconfig-glob.patch b/base/uclibc/ldconfig-glob.patch index 851375452..22ddf3177 100644 --- a/base/uclibc/ldconfig-glob.patch +++ b/base/uclibc/ldconfig-glob.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../uclibc/ldconfig-glob.patch -# Copyright (C) 2009 The OpenSDE Project +# Copyright (C) 2009 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2007 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -18,17 +18,19 @@ Add pathname pattern matching to ldconfig -- Michael Tross ---- ./utils/ldconfig.c.orig 2007-04-18 01:08:20.000000000 +0200 -+++ ./utils/ldconfig.c 2007-05-08 05:37:25.000000000 +0200 -@@ -36,6 +36,7 @@ - #include - #include +--- uClibc-0.9.30.3/utils/porting.h.orig 2010-03-18 16:51:39.013157743 +0100 ++++ uClibc-0.9.30.3/utils/porting.h 2010-03-18 16:53:00.816997080 +0100 +@@ -11,6 +11,7 @@ + #include + #include #include +#include - #include - #include - #include -@@ -995,8 +996,45 @@ + #include + #include + #include +--- uClibc-0.9.30.3/utils/ldconfig.c.orig 2010-03-12 20:32:42.000000000 +0100 ++++ uClibc-0.9.30.3/utils/ldconfig.c 2010-03-18 16:36:11.013052410 +0100 +@@ -969,8 +969,45 @@ warnx("You should remove `%s' from `%s'", cp, LDSO_CONF); continue; } diff --git a/base/uclibc/pkg_patch/binutils/300-006_better_file_error.patch b/base/uclibc/pkg_patch/binutils/300-006_better_file_error.patch deleted file mode 100644 index f882d12e3..000000000 --- a/base/uclibc/pkg_patch/binutils/300-006_better_file_error.patch +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -e -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uclibc/pkg_patch/binutils-300-006_better_file_error.patch -# Copyright (C) 2006 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 --- - -## 006_better_file_error.dpatch by David Kimdon -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Specify which filename is causing an error if the filename is a -## DP: directory. (#45832) - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c ---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 -+++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 -@@ -150,6 +150,13 @@ - { - bfd *nbfd; - const bfd_target *target_vec; -+ struct stat s; -+ -+ if (stat (filename, &s) == 0) -+ if (S_ISDIR(s.st_mode)) { -+ bfd_set_error (bfd_error_file_not_recognized); -+ return NULL; -+ } - - nbfd = _bfd_new_bfd (); - if (nbfd == NULL) diff --git a/base/uclibc/uclibc.desc b/base/uclibc/uclibc.desc index 6ad5c9f8d..c1f825fb2 100644 --- a/base/uclibc/uclibc.desc +++ b/base/uclibc/uclibc.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../uclibc/uclibc.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -36,7 +36,7 @@ [L] LGPL [S] Stable -[V] 0.9.30.1 +[V] 0.9.30.3 [P] O 01---5---9 101.700 -[D] 758585862 uClibc-0.9.30.1.tar.bz2 http://www.uclibc.org/downloads/ +[D] 434019075 uClibc-0.9.30.3.tar.bz2 http://www.uclibc.org/downloads/