Merge branch 'master' into i486

1 files changed, 16 insertions, 0 deletions

diff --git a/extra/ctags/ctags-seccomp32.patch b/extra/ctags/ctags-seccomp32.patch
new file mode 100644
index 00000000..f371b969
--- /dev/null
+++ b/extra/ctags/ctags-seccomp32.patch
@@ -0,0 +1,16 @@
+diff -rauN ctags/main/seccomp.c ctags-seccomp32-patch/main/seccomp.c
+--- ctags/main/seccomp.c	2018-11-22 16:36:35.366666457 +0100
++++ ctags-seccomp32-patch/main/seccomp.c	2018-11-22 16:37:05.683333126 +0100
+@@ -41,10 +41,12 @@
+ 
+ 	// The bowels of stdio want to know the size of a file, even for stdout.
+ 	seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS (fstat), 0);
++	seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS (fstat64), 0);
+ 
+ 	// seems unnecessary, but this comes from
+ 	// main/parse.c:2764 : tagFilePosition (&tagfpos);
+ 	seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS (lseek), 0);
++	seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS (_llseek), 0);
+ 
+ 	// libxml2 uses pthread_once, which in turn uses a futex
+ 	seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS (futex), 0);