Replace strace workaround with a patch.

The correct solution was checked in to strace GIT; will be part of the
next release. Backport patch to 4.10..4.15, and remove the workaround
from 500-strace.sh. Versions 4.9 and older should build fine even
without the workaround (they would be picking up wrong definitions,
but they need different patch and I don't feel like spending any time
on these versions).

Signed-off-by: Alexey Neyman <stilor@att.net>

6 files changed, 866 insertions, 0 deletions

diff --git a/patches/strace/4.10/010-use-host-ioctl.patch b/patches/strace/4.10/010-use-host-ioctl.patch
new file mode 100644
index 0000000..e9c34d3
--- /dev/null
+++ b/patches/strace/4.10/010-use-host-ioctl.patch
@@ -0,0 +1,142 @@
+diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c
+--- strace-4.10.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
++++ strace-4.10/ioctl_iocdef.c	2017-01-14 15:05:49.505335680 -0800
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
++ * is included into ioctlsort (which is compiled for build). Since some
++ * of these values are used in structure initializers, they cannot be
++ * defined as 'const unsigned int' - instead, they have to be macros.
++ * Hence, the result of preprocessing will be run through sed to change
++ * 'DEFINE' into '#define'
++ */
++#include <linux/ioctl.h>
++
++DEFINE HOST_IOC_NONE _IOC_NONE
++DEFINE HOST_IOC_READ _IOC_READ
++DEFINE HOST_IOC_WRITE _IOC_WRITE
++
++DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
++DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
+diff -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c
+--- strace-4.10.orig/ioctlsort.c	2015-02-15 18:35:58.000000000 -0800
++++ strace-4.10/ioctlsort.c	2017-01-14 15:20:30.597371979 -0800
+@@ -33,7 +33,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <linux/ioctl.h>
++
++#include "ioctl_iocdef.h"
+ 
+ struct ioctlent {
+ 	const char *info;
+diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
+--- strace-4.10.orig/Makefile.am	2015-03-05 18:19:01.000000000 -0800
++++ strace-4.10/Makefile.am	2017-01-14 15:07:28.978244260 -0800
+@@ -159,6 +159,7 @@ EXTRA_DIST =				\
+ 	debian/strace64.manpages	\
+ 	debian/watch			\
+ 	errnoent.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/syscallent.h		\
+@@ -416,15 +417,24 @@ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFL
+ ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
+ ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
+ BUILT_SOURCES += $(ioctlent_h)
+-CLEANFILES = $(ioctlent_h)
++CLEANFILES = $(ioctlent_h) ioctl_iocdef.h
+ 
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
+--- strace-4.10.orig/Makefile.in	2015-03-06 07:16:46.000000000 -0800
++++ strace-4.10/Makefile.in	2017-01-14 15:23:06.718794409 -0800
+@@ -687,6 +687,7 @@ EXTRA_DIST = \
+ 	debian/strace64.manpages	\
+ 	debian/watch			\
+ 	errnoent.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/syscallent.h		\
+@@ -921,7 +922,7 @@ ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS
+ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD)
+ ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
+ ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
+-CLEANFILES = $(ioctlent_h)
++CLEANFILES = $(ioctlent_h) ioctl_iocdef.h
+ @MAINTAINER_MODE_TRUE@gen_changelog_start_date = 2009-07-08 20:00
+ all: $(BUILT_SOURCES) config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -3414,13 +3415,22 @@ news-check: NEWS
+ 		exit 1;						\
+ 	fi
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.11/010-use-host-ioctl.patch b/patches/strace/4.11/010-use-host-ioctl.patch
new file mode 100644
index 0000000..5155200
--- /dev/null
+++ b/patches/strace/4.11/010-use-host-ioctl.patch
@@ -0,0 +1,144 @@
+diff -urpN strace-4.11.orig/ioctl_iocdef.c strace-4.11/ioctl_iocdef.c
+--- strace-4.11.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
++++ strace-4.11/ioctl_iocdef.c	2017-01-14 15:31:16.925139193 -0800
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
++ * is included into ioctlsort (which is compiled for build). Since some
++ * of these values are used in structure initializers, they cannot be
++ * defined as 'const unsigned int' - instead, they have to be macros.
++ * Hence, the result of preprocessing will be run through sed to change
++ * 'DEFINE' into '#define'
++ */
++#include <linux/ioctl.h>
++
++DEFINE HOST_IOC_NONE _IOC_NONE
++DEFINE HOST_IOC_READ _IOC_READ
++DEFINE HOST_IOC_WRITE _IOC_WRITE
++
++DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
++DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
+diff -urpN strace-4.11.orig/ioctlsort.c strace-4.11/ioctlsort.c
+--- strace-4.11.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
++++ strace-4.11/ioctlsort.c	2017-01-14 15:32:13.373831957 -0800
+@@ -33,7 +33,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <linux/ioctl.h>
++
++#include "ioctl_iocdef.h"
+ 
+ struct ioctlent {
+ 	const char *info;
+diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
+--- strace-4.11.orig/Makefile.am	2015-12-17 09:56:48.000000000 -0800
++++ strace-4.11/Makefile.am	2017-01-14 15:33:39.186837242 -0800
+@@ -239,6 +239,7 @@ EXTRA_DIST =				\
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -666,17 +667,26 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+ 	cat $^ > $@
+ 
+ BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
+-CLEANFILES    = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
++CLEANFILES    = $(ioctlent_h) ioctl_iocdef.h native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+ 
+ # defines mpers_source_files
+diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
+--- strace-4.11.orig/Makefile.in	2015-12-21 15:24:05.000000000 -0800
++++ strace-4.11/Makefile.in	2017-01-14 15:34:34.803440359 -0800
+@@ -848,6 +848,7 @@ EXTRA_DIST = \
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -1243,7 +1244,7 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
+ BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h \
+ 	native_printer_defs.h printers.h sen.h sys_func.h .version \
+ 	$(am__append_7) $(am__append_11)
+-CLEANFILES = $(ioctlent_h) native_printer_decls.h \
++CLEANFILES = $(ioctlent_h) ioctl_iocdef.h native_printer_decls.h \
+ 	native_printer_defs.h printers.h sen.h sys_func.h \
+ 	$(am__append_8) $(am__append_12)
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+@@ -4829,13 +4830,22 @@ news-check: NEWS
+ 		exit 1;						\
+ 	fi
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.12/010-use-host-ioctl.patch b/patches/strace/4.12/010-use-host-ioctl.patch
new file mode 100644
index 0000000..bd5a40e
--- /dev/null
+++ b/patches/strace/4.12/010-use-host-ioctl.patch
@@ -0,0 +1,145 @@
+diff -urpN strace-4.12.orig/ioctl_iocdef.c strace-4.12/ioctl_iocdef.c
+--- strace-4.12.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
++++ strace-4.12/ioctl_iocdef.c	2017-01-14 15:35:21.055924401 -0800
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
++ * is included into ioctlsort (which is compiled for build). Since some
++ * of these values are used in structure initializers, they cannot be
++ * defined as 'const unsigned int' - instead, they have to be macros.
++ * Hence, the result of preprocessing will be run through sed to change
++ * 'DEFINE' into '#define'
++ */
++#include <linux/ioctl.h>
++
++DEFINE HOST_IOC_NONE _IOC_NONE
++DEFINE HOST_IOC_READ _IOC_READ
++DEFINE HOST_IOC_WRITE _IOC_WRITE
++
++DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
++DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
+diff -urpN strace-4.12.orig/ioctlsort.c strace-4.12/ioctlsort.c
+--- strace-4.12.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
++++ strace-4.12/ioctlsort.c	2017-01-14 15:35:21.055924401 -0800
+@@ -33,7 +33,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <linux/ioctl.h>
++
++#include "ioctl_iocdef.h"
+ 
+ struct ioctlent {
+ 	const char *info;
+diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
+--- strace-4.12.orig/Makefile.am	2016-05-28 03:29:30.000000000 -0700
++++ strace-4.12/Makefile.am	2017-01-14 15:36:46.916796883 -0800
+@@ -274,6 +274,7 @@ EXTRA_DIST =				\
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -712,10 +713,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+@@ -723,7 +733,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+ 
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
+-CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+ 
+diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
+--- strace-4.12.orig/Makefile.in	2016-05-31 04:35:57.000000000 -0700
++++ strace-4.12/Makefile.in	2017-01-14 15:37:33.353259891 -0800
+@@ -952,6 +952,7 @@ EXTRA_DIST = \
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -1351,7 +1352,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
+ 	native_printer_defs.h printers.h sen.h sys_func.h .version \
+ 	$(am__append_7) $(am__append_11)
+-CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
+ 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
+ 	sys_func.h $(am__append_8) $(am__append_12)
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+@@ -5506,13 +5507,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ 	rm -f $<-t
+ 	mv $@-t $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.13/010-use-host-ioctl.patch b/patches/strace/4.13/010-use-host-ioctl.patch
new file mode 100644
index 0000000..40ebbf3
--- /dev/null
+++ b/patches/strace/4.13/010-use-host-ioctl.patch
@@ -0,0 +1,145 @@
+diff -urpN strace-4.13.orig/ioctl_iocdef.c strace-4.13/ioctl_iocdef.c
+--- strace-4.13.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
++++ strace-4.13/ioctl_iocdef.c	2017-01-14 15:50:14.368196376 -0800
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
++ * is included into ioctlsort (which is compiled for build). Since some
++ * of these values are used in structure initializers, they cannot be
++ * defined as 'const unsigned int' - instead, they have to be macros.
++ * Hence, the result of preprocessing will be run through sed to change
++ * 'DEFINE' into '#define'
++ */
++#include <linux/ioctl.h>
++
++DEFINE HOST_IOC_NONE _IOC_NONE
++DEFINE HOST_IOC_READ _IOC_READ
++DEFINE HOST_IOC_WRITE _IOC_WRITE
++
++DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
++DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
+diff -urpN strace-4.13.orig/ioctlsort.c strace-4.13/ioctlsort.c
+--- strace-4.13.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
++++ strace-4.13/ioctlsort.c	2017-01-14 15:50:14.368196376 -0800
+@@ -33,7 +33,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <linux/ioctl.h>
++
++#include "ioctl_iocdef.h"
+ 
+ struct ioctlent {
+ 	const char *info;
+diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
+--- strace-4.13.orig/Makefile.am	2016-07-22 12:28:06.000000000 -0700
++++ strace-4.13/Makefile.am	2017-01-14 15:50:14.368196376 -0800
+@@ -283,6 +283,7 @@ EXTRA_DIST =				\
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -721,10 +722,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+@@ -732,7 +742,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+ 
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
+-CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+ 
+diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
+--- strace-4.13.orig/Makefile.in	2016-07-26 09:17:18.000000000 -0700
++++ strace-4.13/Makefile.in	2017-01-14 15:50:14.368196376 -0800
+@@ -978,6 +978,7 @@ EXTRA_DIST = \
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -1377,7 +1378,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
+ 	native_printer_defs.h printers.h sen.h sys_func.h .version \
+ 	$(am__append_7) $(am__append_11)
+-CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
+ 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
+ 	sys_func.h $(am__append_8) $(am__append_12)
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+@@ -5730,13 +5731,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ 	rm -f $<-t
+ 	mv $@-t $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.14/010-use-host-ioctl.patch b/patches/strace/4.14/010-use-host-ioctl.patch
new file mode 100644
index 0000000..2c7671f
--- /dev/null
+++ b/patches/strace/4.14/010-use-host-ioctl.patch
@@ -0,0 +1,145 @@
+diff -urpN strace-4.14.orig/ioctl_iocdef.c strace-4.14/ioctl_iocdef.c
+--- strace-4.14.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
++++ strace-4.14/ioctl_iocdef.c	2017-01-14 15:50:38.748425119 -0800
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
++ * is included into ioctlsort (which is compiled for build). Since some
++ * of these values are used in structure initializers, they cannot be
++ * defined as 'const unsigned int' - instead, they have to be macros.
++ * Hence, the result of preprocessing will be run through sed to change
++ * 'DEFINE' into '#define'
++ */
++#include <linux/ioctl.h>
++
++DEFINE HOST_IOC_NONE _IOC_NONE
++DEFINE HOST_IOC_READ _IOC_READ
++DEFINE HOST_IOC_WRITE _IOC_WRITE
++
++DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
++DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
+diff -urpN strace-4.14.orig/ioctlsort.c strace-4.14/ioctlsort.c
+--- strace-4.14.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
++++ strace-4.14/ioctlsort.c	2017-01-14 15:50:38.748425119 -0800
+@@ -33,7 +33,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <linux/ioctl.h>
++
++#include "ioctl_iocdef.h"
+ 
+ struct ioctlent {
+ 	const char *info;
+diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
+--- strace-4.14.orig/Makefile.am	2016-09-05 12:52:57.000000000 -0700
++++ strace-4.14/Makefile.am	2017-01-14 15:50:38.748425119 -0800
+@@ -289,6 +289,7 @@ EXTRA_DIST =				\
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -739,10 +740,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+@@ -750,7 +760,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+ 
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
+-CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+ 
+diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
+--- strace-4.14.orig/Makefile.in	2016-10-04 12:13:20.000000000 -0700
++++ strace-4.14/Makefile.in	2017-01-14 15:50:38.752425155 -0800
+@@ -995,6 +995,7 @@ EXTRA_DIST = \
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align32.h	\
+@@ -1406,7 +1407,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
+ 	native_printer_defs.h printers.h sen.h sys_func.h .version \
+ 	$(am__append_7) $(am__append_11)
+-CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
+ 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
+ 	sys_func.h $(am__append_8) $(am__append_12)
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+@@ -5896,13 +5897,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ 	rm -f $<-t
+ 	mv $@-t $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.15/010-use-host-ioctl.patch b/patches/strace/4.15/010-use-host-ioctl.patch
new file mode 100644
index 0000000..71d380a
--- /dev/null
+++ b/patches/strace/4.15/010-use-host-ioctl.patch
@@ -0,0 +1,145 @@
+diff -urpN strace-4.15.orig/ioctl_iocdef.c strace-4.15/ioctl_iocdef.c
+--- strace-4.15.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
++++ strace-4.15/ioctl_iocdef.c	2017-01-14 15:50:56.388590804 -0800
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
++ * is included into ioctlsort (which is compiled for build). Since some
++ * of these values are used in structure initializers, they cannot be
++ * defined as 'const unsigned int' - instead, they have to be macros.
++ * Hence, the result of preprocessing will be run through sed to change
++ * 'DEFINE' into '#define'
++ */
++#include <linux/ioctl.h>
++
++DEFINE HOST_IOC_NONE _IOC_NONE
++DEFINE HOST_IOC_READ _IOC_READ
++DEFINE HOST_IOC_WRITE _IOC_WRITE
++
++DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
++DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
+diff -urpN strace-4.15.orig/ioctlsort.c strace-4.15/ioctlsort.c
+--- strace-4.15.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
++++ strace-4.15/ioctlsort.c	2017-01-14 15:50:56.388590804 -0800
+@@ -33,7 +33,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <linux/ioctl.h>
++
++#include "ioctl_iocdef.h"
+ 
+ struct ioctlent {
+ 	const char *info;
+diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
+--- strace-4.15.orig/Makefile.am	2016-12-07 07:53:13.000000000 -0800
++++ strace-4.15/Makefile.am	2017-01-14 15:50:56.392590842 -0800
+@@ -298,6 +298,7 @@ EXTRA_DIST =				\
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align16.h	\
+@@ -815,10 +816,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+@@ -826,7 +836,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+ 
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
+-CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
+ 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+ 
+diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
+--- strace-4.15.orig/Makefile.in	2016-12-14 01:17:46.000000000 -0800
++++ strace-4.15/Makefile.in	2017-01-14 15:50:56.392590842 -0800
+@@ -1036,6 +1036,7 @@ EXTRA_DIST = \
+ 	debian/watch			\
+ 	errnoent.sh			\
+ 	generate_sen.sh			\
++	ioctl_iocdef.c			\
+ 	ioctlsort.c			\
+ 	linux/32/ioctls_inc.h		\
+ 	linux/32/ioctls_inc_align16.h	\
+@@ -1514,7 +1515,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+ BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
+ 	native_printer_defs.h printers.h sen.h sys_func.h .version \
+ 	$(am__append_7) $(am__append_11)
+-CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
++CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
+ 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
+ 	sys_func.h $(am__append_8) $(am__append_12)
+ DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+@@ -6177,13 +6178,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+ 	rm -f $<-t
+ 	mv $@-t $@
+ 
++# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
++# ioctlsort *for build*, hence this magic.
++ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
++	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
++
++ioctl_iocdef.h: ioctl_iocdef.i
++	sed -n 's/^DEFINE HOST/#define /p' $< > $@
++
+ ioctlent%.h: ioctlsort%
+ 	./$< > $@
+ 
+ ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+ 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+ 
+-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
++ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+ 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+ 
+ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h