summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Koltsov <maksbotan@gentoo.org>2011-12-19 13:14:03 +0000
committerMaxim Koltsov <maksbotan@gentoo.org>2011-12-19 13:14:03 +0000
commit1093efd0f4673f74128431fd98bc93f62905f310 (patch)
tree27e419016605c1e72c544ddd0b7051bee6574010 /sys-apps/fakechroot/files
parentVersion bump (diff)
downloadgentoo-2-1093efd0f4673f74128431fd98bc93f62905f310.tar.gz
gentoo-2-1093efd0f4673f74128431fd98bc93f62905f310.tar.bz2
gentoo-2-1093efd0f4673f74128431fd98bc93f62905f310.zip
Bump patch too
(Portage version: 2.1.10.40/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/fakechroot/files')
-rw-r--r--sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch b/sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch
new file mode 100644
index 000000000000..a714d02a59c4
--- /dev/null
+++ b/sys-apps/fakechroot/files/fakechroot-2.15-fix_chk_fail.patch
@@ -0,0 +1,25 @@
+# This patch fix the availablity of __chk_fail function.
+# patch from blueness@gentoo.org
+
+diff -ur fakechroot-2.14.orig//src/__realpath_chk.c fakechroot-2.14/src/__realpath_chk.c
+--- fakechroot-2.14.orig//src/__realpath_chk.c 2011-07-04 16:59:16.176441002 +0200
++++ fakechroot-2.14/src/__realpath_chk.c 2011-07-04 17:00:23.718441000 +0200
+@@ -24,10 +24,18 @@
+
+ #define _FORTIFY_SOURCE 2
+ #include <stddef.h>
++#include <stdlib.h>
+ #include "libfakechroot.h"
+
+
++#ifdef HAVE___CHK_FAIL
+ extern void __chk_fail (void) __attribute__((__noreturn__));
++#else
++__attribute__((__noreturn__)) void __chk_fail (void)
++{
++ exit(-1);
++}
++#endif
+
+ wrapper(__realpath_chk, char *, (const char * path, char * resolved, size_t resolvedlen))
+ {