eglibc: bump to version 2.18 SVN R23787
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Mon, 2 Dec 2013 00:29:55 +0000 (21:29 -0300)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 2 Dec 2013 07:45:19 +0000 (08:45 +0100)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch [deleted file]
package/glibc/glibc.mk

diff --git a/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch b/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch
deleted file mode 100644 (file)
index c9bf107..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix for CVE-2013-4788 from http://hmarco.org/bugs/CVE-2013-4788.html
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -rupN glibc-2.17/csu/libc-start.c glibc-2.17-mangle-fix/csu/libc-start.c
---- glibc-2.17/libc/csu/libc-start.c   2012-12-25 04:02:13.000000000 +0100
-+++ glibc-2.17-mangle-fix/libc/csu/libc-start.c        2013-07-10 00:13:48.000000000 +0200
-@@ -38,6 +38,12 @@ extern void __pthread_initialize_minimal
-    in thread local area.  */
- uintptr_t __stack_chk_guard attribute_relro;
- # endif
-+
-+# ifndef  THREAD_SET_POINTER_GUARD
-+uintptr_t __pointer_chk_guard_local
-+     attribute_relro attribute_hidden __attribute__ ((nocommon));
-+# endif
-+
- #endif
- #ifdef HAVE_PTR_NTHREADS
-@@ -184,6 +190,14 @@ LIBC_START_MAIN (int (*main) (int, char
- # else
-   __stack_chk_guard = stack_chk_guard;
- # endif
-+    uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
-+                          stack_chk_guard);
-+# ifdef THREAD_SET_POINTER_GUARD
-+      THREAD_SET_POINTER_GUARD (pointer_chk_guard);
-+# else
-+      __pointer_chk_guard_local = pointer_chk_guard;
-+# endif
-+
- #endif
-   /* Register the destructor of the dynamic linker if there is any.  */
index 2e7fe82a820651b4d5896d3635c8dcd9fc403b18..eb2914304325a04aeca7d405c9ef70749312e7ec 100644 (file)
@@ -5,7 +5,7 @@
 ################################################################################
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
-GLIBC_VERSION = 2.17-svnr22064
+GLIBC_VERSION = 2.18-svnr23787
 GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
 GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2
 GLIBC_SRC_SUBDIR = libc