strace: Update to 5.11

In this release, most source files were moved under a src/ directory.

12 files changed, 432 insertions, 381 deletions

diff --git a/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch b/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch
index 5a4a9abc..00c56f2a 100644
--- a/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch
+++ b/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch
@@ -1,17 +1,17 @@
-From 5c0b5a421c4dd366e75945fbcba2591835d6e7ed Mon Sep 17 00:00:00 2001
+From 5df1446d7d0c88d93e063b17b6ec9b872d13f1f8 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 5 Jul 2019 20:52:24 -0700
 Subject: [PATCH] Don't return expression in void function
 
 ---
- defs.h | 2 +-
+ src/defs.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/defs.h b/defs.h
-index 7151e90c..656c04a5 100644
---- a/defs.h
-+++ b/defs.h
-@@ -704,7 +704,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *);
+diff --git a/src/defs.h b/src/defs.h
+index 3475d36a2..518e57346 100644
+--- a/src/defs.h
++++ b/src/defs.h
+@@ -722,7 +722,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *);
  static inline void
  pathtrace_select(const char *path)
  {
@@ -21,5 +21,5 @@ index 7151e90c..656c04a5 100644
  
  static inline bool
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
index 563076e6..2a054efd 100644
--- a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
+++ b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
@@ -1,63 +1,94 @@
-From 4df6fee4836c6ecceb33221ec93f36592973bd12 Mon Sep 17 00:00:00 2001
+From 62a54ba2c7356ade3e2eb7f66647410daafc5718 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 6 Jul 2019 01:33:01 -0700
 Subject: [PATCH] Use __typeof__ spelling of typeof
 
 ---
- btrfs.c              |  8 ++++----
- defs.h               |  4 ++--
- file_ioctl.c         |  4 ++--
- gcc_compat.h         |  2 +-
- list.h               | 10 +++++-----
+ src/btrfs.c          | 12 ++++++------
+ src/defs.h           |  6 +++---
+ src/fs_0x94_ioctl.c  |  2 +-
+ src/fs_f_ioctl.c     |  2 +-
+ src/gcc_compat.h     |  2 +-
+ src/list.h           | 10 +++++-----
+ src/macros.h         |  2 +-
+ src/net.c            |  2 +-
+ src/ubi.c            |  2 +-
  tests/btrfs.c        |  2 +-
  tests/fcntl-common.c |  2 +-
- 7 files changed, 16 insertions(+), 16 deletions(-)
+ 11 files changed, 22 insertions(+), 22 deletions(-)
 
-diff --git a/btrfs.c b/btrfs.c
-index 77ce151f..6e6cb721 100644
---- a/btrfs.c
-+++ b/btrfs.c
-@@ -248,7 +248,7 @@ btrfs_print_logical_ino_container(struct tcb *tcp,
- 		tprints(", ...");
+diff --git a/src/btrfs.c b/src/btrfs.c
+index eb6f7e02b..819fcf084 100644
+--- a/src/btrfs.c
++++ b/src/btrfs.c
+@@ -214,7 +214,7 @@ btrfs_print_logical_ino_container(struct tcb *tcp,
+ 		tprint_more_data_follows();
  	} else {
  		const uint64_t val_addr =
 -			inodes_addr + offsetof(typeof(container), val);
 +			inodes_addr + offsetof(__typeof__(container), val);
  		uint64_t record[3];
- 		tprints(", val=");
- 		print_array(tcp, val_addr, container.elem_cnt / 3,
-@@ -287,7 +287,7 @@ btrfs_print_ino_path_container(struct tcb *tcp,
- 		tprints(", ...");
+ 		tprint_struct_next();
+ 		tprints_field_name("val");
+@@ -255,7 +255,7 @@ btrfs_print_ino_path_container(struct tcb *tcp,
+ 		tprint_more_data_follows();
  	} else {
  		uint64_t val_addr =
 -			fspath_addr + offsetof(typeof(container), val);
 +			fspath_addr + offsetof(__typeof__(container), val);
  		uint64_t offset;
- 		tprints(", val=");
- 		print_array(tcp, val_addr, container.elem_cnt,
-@@ -320,7 +320,7 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
- 	} else {
+ 		tprint_struct_next();
+ 		tprints_field_name("val");
+@@ -296,7 +296,7 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
  		uint64_t record;
- 		tprints(", qgroups=");
+ 		tprint_struct_next();
+ 		tprints_field_name("qgroups");
 -		print_array(tcp, qgi_addr + offsetof(typeof(inherit), qgroups),
 +		print_array(tcp, qgi_addr + offsetof(__typeof__(inherit), qgroups),
  			    inherit.num_qgroups, &record, sizeof(record),
  			    tfetch_mem, print_uint64_array_member, 0);
  	}
-@@ -1139,7 +1139,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
- 		} else {
+@@ -1137,7 +1137,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
+ 		PRINT_FIELD_OBJ_PTR(args, key,
+ 				    print_btrfs_ioctl_search_key,
+ 				    entering(tcp), !abbrev(tcp));
+-		decode_search_arg_buf(tcp, arg + offsetof(typeof(args), buf),
++		decode_search_arg_buf(tcp, arg + offsetof(__typeof__(args), buf),
+ 				      sizeof(args.buf), args.key.nr_items);
+ 		tprint_struct_end();
+ 		if (entering(tcp))
+@@ -1173,7 +1173,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
+ 				    entering(tcp), !abbrev(tcp));
+ 		tprint_struct_next();
+ 		PRINT_FIELD_U(args, buf_size);
+-		decode_search_arg_buf(tcp, arg + offsetof(typeof(args), buf),
++		decode_search_arg_buf(tcp, arg + offsetof(__typeof__(args), buf),
+ 				      args.buf_size, args.key.nr_items);
+ 		tprint_struct_end();
+ 		if (entering(tcp))
+@@ -1250,7 +1250,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
  			struct btrfs_ioctl_space_info info;
- 			tprints(", spaces=");
+ 			tprint_struct_next();
+ 			tprints_field_name("spaces");
 -			print_array(tcp, arg + offsetof(typeof(args), spaces),
 +			print_array(tcp, arg + offsetof(__typeof__(args), spaces),
  				    args.total_spaces,
  				    &info, sizeof(info), tfetch_mem,
  				    print_btrfs_ioctl_space_info, 0);
-diff --git a/defs.h b/defs.h
-index 656c04a5..732542e4 100644
---- a/defs.h
-+++ b/defs.h
-@@ -1760,8 +1760,8 @@ scno_is_valid(kernel_ulong_t scno)
+diff --git a/src/defs.h b/src/defs.h
+index 518e57346..00a36249e 100644
+--- a/src/defs.h
++++ b/src/defs.h
+@@ -1039,7 +1039,7 @@ print_local_array_ex(struct tcb *tcp,
+ # define print_local_array_upto(tcp_, start_addr_, upto_, print_func_)	     \
+ 	print_local_array_ex((tcp_), (start_addr_),			     \
+ 			     CLAMP((upto_), 0,				     \
+-				   (typeof(upto_)) ARRAY_SIZE(start_addr_)), \
++				   (__typeof__(upto_)) ARRAY_SIZE(start_addr_)), \
+ 			     sizeof((start_addr_)[0]), (print_func_),        \
+ 			     NULL, 0, NULL, NULL)
+ 
+@@ -1805,8 +1805,8 @@ scno_is_valid(kernel_ulong_t scno)
  
  # define ILOG2_ITER_(val_, ret_, bit_)					\
  	do {								\
@@ -68,32 +99,36 @@ index 656c04a5..732542e4 100644
  				   << (1 << (bit_))) - 1)) << (bit_);	\
  		(val_) >>= shift_;					\
  		(ret_) |= shift_;					\
-diff --git a/file_ioctl.c b/file_ioctl.c
-index d9a07ab0..63c2bcb3 100644
---- a/file_ioctl.c
-+++ b/file_ioctl.c
-@@ -157,7 +157,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code,
- 		if (abbrev(tcp) && args.dest_count > count)
- 			limit = &count;
+diff --git a/src/fs_0x94_ioctl.c b/src/fs_0x94_ioctl.c
+index f42ec2f0c..65381ec1b 100644
+--- a/src/fs_0x94_ioctl.c
++++ b/src/fs_0x94_ioctl.c
+@@ -95,7 +95,7 @@ decode_file_dedupe_range(struct tcb *const tcp, const kernel_ulong_t arg)
+ 	if (abbrev(tcp) && range.dest_count > count)
+ 		limit = &count;
  
--		rc = print_array(tcp, arg + offsetof(typeof(args), info),
-+		rc = print_array(tcp, arg + offsetof(__typeof__(args), info),
- 				 args.dest_count, &info, sizeof(info),
- 				 tfetch_mem,
- 				 print_file_dedupe_range_info, limit);
-@@ -202,7 +202,7 @@ file_ioctl(struct tcb *const tcp, const unsigned int code,
- 			struct fiemap_extent fe;
- 			tprints(", fm_extents=");
- 			print_array(tcp,
--				    arg + offsetof(typeof(args), fm_extents),
-+				    arg + offsetof(__typeof__(args), fm_extents),
- 				    args.fm_mapped_extents, &fe, sizeof(fe),
- 				    tfetch_mem,
- 				    print_fiemap_extent, 0);
-diff --git a/gcc_compat.h b/gcc_compat.h
-index 4c23ebc9..8eaa54bf 100644
---- a/gcc_compat.h
-+++ b/gcc_compat.h
+-	rc = print_array(tcp, arg + offsetof(typeof(range), info),
++	rc = print_array(tcp, arg + offsetof(__typeof__(range), info),
+ 			 range.dest_count, &info, sizeof(info),
+ 			 tfetch_mem,
+ 			 print_file_dedupe_range_info, limit);
+diff --git a/src/fs_f_ioctl.c b/src/fs_f_ioctl.c
+index 4509f3d58..f763cad8d 100644
+--- a/src/fs_f_ioctl.c
++++ b/src/fs_f_ioctl.c
+@@ -72,7 +72,7 @@ decode_fiemap(struct tcb *const tcp, const kernel_ulong_t arg)
+ 		struct fiemap_extent fe;
+ 		tprint_struct_next();
+ 		tprints_field_name("fm_extents");
+-		print_array(tcp, arg + offsetof(typeof(args), fm_extents),
++		print_array(tcp, arg + offsetof(__typeof__(args), fm_extents),
+ 			    args.fm_mapped_extents, &fe, sizeof(fe),
+ 			    tfetch_mem, print_fiemap_extent, 0);
+ 	}
+diff --git a/src/gcc_compat.h b/src/gcc_compat.h
+index 9b9bc9389..65f47f73f 100644
+--- a/src/gcc_compat.h
++++ b/src/gcc_compat.h
 @@ -59,7 +59,7 @@
  # endif
  
@@ -103,10 +138,10 @@ index 4c23ebc9..8eaa54bf 100644
  #  define FAIL_BUILD_ON_ZERO(expr) (sizeof(int[-1 + 2 * !!(expr)]) * 0)
  /* &(a)[0] is a pointer and not an array, shouldn't be treated as the same */
  #  define MUST_BE_ARRAY(a) FAIL_BUILD_ON_ZERO(!SAME_TYPE((a), &(a)[0]))
-diff --git a/list.h b/list.h
-index ddaf33ca..bf747a4b 100644
---- a/list.h
-+++ b/list.h
+diff --git a/src/list.h b/src/list.h
+index 4de4cb3be..f4ec11f0e 100644
+--- a/src/list.h
++++ b/src/list.h
 @@ -158,7 +158,7 @@ list_is_empty(const struct list_item *l)
   * @param field Name of the field that holds the respective struct list_item.
   */
@@ -145,11 +180,50 @@ index ddaf33ca..bf747a4b 100644
  	    &var_->field_ != head_; var_ = _tmp, _tmp = list_next(_tmp, field_))
  
  #endif /* !STRACE_LIST_H */
+diff --git a/src/macros.h b/src/macros.h
+index 467f5d042..be54782bf 100644
+--- a/src/macros.h
++++ b/src/macros.h
+@@ -39,7 +39,7 @@
+ 
+ # define sizeof_field(type_, member_) (sizeof(((type_ *)0)->member_))
+ 
+-# define typeof_field(type_, member_) typeof(((type_ *)0)->member_)
++# define typeof_field(type_, member_) __typeof__(((type_ *)0)->member_)
+ 
+ # ifndef offsetofend
+ #  define offsetofend(type_, member_)	\
+diff --git a/src/net.c b/src/net.c
+index 9942df21a..dc62e59cb 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -459,7 +459,7 @@ SYS_FUNC(socketpair)
+ #define MAYBE_PRINT_FIELD_LEN(print_prefix_, where_, field_, 		\
+ 			len_, print_func_, ...)				\
+ 	do {								\
+-		unsigned int start = offsetof(typeof(where_), field_);	\
++		unsigned int start = offsetof(__typeof__(where_), field_); \
+ 		unsigned int end = start + sizeof(where_.field_);	\
+ 		if (len_ > start) {					\
+ 			print_prefix_;					\
+diff --git a/src/ubi.c b/src/ubi.c
+index 93cec79c4..9047df640 100644
+--- a/src/ubi.c
++++ b/src/ubi.c
+@@ -84,7 +84,7 @@ static bool
+ print_ubi_rnvol_req_ent_array_member(struct tcb *tcp, void *elem_buf,
+ 				     size_t elem_size, void *data)
+ {
+-	typeof(&((struct ubi_rnvol_req *) NULL)->ents[0]) p = elem_buf;
++	__typeof__(&((struct ubi_rnvol_req *) NULL)->ents[0]) p = elem_buf;
+ 
+ 	tprint_struct_begin();
+ 	PRINT_FIELD_D(*p, vol_id);
 diff --git a/tests/btrfs.c b/tests/btrfs.c
-index 2a474dc4..2423f65e 100644
+index fd240259c..6d98c0b9c 100644
 --- a/tests/btrfs.c
 +++ b/tests/btrfs.c
-@@ -954,7 +954,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key,
+@@ -849,7 +849,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key,
  		printf("buf=[");
  		for (i = 0; i < key->nr_items; i++) {
  			struct btrfs_ioctl_search_header *sh;
@@ -159,7 +233,7 @@ index 2a474dc4..2423f65e 100644
  				printf(", ");
  			printf("{transid=%" PRI__u64 ", objectid=",
 diff --git a/tests/fcntl-common.c b/tests/fcntl-common.c
-index ec18aa79..637bb405 100644
+index 155166617..ebc2e07aa 100644
 --- a/tests/fcntl-common.c
 +++ b/tests/fcntl-common.c
 @@ -22,7 +22,7 @@
@@ -172,5 +246,5 @@ index ec18aa79..637bb405 100644
  # define TYPEOF_FLOCK_OFF_T off_t
  #endif
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch b/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
index 94958d5e..5e4ede7f 100644
--- a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
+++ b/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
@@ -1,4 +1,4 @@
-From 4c3d1d35211e789a14352787f16c2db2fc6293f7 Mon Sep 17 00:00:00 2001
+From b1d79a14c7df4f1698ac2243873a3b09b22cf8bb Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 6 Jul 2019 01:40:36 -0700
 Subject: [PATCH] Make tcp_sysent a static inline function
@@ -6,14 +6,14 @@ Subject: [PATCH] Make tcp_sysent a static inline function
 This way we can include the second operand to the conditional
 operator without evaluating the macro argument multiple times.
 ---
- defs.h | 8 ++++++--
+ src/defs.h | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/defs.h b/defs.h
-index 732542e4..e7ff7d0b 100644
---- a/defs.h
-+++ b/defs.h
-@@ -374,8 +374,12 @@ struct tcb {
+diff --git a/src/defs.h b/src/defs.h
+index 00a36249e..2768fcd46 100644
+--- a/src/defs.h
++++ b/src/defs.h
+@@ -386,8 +386,12 @@ struct tcb {
  # define syscall_tampered_nofail(tcp) ((tcp)->flags & TCB_TAMPERED_NO_FAIL)
  # define has_seccomp_filter(tcp)	((tcp)->flags & TCB_SECCOMP_FILTER)
  
@@ -29,5 +29,5 @@ index 732542e4..e7ff7d0b 100644
  
  # include "xlat.h"
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
index 5fcf9422..50119f13 100644
--- a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
+++ b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
@@ -1,14 +1,14 @@
-From d57542b29ffe81ac355c2889aa5cf326b60e7d67 Mon Sep 17 00:00:00 2001
+From d98579a234b81512a4def2bc740457fcd0637ac2 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 6 Jul 2019 01:54:05 -0700
 Subject: [PATCH] Avoid empty initializer lists
 
 ---
- bpf.c                   | 4 ++--
- net.c                   | 2 +-
- sched.c                 | 2 +-
- signal.c                | 2 +-
- strace.c                | 2 +-
+ src/bpf.c               | 4 ++--
+ src/net.c               | 2 +-
+ src/sched.c             | 2 +-
+ src/signal.c            | 2 +-
+ src/strace.c            | 2 +-
  tests/btrfs.c           | 8 ++++----
  tests/clock_nanosleep.c | 2 +-
  tests/nanosleep.c       | 2 +-
@@ -19,11 +19,11 @@ Subject: [PATCH] Avoid empty initializer lists
  tests/waitid.c          | 2 +-
  13 files changed, 17 insertions(+), 17 deletions(-)
 
-diff --git a/bpf.c b/bpf.c
-index 0ec33ba4..16cbf257 100644
---- a/bpf.c
-+++ b/bpf.c
-@@ -43,7 +43,7 @@ bpf_cmd_decoder(struct tcb *const tcp,					\
+diff --git a/src/bpf.c b/src/bpf.c
+index 7d2f4b85d..4e8bbe09a 100644
+--- a/src/bpf.c
++++ b/src/bpf.c
+@@ -42,7 +42,7 @@ bpf_cmd_decoder(struct tcb *const tcp,					\
  #define BEGIN_BPF_CMD_DECODER(bpf_cmd)					\
  	static DECL_BPF_CMD_DECODER(decode_ ## bpf_cmd)			\
  	{								\
@@ -32,7 +32,7 @@ index 0ec33ba4..16cbf257 100644
  		const size_t attr_size = bpf_cmd ## _struct_size;	\
  		const unsigned int len = MIN(size, attr_size);		\
  		memcpy(&attr, data, len);				\
-@@ -150,7 +150,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
+@@ -153,7 +153,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
  	if (abbrev(tcp)) {
  		printaddr(addr);
  	} else {
@@ -41,11 +41,11 @@ index 0ec33ba4..16cbf257 100644
  		struct ebpf_insn insn;
  
  		print_array(tcp, addr, len, &insn, sizeof(insn),
-diff --git a/net.c b/net.c
-index 2099f0ac..316cecf2 100644
---- a/net.c
-+++ b/net.c
-@@ -655,7 +655,7 @@ print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr,
+diff --git a/src/net.c b/src/net.c
+index dc62e59cb..c80958500 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -681,7 +681,7 @@ print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr,
  static void
  print_icmp_filter(struct tcb *const tcp, const kernel_ulong_t addr, int len)
  {
@@ -54,11 +54,11 @@ index 2099f0ac..316cecf2 100644
  
  	if (len > (int) sizeof(filter))
  		len = sizeof(filter);
-diff --git a/sched.c b/sched.c
-index ff427e48..2f46a836 100644
---- a/sched.c
-+++ b/sched.c
-@@ -99,7 +99,7 @@ static void
+diff --git a/src/sched.c b/src/sched.c
+index a9bbe64ff..661077e2f 100644
+--- a/src/sched.c
++++ b/src/sched.c
+@@ -97,7 +97,7 @@ static void
  print_sched_attr(struct tcb *const tcp, const kernel_ulong_t addr,
  		 unsigned int usize)
  {
@@ -67,11 +67,11 @@ index ff427e48..2f46a836 100644
  	unsigned int size;
  	bool is_set = false;
  
-diff --git a/signal.c b/signal.c
-index 49b4ebd5..a809d260 100644
---- a/signal.c
-+++ b/signal.c
-@@ -246,7 +246,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
+diff --git a/src/signal.c b/src/signal.c
+index 5fc0789c3..cdea7f5b8 100644
+--- a/src/signal.c
++++ b/src/signal.c
+@@ -249,7 +249,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
  		printaddr(addr);
  		return;
  	}
@@ -80,11 +80,11 @@ index 49b4ebd5..a809d260 100644
  	if (umoven_or_printaddr(tcp, addr, len, mask))
  		return;
  	tprints(sprintsigmask_n("", mask, len));
-diff --git a/strace.c b/strace.c
-index 2897195c..280f1a68 100644
---- a/strace.c
-+++ b/strace.c
-@@ -3381,7 +3381,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
+diff --git a/src/strace.c b/src/strace.c
+index ab82a9908..24180a15f 100644
+--- a/src/strace.c
++++ b/src/strace.c
+@@ -3387,7 +3387,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
  		syscall_entering_finish(tcp, res);
  		return res;
  	} else {
@@ -94,10 +94,10 @@ index 2897195c..280f1a68 100644
  		if (res != 0) {
  			res = syscall_exiting_trace(tcp, &ts, res);
 diff --git a/tests/btrfs.c b/tests/btrfs.c
-index 2423f65e..3b5ade66 100644
+index 6d98c0b9c..a0e587479 100644
 --- a/tests/btrfs.c
 +++ b/tests/btrfs.c
-@@ -382,7 +382,7 @@ btrfs_test_subvol_ioctls(void)
+@@ -279,7 +279,7 @@ btrfs_test_subvol_ioctls(void)
  	char *long_subvol_name;
  	void *bad_pointer = (void *) (unsigned long) 0xdeadbeeffffffeedULL;
  	uint64_t u64val = 0xdeadbeefbadc0dedULL;
@@ -106,7 +106,7 @@ index 2423f65e..3b5ade66 100644
  	struct btrfs_ioctl_vol_args_v2 vol_args_v2 = {
  		.fd = 2,
  		.flags = max_flags_plus_one(2),
-@@ -629,7 +629,7 @@ btrfs_test_balance_ioctls(void)
+@@ -526,7 +526,7 @@ btrfs_test_balance_ioctls(void)
  			.devid = 1,
  		},
  	};
@@ -115,7 +115,7 @@ index 2423f65e..3b5ade66 100644
  
  	ioctl(-1, BTRFS_IOC_BALANCE_CTL, 1);
  	printf("ioctl(-1, %s, %sBTRFS_BALANCE_CTL_PAUSE%s) = -1 EBADF (%m)\n",
-@@ -841,7 +841,7 @@ btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args,
+@@ -736,7 +736,7 @@ btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args,
  static void
  btrfs_test_defrag_ioctls(void)
  {
@@ -124,7 +124,7 @@ index 2423f65e..3b5ade66 100644
  	struct btrfs_ioctl_defrag_range_args args = {
  		.start = 0,
  		.len = -1ULL,
-@@ -1170,7 +1170,7 @@ btrfs_test_ino_lookup_ioctl(void)
+@@ -1065,7 +1065,7 @@ btrfs_test_ino_lookup_ioctl(void)
  static void
  btrfs_test_space_info_ioctl(void)
  {
@@ -134,7 +134,7 @@ index 2423f65e..3b5ade66 100644
  	ioctl(-1, BTRFS_IOC_SPACE_INFO, NULL);
  	printf("ioctl(-1, %s, NULL) = -1 EBADF (%m)\n",
 diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
-index 854fdb3f..0de48963 100644
+index 51bd0d7f7..a1053fd1e 100644
 --- a/tests/clock_nanosleep.c
 +++ b/tests/clock_nanosleep.c
 @@ -39,7 +39,7 @@ main(void)
@@ -147,7 +147,7 @@ index 854fdb3f..0de48963 100644
  	const struct itimerval itv = {
  		.it_interval.tv_usec = 222222,
 diff --git a/tests/nanosleep.c b/tests/nanosleep.c
-index d55b395c..e41b6b1f 100644
+index 8ff6a86b8..6377f38ee 100644
 --- a/tests/nanosleep.c
 +++ b/tests/nanosleep.c
 @@ -53,7 +53,7 @@ main(void)
@@ -160,7 +160,7 @@ index d55b395c..e41b6b1f 100644
  	const struct itimerval itv = { .it_value.tv_usec = 111111 };
  
 diff --git a/tests/restart_syscall.c b/tests/restart_syscall.c
-index a42d3b9b..3e48b1c1 100644
+index e4e83dc09..da83d1dc7 100644
 --- a/tests/restart_syscall.c
 +++ b/tests/restart_syscall.c
 @@ -26,7 +26,7 @@ main(void)
@@ -173,7 +173,7 @@ index a42d3b9b..3e48b1c1 100644
  	const struct itimerval itv = { .it_value.tv_usec = 111111 };
  	const struct timespec req = { .tv_nsec = 222222222 };
 diff --git a/tests/setrlimit.c b/tests/setrlimit.c
-index 886cf65a..89ed1077 100644
+index d4953f6f8..60d54fbd8 100644
 --- a/tests/setrlimit.c
 +++ b/tests/setrlimit.c
 @@ -39,7 +39,7 @@ main(void)
@@ -186,7 +186,7 @@ index 886cf65a..89ed1077 100644
  			continue;
  		rlimit[0] = libc_rlim.rlim_cur;
 diff --git a/tests/timer_create.c b/tests/timer_create.c
-index 2c4dae19..59bc2dd0 100644
+index 1059a01d8..692eecf03 100644
 --- a/tests/timer_create.c
 +++ b/tests/timer_create.c
 @@ -26,7 +26,7 @@ main(void)
@@ -199,7 +199,7 @@ index 2c4dae19..59bc2dd0 100644
  		.sigev_notify = 0xdefaced,
  		.sigev_signo = 0xfacefeed,
 diff --git a/tests/wait4.c b/tests/wait4.c
-index 048e6225..b7bf7c8a 100644
+index faf9423f8..eacee2366 100644
 --- a/tests/wait4.c
 +++ b/tests/wait4.c
 @@ -89,7 +89,7 @@ k_wait4(const unsigned int pid, void const *wstatus,
@@ -212,7 +212,7 @@ index 048e6225..b7bf7c8a 100644
  
  	assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
 diff --git a/tests/waitid.c b/tests/waitid.c
-index 8716fa08..4ec091f4 100644
+index a14899530..b08881ae7 100644
 --- a/tests/waitid.c
 +++ b/tests/waitid.c
 @@ -130,7 +130,7 @@ do_waitid(const unsigned int idtype,
@@ -225,5 +225,5 @@ index 8716fa08..4ec091f4 100644
  
  	assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch b/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch
index df9d259e..d22c28cf 100644
--- a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch
@@ -1,41 +1,41 @@
-From a5642a0735182fca95b8a1191df91233f88393a0 Mon Sep 17 00:00:00 2001
+From 39bde60243deec54676cd119f08192a1c8f7b06b Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 7 Jul 2019 21:25:13 -0700
 Subject: [PATCH] Avoid pointer arithmetic on `void *`
 
 ---
- netlink_smc_diag.c | 4 ++--
- print_timespec.h   | 6 ++++--
- sockaddr.c         | 2 +-
- ucopy.c            | 8 ++++----
- 4 files changed, 11 insertions(+), 9 deletions(-)
+ src/netlink_smc_diag.c |  4 ++--
+ src/print_timespec.h   |  6 ++++--
+ src/sockaddr.c         |  2 +-
+ src/ucopy.c            | 10 +++++-----
+ 4 files changed, 12 insertions(+), 10 deletions(-)
 
-diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c
-index 16815fde..09a748a8 100644
---- a/netlink_smc_diag.c
-+++ b/netlink_smc_diag.c
+diff --git a/src/netlink_smc_diag.c b/src/netlink_smc_diag.c
+index 7d2872dc9..fd6c276cb 100644
+--- a/src/netlink_smc_diag.c
++++ b/src/netlink_smc_diag.c
 @@ -41,7 +41,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_req)
  	if (len >= sizeof(req)) {
  		if (!umoven_or_printaddr(tcp, addr + offset,
  					 sizeof(req) - offset,
 -					 (void *) &req + offset)) {
 +					 (char *) &req + offset)) {
- 			PRINT_FIELD_FLAGS("", req, diag_ext,
+ 			PRINT_FIELD_FLAGS(req, diag_ext,
  					  smc_diag_extended_flags,
  					  "1<<SMC_DIAG_\?\?\?-1");
-@@ -212,7 +212,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_msg)
+@@ -250,7 +250,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_msg)
  	if (len >= sizeof(msg)) {
  		if (!umoven_or_printaddr(tcp, addr + offset,
  					 sizeof(msg) - offset,
 -					 (void *) &msg + offset)) {
 +					 (char *) &msg + offset)) {
- 			PRINT_FIELD_XVAL("", msg, diag_state,
+ 			PRINT_FIELD_XVAL(msg, diag_state,
  					 smc_states, "SMC_???");
- 			PRINT_FIELD_XVAL(", ", msg, diag_fallback,
-diff --git a/print_timespec.h b/print_timespec.h
-index 0f0e296d..4449f857 100644
---- a/print_timespec.h
-+++ b/print_timespec.h
+ 			tprint_struct_next();
+diff --git a/src/print_timespec.h b/src/print_timespec.h
+index feb6599f1..3351755cb 100644
+--- a/src/print_timespec.h
++++ b/src/print_timespec.h
 @@ -67,6 +67,8 @@ bool
  PRINT_TIMESPEC_ARRAY_DATA_SIZE(const void *arg, const unsigned int nmemb,
  			       const size_t size)
@@ -58,11 +58,11 @@ index 0f0e296d..4449f857 100644
  	}
  
  	tprints("]");
-diff --git a/sockaddr.c b/sockaddr.c
-index b0046331..35e36392 100644
---- a/sockaddr.c
-+++ b/sockaddr.c
-@@ -481,7 +481,7 @@ print_sockaddr_data_ll(struct tcb *tcp, const void *const buf,
+diff --git a/src/sockaddr.c b/src/sockaddr.c
+index ca8c86ce8..1f2ee0122 100644
+--- a/src/sockaddr.c
++++ b/src/sockaddr.c
+@@ -497,7 +497,7 @@ print_sockaddr_data_ll(struct tcb *tcp, const void *const buf,
  static void
  print_sockaddr_data_raw(const void *const buf, const int addrlen)
  {
@@ -70,12 +70,12 @@ index b0046331..35e36392 100644
 +	const char *const data = (const char *)buf + SIZEOF_SA_FAMILY;
  	const int datalen = addrlen - SIZEOF_SA_FAMILY;
  
- 	tprints("sa_data=");
-diff --git a/ucopy.c b/ucopy.c
-index 59af8641..3ff59781 100644
---- a/ucopy.c
-+++ b/ucopy.c
-@@ -165,7 +165,7 @@ vm_read_mem(const pid_t pid, void *laddr,
+ 	tprints_field_name("sa_data");
+diff --git a/src/ucopy.c b/src/ucopy.c
+index 6cebb8e26..e8ca2ad5d 100644
+--- a/src/ucopy.c
++++ b/src/ucopy.c
+@@ -186,7 +186,7 @@ vm_read_mem(const pid_t pid, void *laddr,
  			break;
  
  		len = next_len;
@@ -84,7 +84,7 @@ index 59af8641..3ff59781 100644
  		page_start += page_size;
  		taddr = page_start;
  	}
-@@ -227,7 +227,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len,
+@@ -278,7 +278,7 @@ umoven_peekdata(const int pid, kernel_ulong_t addr, unsigned int len,
  		memcpy(laddr, &u.x[residue], m);
  		residue = 0;
  		addr += sizeof(long);
@@ -93,7 +93,7 @@ index 59af8641..3ff59781 100644
  		nread += m;
  		len -= m;
  	}
-@@ -324,10 +324,10 @@ umovestr_peekdata(const int pid, kernel_ulong_t addr, unsigned int len,
+@@ -375,10 +375,10 @@ umovestr_peekdata(const int pid, kernel_ulong_t addr, unsigned int len,
  		memcpy(laddr, &u.x[residue], m);
  		while (residue < sizeof(long))
  			if (u.x[residue++] == '\0')
@@ -106,6 +106,15 @@ index 59af8641..3ff59781 100644
  		nread += m;
  		len -= m;
  	}
+@@ -509,7 +509,7 @@ upoken_pokedata(const int pid, kernel_ulong_t addr, unsigned int len,
+ 
+ 		addr += sizeof(long);
+ 		nwritten += sizeof(long);
+-		our_addr += sizeof(long);
++		our_addr = (char *)our_addr + sizeof(long);
+ 		len -= sizeof(long);
+ 	}
+ 
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch b/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch
index b09b524e..61f895ab 100644
--- a/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch
+++ b/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch
@@ -1,16 +1,16 @@
-From 9373bbf0bc3d17265f165845eb16c85843e92cf6 Mon Sep 17 00:00:00 2001
+From 4abe148a0e2dc930a5cdb8d92e88af203898368a Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 7 Jul 2019 21:50:31 -0700
 Subject: [PATCH] Avoid empty struct definition
 
 ---
- fetch_struct_stat64.c | 8 +-------
+ src/fetch_struct_stat64.c | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)
 
-diff --git a/fetch_struct_stat64.c b/fetch_struct_stat64.c
-index 8b445ba3..5b7641a1 100644
---- a/fetch_struct_stat64.c
-+++ b/fetch_struct_stat64.c
+diff --git a/src/fetch_struct_stat64.c b/src/fetch_struct_stat64.c
+index b5125d420..b45a48da5 100644
+--- a/src/fetch_struct_stat64.c
++++ b/src/fetch_struct_stat64.c
 @@ -32,12 +32,6 @@
  # endif /* HAVE_MX32_STRUCT_STAT64 */
  #endif /* MPERS_IS_m32 || MPERS_IS_mx32 */
@@ -34,5 +34,5 @@ index 8b445ba3..5b7641a1 100644
  		return false;
  
 -- 
-2.22.0
+2.30.0
 
diff --git a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch b/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
index 73bdff61..be14ec82 100644
--- a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
+++ b/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
@@ -1,19 +1,19 @@
-From 1d0a51b8e89231e92b0b3280dd850eccfa6cf143 Mon Sep 17 00:00:00 2001
+From 2aafc896306daf6fc8a470993ffd6d300d2e410c Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 7 Jul 2019 21:53:16 -0700
 Subject: [PATCH] Don't omit second operand to '?' operator
 
 ---
- open.c   | 5 +++--
- prctl.c  | 2 +-
- strace.c | 6 +++---
+ src/open.c   | 5 +++--
+ src/prctl.c  | 2 +-
+ src/strace.c | 6 +++---
  3 files changed, 7 insertions(+), 6 deletions(-)
 
-diff --git a/open.c b/open.c
-index eb6af088..16e64946 100644
---- a/open.c
-+++ b/open.c
-@@ -77,8 +77,9 @@ sprint_open_modes64(uint64_t flags)
+diff --git a/src/open.c b/src/open.c
+index 4af4320b0..8191470ed 100644
+--- a/src/open.c
++++ b/src/open.c
+@@ -63,8 +63,9 @@ sprint_open_modes64(uint64_t flags)
  	}
  	*p = '\0';
  
@@ -25,10 +25,10 @@ index eb6af088..16e64946 100644
  }
  
  const char *
-diff --git a/prctl.c b/prctl.c
-index b904fa34..1366a89e 100644
---- a/prctl.c
-+++ b/prctl.c
+diff --git a/src/prctl.c b/src/prctl.c
+index 58b644946..6147082eb 100644
+--- a/src/prctl.c
++++ b/src/prctl.c
 @@ -76,7 +76,7 @@ sprint_sve_val(kernel_ulong_t arg)
  	const char *flags_str = sprintflags("", pr_sve_vl_flags, flags);
  
@@ -38,11 +38,11 @@ index b904fa34..1366a89e 100644
  
  	return out;
  }
-diff --git a/strace.c b/strace.c
-index 280f1a68..11a3d9dd 100644
---- a/strace.c
-+++ b/strace.c
-@@ -2251,7 +2251,7 @@ init(int argc, char *argv[])
+diff --git a/src/strace.c b/src/strace.c
+index 24180a15f..a71860e55 100644
+--- a/src/strace.c
++++ b/src/strace.c
+@@ -2257,7 +2257,7 @@ init(int argc, char *argv[])
  			break;
  		case GETOPT_TS:
  			tflag_long_set = true;
@@ -51,7 +51,7 @@ index 280f1a68..11a3d9dd 100644
  				error_opt_arg(c, lopt, optarg);
  			break;
  		case 'T':
-@@ -2351,10 +2351,10 @@ init(int argc, char *argv[])
+@@ -2357,10 +2357,10 @@ init(int argc, char *argv[])
  			qualify_kvm(optarg);
  			break;
  		case GETOPT_QUAL_QUIET:
@@ -65,5 +65,5 @@ index 280f1a68..11a3d9dd 100644
  		default:
  			error_msg_and_help(NULL);
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
index dae96992..643eee94 100644
--- a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
+++ b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
@@ -1,21 +1,20 @@
-From 0308e8cd17c92f96a61d8b231336caa299d7683d Mon Sep 17 00:00:00 2001
+From ac6d6953ee3bbb0a2717bb814c78f5671a993407 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 7 Jul 2019 21:58:46 -0700
 Subject: [PATCH] Avoid unnecessary VLAs
 
 ---
- count.c       | 2 +-
- desc.c        | 7 ++++---
- nlattr.c      | 2 +-
- socketutils.c | 4 ++--
- syscall.c     | 2 +-
- util.c        | 5 ++---
- 6 files changed, 11 insertions(+), 11 deletions(-)
+ src/count.c       | 2 +-
+ src/nlattr.c      | 2 +-
+ src/socketutils.c | 4 ++--
+ src/syscall.c     | 2 +-
+ src/util.c        | 5 ++---
+ 5 files changed, 7 insertions(+), 8 deletions(-)
 
-diff --git a/count.c b/count.c
-index a397eba2..89682ae9 100644
---- a/count.c
-+++ b/count.c
+diff --git a/src/count.c b/src/count.c
+index afd4b3758..c1ed46588 100644
+--- a/src/count.c
++++ b/src/count.c
 @@ -414,7 +414,7 @@ call_summary_pers(FILE *outf)
  		fprintf(outf, column_fmts[i], (val_), cwidths[c]); \
  		break
@@ -25,42 +24,11 @@ index a397eba2..89682ae9 100644
  	for (size_t i = 0; i <= last_column; ++i) {
  		const size_t c = columns[i];
  
-diff --git a/desc.c b/desc.c
-index 32fc1882..f15b04e1 100644
---- a/desc.c
-+++ b/desc.c
-@@ -175,11 +175,11 @@ SYS_FUNC(select)
- 
- static int
- umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr,
--				kernel_ulong_t *const ptr, const size_t n)
-+				kernel_ulong_t *const ptr, uint32_t *ptr32,
-+				const size_t n)
- {
- #ifndef current_klongsize
- 	if (current_klongsize < sizeof(*ptr)) {
--		uint32_t ptr32[n];
- 		int r = umove_or_printaddr(tcp, addr, &ptr32);
- 		if (!r) {
- 			size_t i;
-@@ -200,10 +200,11 @@ do_pselect6(struct tcb *const tcp, const print_obj_by_addr_fn print_ts,
- 	int rc = decode_select(tcp, tcp->u_arg, print_ts, sprint_ts);
- 	if (entering(tcp)) {
- 		kernel_ulong_t data[2];
-+		uint32_t data32[ARRAY_SIZE(data)];
- 
- 		tprints(", ");
- 		if (!umove_kulong_array_or_printaddr(tcp, tcp->u_arg[5],
--						     data, ARRAY_SIZE(data))) {
-+						     data, data32, ARRAY_SIZE(data))) {
- 			tprints("{");
- 			/* NB: kernel requires data[1] == NSIG_BYTES */
- 			print_sigset_addr_len(tcp, data[0], data[1]);
-diff --git a/nlattr.c b/nlattr.c
-index 7f13642c..247ba2d5 100644
---- a/nlattr.c
-+++ b/nlattr.c
-@@ -341,7 +341,7 @@ decode_nla_hwaddr(struct tcb *const tcp,
+diff --git a/src/nlattr.c b/src/nlattr.c
+index 8ac034031..648181ac8 100644
+--- a/src/nlattr.c
++++ b/src/nlattr.c
+@@ -344,7 +344,7 @@ decode_nla_hwaddr(struct tcb *const tcp,
  	if (len > MAX_ADDR_LEN)
  		return false;
  
@@ -69,10 +37,10 @@ index 7f13642c..247ba2d5 100644
  	const uintptr_t arphrd = (uintptr_t) opaque_data;
  
  	if (!umoven_or_printaddr(tcp, addr, len, buf)) {
-diff --git a/socketutils.c b/socketutils.c
-index be459714..819abc92 100644
---- a/socketutils.c
-+++ b/socketutils.c
+diff --git a/src/socketutils.c b/src/socketutils.c
+index 40a8c1991..1482787ff 100644
+--- a/src/socketutils.c
++++ b/src/socketutils.c
 @@ -144,7 +144,7 @@ inet_parse_response(const void *const data, const int data_len,
  			return -1;
  	}
@@ -91,11 +59,11 @@ index be459714..819abc92 100644
  
  		if (!inet_ntop(diag_msg->idiag_family, diag_msg->id.idiag_dst,
  			       dst_buf, text_size))
-diff --git a/syscall.c b/syscall.c
-index d228ae4d..c8fdd85e 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -295,7 +295,7 @@ decode_socket_subcall(struct tcb *tcp)
+diff --git a/src/syscall.c b/src/syscall.c
+index 52f2f29f6..cbb51fff4 100644
+--- a/src/syscall.c
++++ b/src/syscall.c
+@@ -303,7 +303,7 @@ decode_socket_subcall(struct tcb *tcp)
  
  	const kernel_ulong_t scno = SYS_socket_subcall + call;
  	const unsigned int nargs = sysent[scno].nargs;
@@ -104,10 +72,10 @@ index d228ae4d..c8fdd85e 100644
  
  	if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0)
  		return;
-diff --git a/util.c b/util.c
-index 481144bf..b65479a0 100644
---- a/util.c
-+++ b/util.c
+diff --git a/src/util.c b/src/util.c
+index 31b3876a3..8e12df0f1 100644
+--- a/src/util.c
++++ b/src/util.c
 @@ -493,8 +493,7 @@ enum sock_proto
  getfdproto(struct tcb *tcp, int fd)
  {
@@ -128,5 +96,5 @@ index 481144bf..b65479a0 100644
  		return SOCK_PROTO_UNKNOWN;
  	else {
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch b/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch
index d68ecf7e..71dcbd29 100644
--- a/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch
+++ b/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch
@@ -1,33 +1,33 @@
-From 80d9bfb16cb9318f33521ea92a1c194e206cc479 Mon Sep 17 00:00:00 2001
+From b8db0d40427b083351f080cfd151346f23302e03 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 7 Jul 2019 22:29:34 -0700
 Subject: [PATCH] Avoid index ranges and empty initializer lists in syscallent
  arrays
 
 ---
- linux/alpha/syscallent.h       | 34 +++++++--------
- linux/arm/syscallent.h         |  2 +-
- linux/avr32/syscallent.h       |  4 +-
- linux/bfin/syscallent.h        |  2 +-
- linux/i386/syscallent.h        |  6 +--
- linux/m68k/syscallent.h        |  2 +-
- linux/microblaze/syscallent.h  |  6 +--
- linux/mips/syscallent-compat.h | 46 ++++++++++----------
- linux/powerpc/syscallent.h     |  2 +-
- linux/powerpc64/syscallent.h   | 10 ++---
- linux/s390/syscallent.h        | 42 +++++++++---------
- linux/s390x/syscallent.h       | 78 +++++++++++++++++-----------------
- linux/sh/syscallent.h          | 12 +++---
- linux/sh64/syscallent.h        | 22 ++++++----
- linux/sparc/syscallent.h       |  4 +-
- linux/sparc64/syscallent.h     | 36 ++++++++--------
- linux/xtensa/syscallent.h      | 32 +++++++-------
+ src/linux/alpha/syscallent.h       | 34 ++++++-------
+ src/linux/arm/syscallent.h         |  2 +-
+ src/linux/avr32/syscallent.h       |  4 +-
+ src/linux/bfin/syscallent.h        |  2 +-
+ src/linux/i386/syscallent.h        |  6 +--
+ src/linux/m68k/syscallent.h        |  2 +-
+ src/linux/microblaze/syscallent.h  |  6 +--
+ src/linux/mips/syscallent-compat.h | 46 +++++++++---------
+ src/linux/powerpc/syscallent.h     |  2 +-
+ src/linux/powerpc64/syscallent.h   | 10 ++--
+ src/linux/s390/syscallent.h        | 42 ++++++++--------
+ src/linux/s390x/syscallent.h       | 78 +++++++++++++++---------------
+ src/linux/sh/syscallent.h          | 12 ++---
+ src/linux/sh64/syscallent.h        | 22 ++++++---
+ src/linux/sparc/syscallent.h       |  4 +-
+ src/linux/sparc64/syscallent.h     | 36 +++++++-------
+ src/linux/xtensa/syscallent.h      | 32 ++++++------
  17 files changed, 173 insertions(+), 167 deletions(-)
 
-diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h
-index fa86c9ae..21280054 100644
---- a/linux/alpha/syscallent.h
-+++ b/linux/alpha/syscallent.h
+diff --git a/src/linux/alpha/syscallent.h b/src/linux/alpha/syscallent.h
+index f9e971ed3..36f29509b 100644
+--- a/src/linux/alpha/syscallent.h
++++ b/src/linux/alpha/syscallent.h
 @@ -60,7 +60,7 @@
  [ 50] = { 5,	0,		SEN(printargs),			"osf_setlogin"		}, /* not implemented */
  [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -149,10 +149,10 @@ index fa86c9ae..21280054 100644
  [405] = { 1,	TP|SE,		SEN(exit),			"exit_group"		},
  [406] = { 3,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
  [407] = { 1,	TD,		SEN(epoll_create),		"epoll_create"		},
-diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
-index b744074e..a4a1dd41 100644
---- a/linux/arm/syscallent.h
-+++ b/linux/arm/syscallent.h
+diff --git a/src/linux/arm/syscallent.h b/src/linux/arm/syscallent.h
+index 4fd351305..3ec054c84 100644
+--- a/src/linux/arm/syscallent.h
++++ b/src/linux/arm/syscallent.h
 @@ -433,7 +433,7 @@
   * ARM specific syscalls. Encoded with scno 0x000f00xx.
   * Remapped by shuffle_scno() to be directly after __ARM_NR_cmpxchg.
@@ -162,10 +162,10 @@ index b744074e..a4a1dd41 100644
  [ARM_FIRST_SHUFFLED_SYSCALL+1+1] = { 0,	0,	SEN(printargs),	"breakpoint"		},
  [ARM_FIRST_SHUFFLED_SYSCALL+1+2] = { 3,	TM,	SEN(printargs),	"cacheflush"		},
  [ARM_FIRST_SHUFFLED_SYSCALL+1+3] = { 0,	0,	SEN(printargs),	"usr26"			},
-diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h
-index 491ff8e9..3338de47 100644
---- a/linux/avr32/syscallent.h
-+++ b/linux/avr32/syscallent.h
+diff --git a/src/linux/avr32/syscallent.h b/src/linux/avr32/syscallent.h
+index 5d4624abe..14aff66a2 100644
+--- a/src/linux/avr32/syscallent.h
++++ b/src/linux/avr32/syscallent.h
 @@ -228,7 +228,7 @@
  [219] = { 3,	TF|TSF|TSFA,	SEN(statfs64),			"statfs64"		},
  [220] = { 3,	TD|TFSF|TSFA,	SEN(fstatfs64),			"fstatfs64"		},
@@ -184,10 +184,10 @@ index 491ff8e9..3338de47 100644
  [283] = { 2,	TD,		SEN(setns),			"setns"			},
  [284] = { 5,	TD,		SEN(pread),			"pread64"		},
  [285] = { 5,	TD,		SEN(pwrite),			"pwrite64"		},
-diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h
-index 53d5c235..df2a8003 100644
---- a/linux/bfin/syscallent.h
-+++ b/linux/bfin/syscallent.h
+diff --git a/src/linux/bfin/syscallent.h b/src/linux/bfin/syscallent.h
+index 16287d085..90f55b5c2 100644
+--- a/src/linux/bfin/syscallent.h
++++ b/src/linux/bfin/syscallent.h
 @@ -229,7 +229,7 @@
  [219] = { 3,	TM,		SEN(madvise),			"madvise"		},
  [220] = { 3,	TD,		SEN(getdents64),		"getdents64"		},
@@ -197,10 +197,10 @@ index 53d5c235..df2a8003 100644
  [224] = { 0,	PU|NF,		SEN(gettid),			"gettid"		},
  [225] = { 4,	TD,		SEN(readahead),			"readahead"		},
  [226] = { 5,	TF,		SEN(setxattr),			"setxattr"		},
-diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
-index c6e9cd9b..2ee607aa 100644
---- a/linux/i386/syscallent.h
-+++ b/linux/i386/syscallent.h
+diff --git a/src/linux/i386/syscallent.h b/src/linux/i386/syscallent.h
+index 3c4cb9fe4..fe9e8b4a6 100644
+--- a/src/linux/i386/syscallent.h
++++ b/src/linux/i386/syscallent.h
 @@ -229,7 +229,7 @@
  [219] = { 3,	TM,		SEN(madvise),			"madvise"		},
  [220] = { 3,	TD,		SEN(getdents64),		"getdents64"		},
@@ -228,10 +228,10 @@ index c6e9cd9b..2ee607aa 100644
  [286] = { 5,	0,		SEN(add_key),			"add_key"		},
  [287] = { 4,	0,		SEN(request_key),		"request_key"		},
  [288] = { 5,	0,		SEN(keyctl),			"keyctl"		},
-diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
-index e5ebefe1..742a951d 100644
---- a/linux/m68k/syscallent.h
-+++ b/linux/m68k/syscallent.h
+diff --git a/src/linux/m68k/syscallent.h b/src/linux/m68k/syscallent.h
+index 67f66d719..2205f4982 100644
+--- a/src/linux/m68k/syscallent.h
++++ b/src/linux/m68k/syscallent.h
 @@ -225,7 +225,7 @@
  [215] = { 1,	TC|NF,		SEN(setfsuid),			"setfsuid32"		},
  [216] = { 1,	TC|NF,		SEN(setfsgid),			"setfsgid32"		},
@@ -241,10 +241,10 @@ index e5ebefe1..742a951d 100644
  [220] = { 3,	TD,		SEN(getdents64),		"getdents64"		},
  [221] = { 0,	PU|NF,		SEN(gettid),			"gettid"		},
  [222] = { 2,	TS|TP,		SEN(tkill),			"tkill"			},
-diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h
-index 1c816318..001308d6 100644
---- a/linux/microblaze/syscallent.h
-+++ b/linux/microblaze/syscallent.h
+diff --git a/src/linux/microblaze/syscallent.h b/src/linux/microblaze/syscallent.h
+index d3446abdb..7d8c7394f 100644
+--- a/src/linux/microblaze/syscallent.h
++++ b/src/linux/microblaze/syscallent.h
 @@ -229,7 +229,7 @@
  [219] = { 3,	TM,		SEN(madvise),			"madvise"		},
  [220] = { 3,	TD,		SEN(getdents64),		"getdents64"		},
@@ -272,10 +272,10 @@ index 1c816318..001308d6 100644
  [286] = { 5,	0,		SEN(add_key),			"add_key"		},
  [287] = { 4,	0,		SEN(request_key),		"request_key"		},
  [288] = { 5,	0,		SEN(keyctl),			"keyctl"		},
-diff --git a/linux/mips/syscallent-compat.h b/linux/mips/syscallent-compat.h
-index 61ccfe4e..9444e4c4 100644
---- a/linux/mips/syscallent-compat.h
-+++ b/linux/mips/syscallent-compat.h
+diff --git a/src/linux/mips/syscallent-compat.h b/src/linux/mips/syscallent-compat.h
+index 29cc42632..b1274f890 100644
+--- a/src/linux/mips/syscallent-compat.h
++++ b/src/linux/mips/syscallent-compat.h
 @@ -69,13 +69,13 @@
  [  61] = { 0,	0,	SEN(printargs),		"svr4_chroot"	},
  [  62] = { 0,	0,	SEN(printargs),		"svr4_fcntl"	},
@@ -436,10 +436,10 @@ index 61ccfe4e..9444e4c4 100644
  [3260] = { 0,	0,	SEN(printargs),		"posix_netboot"	},
  [3261] = { 0,	0,	SEN(printargs),		"posix_netunboot"	},
  [3262] = { 0,	0,	SEN(printargs),		"posix_rdump"	},
-diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
-index db4dd2b5..b6508a9b 100644
---- a/linux/powerpc/syscallent.h
-+++ b/linux/powerpc/syscallent.h
+diff --git a/src/linux/powerpc/syscallent.h b/src/linux/powerpc/syscallent.h
+index 98b29e5e8..38056daf6 100644
+--- a/src/linux/powerpc/syscallent.h
++++ b/src/linux/powerpc/syscallent.h
 @@ -231,7 +231,7 @@
  [221] = { 6,	0,		SEN(futex_time32),		"futex"			},
  [222] = { 3,	0,		SEN(sched_setaffinity),		"sched_setaffinity"	},
@@ -449,10 +449,10 @@ index db4dd2b5..b6508a9b 100644
  [225] = { 5,	0,		SEN(printargs),			"tuxcall"		},
  [226] = { 4,	TD|TN,		SEN(sendfile64),		"sendfile64"		},
  [227] = { 2,	TM,		SEN(io_setup),			"io_setup"		},
-diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h
-index 9c306d28..53c0096b 100644
---- a/linux/powerpc64/syscallent.h
-+++ b/linux/powerpc64/syscallent.h
+diff --git a/src/linux/powerpc64/syscallent.h b/src/linux/powerpc64/syscallent.h
+index a5035cb31..86ffe0099 100644
+--- a/src/linux/powerpc64/syscallent.h
++++ b/src/linux/powerpc64/syscallent.h
 @@ -199,14 +199,14 @@
  [189] = { 0,	TP,		SEN(vfork),			"vfork"			},
  [190] = { 2,	0,		SEN(getrlimit),			"ugetrlimit"		},
@@ -491,10 +491,10 @@ index 9c306d28..53c0096b 100644
  [255] = { 1,	0,		SEN(printargs),			"rtas"			},
  [256] = { 5,	0,		SEN(printargs),			"sys_debug_setcontext"	},
  [257] = { 5,	0,		SEN(vserver),			"vserver"		},
-diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h
-index 7af96b5c..97fe42e2 100644
---- a/linux/s390/syscallent.h
-+++ b/linux/s390/syscallent.h
+diff --git a/src/linux/s390/syscallent.h b/src/linux/s390/syscallent.h
+index 5b83b3d15..ccb956441 100644
+--- a/src/linux/s390/syscallent.h
++++ b/src/linux/s390/syscallent.h
 @@ -26,8 +26,8 @@
  [ 14] = { 3,	TF,		SEN(mknod),			"mknod"			},
  [ 15] = { 2,	TF,		SEN(chmod),			"chmod"			},
@@ -625,10 +625,10 @@ index 7af96b5c..97fe42e2 100644
  [243] = { 2,	TM,		SEN(io_setup),			"io_setup"		},
  [244] = { 1,	TM,		SEN(io_destroy),		"io_destroy"		},
  [245] = { 5,	0,		SEN(io_getevents_time32),	"io_getevents"		},
-diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h
-index 6daa310e..8542e839 100644
---- a/linux/s390x/syscallent.h
-+++ b/linux/s390x/syscallent.h
+diff --git a/src/linux/s390x/syscallent.h b/src/linux/s390x/syscallent.h
+index d64141075..8225b5ec4 100644
+--- a/src/linux/s390x/syscallent.h
++++ b/src/linux/s390x/syscallent.h
 @@ -21,29 +21,29 @@
  [ 10] = { 1,	TF,		SEN(unlink),			"unlink"		},
  [ 11] = { 3,	TF|TP|TSD|SE|SI,	SEN(execve),			"execve"		},
@@ -836,10 +836,10 @@ index 6daa310e..8542e839 100644
  [265] = { 3,	TF|TSF|TSFA,	SEN(statfs64),			"statfs64"		},
  [266] = { 3,	TD|TFSF|TSFA,	SEN(fstatfs64),			"fstatfs64"		},
  [267] = { 5,	TM|SI,		SEN(remap_file_pages),		"remap_file_pages"	},
-diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
-index 5349f720..48d65c5e 100644
---- a/linux/sh/syscallent.h
-+++ b/linux/sh/syscallent.h
+diff --git a/src/linux/sh/syscallent.h b/src/linux/sh/syscallent.h
+index 64f3d6f1f..d79c2e8ed 100644
+--- a/src/linux/sh/syscallent.h
++++ b/src/linux/sh/syscallent.h
 @@ -197,7 +197,7 @@
  [185] = { 2,	TC,		SEN(capset),			"capset"		},
  [186] = { 2,	TS,		SEN(sigaltstack),		"sigaltstack"		},
@@ -893,10 +893,10 @@ index 5349f720..48d65c5e 100644
  [294] = { 4,	TM,		SEN(migrate_pages),		"migrate_pages"		},
  [295] = { 4,	TD|TF,		SEN(openat),			"openat"		},
  [296] = { 3,	TD|TF,		SEN(mkdirat),			"mkdirat"		},
-diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
-index 4ec35d31..b9040a15 100644
---- a/linux/sh64/syscallent.h
-+++ b/linux/sh64/syscallent.h
+diff --git a/src/linux/sh64/syscallent.h b/src/linux/sh64/syscallent.h
+index 94e6cea3a..ad192a1b9 100644
+--- a/src/linux/sh64/syscallent.h
++++ b/src/linux/sh64/syscallent.h
 @@ -89,7 +89,7 @@
  [ 79] = { 2,	TCL,		SEN(settimeofday),		"settimeofday"		},
  [ 80] = { 2,	TC,		SEN(getgroups16),		"getgroups"		},
@@ -984,10 +984,10 @@ index 4ec35d31..b9040a15 100644
  [322] = { 4,	TM,		SEN(migrate_pages),		"migrate_pages"		},
  [323] = { 4,	TD|TF,		SEN(openat),			"openat"		},
  [324] = { 3,	TD|TF,		SEN(mkdirat),			"mkdirat"		},
-diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
-index a385368a..acdbff6e 100644
---- a/linux/sparc/syscallent.h
-+++ b/linux/sparc/syscallent.h
+diff --git a/src/linux/sparc/syscallent.h b/src/linux/sparc/syscallent.h
+index e3321f448..1f83f1619 100644
+--- a/src/linux/sparc/syscallent.h
++++ b/src/linux/sparc/syscallent.h
 @@ -57,7 +57,7 @@
  [ 49] = { 0,	TC|PU|NF,	SEN(geteuid16),			"geteuid"		},
  [ 50] = { 0,	TC|PU|NF,	SEN(getegid16),			"getegid"		},
@@ -1006,10 +1006,10 @@ index a385368a..acdbff6e 100644
  [165] = { 4,	TF,		SEN(quotactl),			"quotactl"		},
  [166] = { 1,	0,		SEN(set_tid_address),		"set_tid_address"	},
  [167] = { 5,	TF,		SEN(mount),			"mount"			},
-diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
-index 5faa721c..eec17849 100644
---- a/linux/sparc64/syscallent.h
-+++ b/linux/sparc64/syscallent.h
+diff --git a/src/linux/sparc64/syscallent.h b/src/linux/sparc64/syscallent.h
+index 94471f0c7..f0bfccd56 100644
+--- a/src/linux/sparc64/syscallent.h
++++ b/src/linux/sparc64/syscallent.h
 @@ -36,10 +36,10 @@
  [ 28] = { 2,	TS,		SEN(sigaltstack),		"sigaltstack"		},
  [ 29] = { 0,	TS,		SEN(pause),			"pause"			},
@@ -1117,10 +1117,10 @@ index 5faa721c..eec17849 100644
  [232] = { 6,	TD,		SEN(splice),			"splice"		},
  [233] = { 1,	0,		SEN(stime),			"stime"			},
  [234] = { 3,	TF|TSF|TSFA,	SEN(statfs64),			"statfs64"		},
-diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h
-index a94fd93d..eb189ffc 100644
---- a/linux/xtensa/syscallent.h
-+++ b/linux/xtensa/syscallent.h
+diff --git a/src/linux/xtensa/syscallent.h b/src/linux/xtensa/syscallent.h
+index eb6425d53..5289872d7 100644
+--- a/src/linux/xtensa/syscallent.h
++++ b/src/linux/xtensa/syscallent.h
 @@ -7,7 +7,7 @@
  
  [  0] = { 0,	0,		SEN(printargs),			"spill"			},
@@ -1243,5 +1243,5 @@ index a94fd93d..eb189ffc 100644
  [321] = { 6,	TD|TF,		SEN(fanotify_mark),		"fanotify_mark"		},
  [322] = { 6,	0,		SEN(process_vm_readv),		"process_vm_readv"	},
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch b/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch
index f8de0072..6764e026 100644
--- a/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch
+++ b/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch
@@ -1,17 +1,17 @@
-From 0ad7047e306f4aef8f4a6346e9dfff8079b1c571 Mon Sep 17 00:00:00 2001
+From 4a468614678d3ae7b58e95428352268c975d1812 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 30 Jan 2020 21:57:34 -0800
 Subject: [PATCH] Use alloca when VLAs aren't available
 
 ---
- evdev.c | 14 +++++++++++---
+ src/evdev.c | 14 +++++++++++---
  1 file changed, 11 insertions(+), 3 deletions(-)
 
-diff --git a/evdev.c b/evdev.c
-index 1d4e9aef..58e705ae 100644
---- a/evdev.c
-+++ b/evdev.c
-@@ -181,9 +181,13 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg,
+diff --git a/src/evdev.c b/src/evdev.c
+index 198d799f3..f74ab9a71 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -169,9 +169,13 @@ decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg,
  		return RVAL_IOCTL_DECODED;
  	}
  
@@ -26,7 +26,7 @@ index 1d4e9aef..58e705ae 100644
  		return RVAL_IOCTL_DECODED;
  
  	if (xlat_verbose(xlat_verbosity) != XLAT_STYLE_RAW) {
-@@ -238,9 +242,13 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
+@@ -227,9 +231,13 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
  		return RVAL_IOCTL_DECODED;
  	}
  
@@ -37,19 +37,19 @@ index 1d4e9aef..58e705ae 100644
 +#endif
  
 -	if (umove_or_printaddr(tcp, arg, &buffer))
-+	if (umoven_or_printaddr(tcp, arg, size * sizeof(int), &buffer))
++	if (umoven_or_printaddr(tcp, arg, size * sizeof(int), buffer))
  		return RVAL_IOCTL_DECODED;
  
- 	tprints("{code=");
-@@ -249,7 +257,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
- 	tprints(", values=[");
+ 	tprint_struct_begin();
+@@ -241,7 +249,7 @@ mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
+ 	tprints("[");
  
  	unsigned int i;
 -	for (i = 1; i < ARRAY_SIZE(buffer); i++)
 +	for (i = 1; i < size; i++)
  		tprintf("%s%d", i > 1 ? ", " : "", buffer[i]);
  
- 	tprints("]}");
+ 	tprints("]");
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch
index efd1dc88..3575a551 100644
--- a/pkg/strace/patch/0011-Avoid-index-ranges.patch
+++ b/pkg/strace/patch/0011-Avoid-index-ranges.patch
@@ -1,4 +1,4 @@
-From ca8d72a8002c4c6946947603819436687573e2fa Mon Sep 17 00:00:00 2001
+From 81cd93d38da7a3e33d1e34f8272db1f262eda287 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 30 Jan 2020 22:32:50 -0800
 Subject: [PATCH] Avoid index ranges
@@ -6,14 +6,14 @@ Subject: [PATCH] Avoid index ranges
 The change in print_mac.c is not functionally the same, but we
 ignore this for now.
 ---
- print_mac.c | 4 +---
- util.c      | 8 ++++----
+ src/print_mac.c | 4 +---
+ src/util.c      | 8 ++++----
  2 files changed, 5 insertions(+), 7 deletions(-)
 
-diff --git a/print_mac.c b/print_mac.c
-index c5d5f5c4..a7c54b3e 100644
---- a/print_mac.c
-+++ b/print_mac.c
+diff --git a/src/print_mac.c b/src/print_mac.c
+index c12a1eca3..dc3794787 100644
+--- a/src/print_mac.c
++++ b/src/print_mac.c
 @@ -17,8 +17,6 @@
  DIAG_PUSH_IGNORE_OVERRIDE_INIT
  
@@ -32,11 +32,11 @@ index c5d5f5c4..a7c54b3e 100644
  			? hwaddr_sizes[devtype] : 255;
  
  	return sprint_mac_addr(hwaddr, MIN(size, sz));
-diff --git a/util.c b/util.c
-index b65479a0..40b5a186 100644
---- a/util.c
-+++ b/util.c
-@@ -1198,16 +1198,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
+diff --git a/src/util.c b/src/util.c
+index 8e12df0f1..6cbb0cd91 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -1201,16 +1201,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
  		? 1 + ilog2_klong(len - 1) / HEX_BIT : DUMPSTR_OFFS_MIN_CHARS;
  	kernel_ulong_t i = 0;
  	const unsigned char *src;
@@ -58,5 +58,5 @@ index b65479a0..40b5a186 100644
  
  		/* Fetching data from tracee.  */
 -- 
-2.28.0
+2.30.0
 
diff --git a/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch b/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch
index c9b7b2f9..1d2de5c4 100644
--- a/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch
+++ b/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch
@@ -1,19 +1,19 @@
-From 8f8487a1c0e9be10746b255383fc892095174aac Mon Sep 17 00:00:00 2001
+From 55ff71bf1e559974132c313181134f8a24625fcc Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 26 Sep 2020 16:30:33 -0700
 Subject: [PATCH] Prevent zero-sized arrays
 
 ---
- xlat/btrfs_features_compat.h | 3 ++-
- xlat/mq_attr_flags.h         | 3 ++-
- xlat/sigprof_codes.h         | 3 ++-
- xlat/sock_ipx_options.h      | 3 ++-
+ src/xlat/btrfs_features_compat.h | 3 ++-
+ src/xlat/mq_attr_flags.h         | 3 ++-
+ src/xlat/sigprof_codes.h         | 3 ++-
+ src/xlat/sock_ipx_options.h      | 3 ++-
  4 files changed, 8 insertions(+), 4 deletions(-)
 
-diff --git a/xlat/btrfs_features_compat.h b/xlat/btrfs_features_compat.h
-index d74af31..70331b1 100644
---- a/xlat/btrfs_features_compat.h
-+++ b/xlat/btrfs_features_compat.h
+diff --git a/src/xlat/btrfs_features_compat.h b/src/xlat/btrfs_features_compat.h
+index 44d99a5..f20e7c4 100644
+--- a/src/xlat/btrfs_features_compat.h
++++ b/src/xlat/btrfs_features_compat.h
 @@ -13,13 +13,14 @@ extern const struct xlat btrfs_features_compat[];
  # else
  
@@ -30,10 +30,10 @@ index d74af31..70331b1 100644
   .type = XT_NORMAL,
   .flags_mask = 0
    ,
-diff --git a/xlat/mq_attr_flags.h b/xlat/mq_attr_flags.h
-index 9dfbe94..84ec9cd 100644
---- a/xlat/mq_attr_flags.h
-+++ b/xlat/mq_attr_flags.h
+diff --git a/src/xlat/mq_attr_flags.h b/src/xlat/mq_attr_flags.h
+index c8593a6..3534c0e 100644
+--- a/src/xlat/mq_attr_flags.h
++++ b/src/xlat/mq_attr_flags.h
 @@ -18,13 +18,14 @@ static const struct xlat_data mq_attr_flags_xdata[] = {
   #define XLAT_VAL_0 ((unsigned) (O_NONBLOCK))
   #define XLAT_STR_0 STRINGIFY(O_NONBLOCK)
@@ -50,10 +50,10 @@ index 9dfbe94..84ec9cd 100644
   .type = XT_NORMAL,
   .flags_mask = 0
  #  ifdef XLAT_VAL_0
-diff --git a/xlat/sigprof_codes.h b/xlat/sigprof_codes.h
-index 65614dc..a173d59 100644
---- a/xlat/sigprof_codes.h
-+++ b/xlat/sigprof_codes.h
+diff --git a/src/xlat/sigprof_codes.h b/src/xlat/sigprof_codes.h
+index 5147a5f..019edf3 100644
+--- a/src/xlat/sigprof_codes.h
++++ b/src/xlat/sigprof_codes.h
 @@ -18,13 +18,14 @@ static const struct xlat_data sigprof_codes_xdata[] = {
   #define XLAT_VAL_0 ((unsigned) (PROF_SIG))
   #define XLAT_STR_0 STRINGIFY(PROF_SIG)
@@ -70,10 +70,10 @@ index 65614dc..a173d59 100644
   .type = XT_NORMAL,
   .flags_mask = 0
  #  ifdef XLAT_VAL_0
-diff --git a/xlat/sock_ipx_options.h b/xlat/sock_ipx_options.h
-index 166d010..527089b 100644
---- a/xlat/sock_ipx_options.h
-+++ b/xlat/sock_ipx_options.h
+diff --git a/src/xlat/sock_ipx_options.h b/src/xlat/sock_ipx_options.h
+index 653d4dc..2f259ba 100644
+--- a/src/xlat/sock_ipx_options.h
++++ b/src/xlat/sock_ipx_options.h
 @@ -18,11 +18,12 @@ static const struct xlat_data sock_ipx_options_xdata[] = {
   #define XLAT_VAL_0 ((unsigned) (IPX_TYPE))
   #define XLAT_STR_0 STRINGIFY(IPX_TYPE)
@@ -89,5 +89,5 @@ index 166d010..527089b 100644
   .flags_mask = 0
  #  ifdef XLAT_VAL_0
 -- 
-2.28.0
+2.30.0