aboutsummaryrefslogtreecommitdiff
path: root/package/diffutils
diff options
context:
space:
mode:
Diffstat (limited to 'package/diffutils')
-rw-r--r--package/diffutils/diffutils.mk1
-rw-r--r--package/diffutils/diffutils.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 56d17eb66f..5a5645c2b2 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -17,6 +17,7 @@ diffutils-source: $(DL_DIR)/$(DIFFUTILS_SOURCE)
$(DIFFUTILS_DIR)/.unpacked: $(DL_DIR)/$(DIFFUTILS_SOURCE)
$(DIFFUTILS_CAT) $(DL_DIR)/$(DIFFUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(DIFFUTILS_DIR) package/diffutils/ diffutils*.patch
touch $(DIFFUTILS_DIR)/.unpacked
$(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked
diff --git a/package/diffutils/diffutils.patch b/package/diffutils/diffutils.patch
new file mode 100644
index 0000000000..fba2b84a85
--- /dev/null
+++ b/package/diffutils/diffutils.patch
@@ -0,0 +1,12 @@
+diff -ur diffutils-2.8.4/lib/regex.c diffutils-2.8.4-patched/lib/regex.c
+--- diffutils-2.8.4/lib/regex.c 2002-03-01 01:44:52.000000000 -0600
++++ diffutils-2.8.4-patched/lib/regex.c 2005-12-08 00:44:03.101524750 -0600
+@@ -8314,7 +8314,7 @@
+ if (msg_size > errbuf_size)
+ {
+ #if defined HAVE_MEMPCPY || defined _LIBC
+- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+ #else
+ memcpy (errbuf, msg, errbuf_size - 1);
+ errbuf[errbuf_size - 1] = 0;