From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 13 Jun 2011 12:45:12 +0000 (+0000)
Subject: replace unfortify patch with a better one
X-Git-Tag: reboot~16577
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7a96525a6fa88d6c5804176e5754bf03d0412040;p=oweals%2Fopenwrt.git

replace unfortify patch with a better one

Thanks to Richard Weinberger for providing this patch

SVN-Revision: 27168
---

diff --git a/target/linux/uml/patches-2.6.39/002-export___sprintf_chk.patch b/target/linux/uml/patches-2.6.39/002-export___sprintf_chk.patch
new file mode 100644
index 0000000000..1d3cf4911a
--- /dev/null
+++ b/target/linux/uml/patches-2.6.39/002-export___sprintf_chk.patch
@@ -0,0 +1,14 @@
+diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
+index 05f5ea8..9e71e7e 100644
+--- a/arch/um/os-Linux/user_syms.c
++++ b/arch/um/os-Linux/user_syms.c
+@@ -18,6 +18,9 @@ extern void *memmove(void *, const void *, size_t);
+ extern void *memset(void *, int, size_t);
+ extern int printf(const char *, ...);
+ 
++extern int __sprintf_chk(char *str, int flag, size_t strlen, const char *format);
++EXPORT_SYMBOL(__sprintf_chk);
++
+ /* If it's not defined, the export is included in lib/string.c.*/
+ #ifdef __HAVE_ARCH_STRSTR
+ EXPORT_SYMBOL(strstr);
diff --git a/target/linux/uml/patches-2.6.39/002-gcc4_unfortify_source.patch b/target/linux/uml/patches-2.6.39/002-gcc4_unfortify_source.patch
deleted file mode 100644
index 2be33d02a3..0000000000
--- a/target/linux/uml/patches-2.6.39/002-gcc4_unfortify_source.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -39,4 +39,8 @@ KBUILD_CFLAGS += $(shell if [ $(call cc-
- 			echo $(call cc-option,-fno-unit-at-a-time); \
- 			else echo $(call cc-option,-funit-at-a-time); fi ;)
- 
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
-+
- KBUILD_CFLAGS += $(cflags-y)
---- a/arch/um/Makefile-x86_64
-+++ b/arch/um/Makefile-x86_64
-@@ -24,3 +24,7 @@ LINK-y += -m64
- 
- # Do unit-at-a-time unconditionally on x86_64, following the host
- KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-+
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)