3 files changed, 18 insertions, 8 deletions
diff --git a/packages/uclibc/files/build_wcs_upper_buffer.patch b/packages/uclibc/files/build_wcs_upper_buffer.patch
new file mode 100644
index 0000000000..04e6f8905f
--- /dev/null
+++ b/packages/uclibc/files/build_wcs_upper_buffer.patch
@@ -0,0 +1,13 @@
+Index: uClibc-0.9.29/libc/misc/regex/regex_internal.h
+===================================================================
+--- uClibc-0.9.29.orig/libc/misc/regex/regex_internal.h	2006-02-28 14:24:24.000000000 +0100
++++ uClibc-0.9.29/libc/misc/regex/regex_internal.h	2008-05-01 18:35:04.000000000 +0200
+@@ -386,7 +386,7 @@
+      internal_function;
+ #ifdef RE_ENABLE_I18N
+ static void build_wcs_buffer (re_string_t *pstr) internal_function;
+-static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
++static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) internal_function;
+ #endif /* RE_ENABLE_I18N */
+ static void build_upper_buffer (re_string_t *pstr) internal_function;
+ static void re_string_translate_buffer (re_string_t *pstr) internal_function;
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 909efe51fb..c4d7ee7455 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r16"
+PR = "r17"
 
 require uclibc.inc
 
@@ -17,6 +17,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \
 	    file://errno_values.h.patch;patch=1 \
 	    file://termios.h.patch;patch=1 \
 	    file://unistd_arm.patch;patch=1 \
+	    file://build_wcs_upper_buffer.patch;patch=1 \
             file://uClibc-0.9.29-001-fix-mmap.patch;patch=1 \
             file://uClibc-0.9.29-002-atmel.1.patch;patch=1 \
             file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;patch=1 \
@@ -26,11 +27,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \
 	    file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \
             file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \
 	    file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
-            "
-
-
-# mmap-unsigned-shift_bugid1303.patch
-# http://uclibc.org/lists/uclibc-cvs/2007-May/011360.html;patch=1"
+           "
 
 #recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -44,4 +41,3 @@ SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2"
 S = "${WORKDIR}/uClibc-${UCLIBC_BASE}"
 
 LEAD_SONAME = "libc.so"
-
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index 9f67a2a4d1..4711bc9e9d 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -8,7 +8,7 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
 DEFAULT_PREFERENCE  = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
@@ -30,6 +30,7 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
             file://uClibc.distro \
             file://uclibc-arm-ftruncate64.patch;patch=1 \
             file://errno_values.h.patch;patch=1 \
+	    file://build_wcs_upper_buffer.patch;patch=1 \
             "
 
 S = "${WORKDIR}/uClibc"