summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ghc.mk2
-rw-r--r--libffi/libffi.selinux-detection-3.0.8.patch15
2 files changed, 17 insertions, 0 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 6dfef8ff3b..080c43f850 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -107,6 +107,8 @@ $(libffi_STAMP_CONFIGURE):
cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; }
mv libffi/libffi-* libffi/build
chmod +x libffi/ln
+ # don't report nonselinux systems as selinux
+ cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.selinux-detection-3.0.8.patch
# Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
# warnings off or the compilation of libffi might fail due to warnings
diff --git a/libffi/libffi.selinux-detection-3.0.8.patch b/libffi/libffi.selinux-detection-3.0.8.patch
new file mode 100644
index 0000000000..a919f28817
--- /dev/null
+++ b/libffi/libffi.selinux-detection-3.0.8.patch
@@ -0,0 +1,15 @@
+src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
+
+http://github.com/atgreen/libffi/commit/eaf444eabc4c78703c0f98ac0197b1619c1b1bef
+
+--- src/closures.c
++++ src/closures.c
+@@ -146,7 +146,7 @@
+ p = strchr (p + 1, ' ');
+ if (p == NULL)
+ break;
+- if (strncmp (p + 1, "selinuxfs ", 10) != 0)
++ if (strncmp (p + 1, "selinuxfs ", 10) == 0)
+ {
+ free (buf);
+ fclose (f);