From ebf82e8215ebba8d0eb74038de59b530ae1d12cc Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 14 Jan 2017 16:37:00 -0800
Subject: Add versions 4.11..4.15 of strace.

Versions 4.13 and older marked as obsolete.
Identify the source of the patches 007..009.

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

diff --git a/config/debug/strace.in b/config/debug/strace.in
index 5566129..a225878 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -8,42 +8,78 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config STRACE_V_4_15
+    bool
+    prompt "4.15"
+    depends on CONFIGURE_has_xz
+
+config STRACE_V_4_14
+    bool
+    prompt "4.14"
+    depends on CONFIGURE_has_xz
+
+config STRACE_V_4_13
+    bool
+    prompt "4.13 (OBSOLETE)"
+    depends on OBSOLETE
+    depends on CONFIGURE_has_xz
+
+config STRACE_V_4_12
+    bool
+    prompt "4.12 (OBSOLETE)"
+    depends on OBSOLETE
+    depends on CONFIGURE_has_xz
+
+config STRACE_V_4_11
+    bool
+    prompt "4.11 (OBSOLETE)"
+    depends on OBSOLETE
+    depends on CONFIGURE_has_xz
+
 config STRACE_V_4_10
     bool
-    prompt "4.10"
+    prompt "4.10 (OBSOLETE)"
+    depends on OBSOLETE
     depends on CONFIGURE_has_xz
 
 config STRACE_V_4_9
     bool
-    prompt "4.9"
+    prompt "4.9 (OBSOLETE)"
+    depends on OBSOLETE
     depends on CONFIGURE_has_xz
 
 config STRACE_V_4_8
     bool
-    prompt "4.8"
+    prompt "4.8 (OBSOLETE)"
+    depends on OBSOLETE
     depends on CONFIGURE_has_xz
 
 config STRACE_V_4_7
     bool
-    prompt "4.7"
+    prompt "4.7 (OBSOLETE)"
+    depends on OBSOLETE
     depends on CONFIGURE_has_xz
 
 config STRACE_V_4_6
     bool
-    prompt "4.6"
+    prompt "4.6 (OBSOLETE)"
+    depends on OBSOLETE
     depends on CONFIGURE_has_xz
 
 config STRACE_V_4_5_20
     bool
-    prompt "4.5.20"
+    prompt "4.5.20 (OBSOLETE)"
+    depends on OBSOLETE
 
 config STRACE_V_4_5_19
     bool
-    prompt "4.5.19"
+    prompt "4.5.19 (OBSOLETE)"
+    depends on OBSOLETE
 
 config STRACE_V_4_5_18
     bool
-    prompt "4.5.18"
+    prompt "4.5.18 (OBSOLETE)"
+    depends on OBSOLETE
 
 endchoice
 
@@ -51,6 +87,11 @@ config STRACE_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "4.15" if STRACE_V_4_15
+    default "4.14" if STRACE_V_4_14
+    default "4.13" if STRACE_V_4_13
+    default "4.12" if STRACE_V_4_12
+    default "4.11" if STRACE_V_4_11
     default "4.10" if STRACE_V_4_10
     default "4.9" if STRACE_V_4_9
     default "4.8" if STRACE_V_4_8
diff --git a/patches/strace/4.10/007_fix_bexecve64_test.patch b/patches/strace/4.10/007_fix_bexecve64_test.patch
index 09cd8ad..6dc9b46 100644
--- a/patches/strace/4.10/007_fix_bexecve64_test.patch
+++ b/patches/strace/4.10/007_fix_bexecve64_test.patch
@@ -1,3 +1,5 @@
+commit b704e8fbb4d9cf90ac56f3c889de5b779c444db4
+(loosely based on)
 --- a/tests/bexecve.test
 +++ b/tests/bexecve.test
 @@ -24,13 +24,14 @@
diff --git a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch b/patches/strace/4.10/008_decode_mips_indirect_syscall.patch
index de0004c..d2d7217 100644
--- a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch
+++ b/patches/strace/4.10/008_decode_mips_indirect_syscall.patch
@@ -1,3 +1,4 @@
+commit f34b97f89dd3893ef3652a6899487771402fc13c
 Index: strace-4.10/linux/mips/syscallent-o32.h
 ===================================================================
 --- strace-4.10.orig/linux/mips/syscallent-o32.h
diff --git a/patches/strace/4.10/009-upstream-musl_includes.patch b/patches/strace/4.10/009-upstream-musl_includes.patch
index a35d7fd..c68f8d8 100644
--- a/patches/strace/4.10/009-upstream-musl_includes.patch
+++ b/patches/strace/4.10/009-upstream-musl_includes.patch
@@ -1,3 +1,5 @@
+commit 3460dc486d333231998de0f19918204aacee9ae3
+commit d34e00b293942b1012ddc49ed3ab379a32337611
 --- a/evdev.c
 +++ b/evdev.c
 @@ -28,6 +28,8 @@
-- 
cgit v0.10.2-6-g49f6