Remove obsolete portability patches with C23 and new cproc

10 files changed, 0 insertions, 564 deletions

diff --git a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch b/pkg/strace/patch/0002-Make-tcp_sysent-a-static-inline-function.patch
index 2fcba055..2fcba055 100644
--- a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
+++ b/pkg/strace/patch/0002-Make-tcp_sysent-a-static-inline-function.patch
diff --git a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
deleted file mode 100644
index 514527f4..00000000
--- a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-From 268084161926ad4d1d110a3a5432e7ffd4e92fdf 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
-
----
- src/bpf.c            | 10 +++++-----
- src/btrfs.c          | 12 ++++++------
- src/defs.h           |  6 +++---
- src/fs_0x94_ioctl.c  |  2 +-
- src/fs_f_ioctl.c     |  2 +-
- src/landlock.c       |  4 ++--
- src/list.h           | 10 +++++-----
- src/macros.h         |  2 +-
- src/print_fields.h   |  2 +-
- src/s390.c           |  6 +++---
- src/tee.c            |  2 +-
- src/ubi.c            |  2 +-
- tests/btrfs.c        |  2 +-
- tests/fcntl-common.c |  2 +-
- 14 files changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/src/bpf.c b/src/bpf.c
-index bbcdceddd..690df570d 100644
---- a/src/bpf.c
-+++ b/src/bpf.c
-@@ -1440,7 +1440,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE)
- 			tprint_struct_next();
- 			PRINT_FIELD_U(attr, target_btf_id);
- 		}
--		attr_size = offsetofend(typeof(attr), target_btf_id);
-+		attr_size = offsetofend(__typeof__(attr), target_btf_id);
- 		break;
- 
- 	/* TODO: prog type == BPF_PROG_TYPE_TRACING */
-@@ -1456,7 +1456,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE)
- 			    print_iter_info_array_member, 0);
- 		tprint_struct_next();
- 		PRINT_FIELD_U(attr, iter_info_len);
--		attr_size = offsetofend(typeof(attr), iter_info_len);
-+		attr_size = offsetofend(__typeof__(attr), iter_info_len);
- 		break;
- 	}
- 
-@@ -1468,7 +1468,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE)
- 		tprint_struct_begin();
- 		PRINT_FIELD_X(attr.perf_event, bpf_cookie);
- 		tprint_struct_end();
--		attr_size = offsetofend(typeof(attr), perf_event.bpf_cookie);
-+		attr_size = offsetofend(__typeof__(attr), perf_event.bpf_cookie);
- 		break;
- 
- 	/* TODO: prog type == BPF_PROG_TYPE_KPROBE */
-@@ -1508,7 +1508,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE)
- 			    &buf.cookie, sizeof(buf.cookie),
- 			    tfetch_mem, print_xint_array_member, 0);
- 		tprint_struct_end();
--		attr_size = offsetofend(typeof(attr), kprobe_multi.cookies);
-+		attr_size = offsetofend(__typeof__(attr), kprobe_multi.cookies);
- 		break;
- 	}
- 
-@@ -1518,7 +1518,7 @@ BEGIN_BPF_CMD_DECODER(BPF_LINK_CREATE)
- 		 *     can pick up non-zero values in the union at the end
- 		 *     of the link_create struct.
- 		 */
--		attr_size = offsetofend(typeof(attr), flags);
-+		attr_size = offsetofend(__typeof__(attr), flags);
- 	}
- 
- print_bpf_link_create_end:
-diff --git a/src/btrfs.c b/src/btrfs.c
-index 31ee871b3..76d7a2bec 100644
---- a/src/btrfs.c
-+++ b/src/btrfs.c
-@@ -216,7 +216,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];
- 		tprint_struct_next();
- 		tprints_field_name("val");
-@@ -257,7 +257,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;
- 		tprint_struct_next();
- 		tprints_field_name("val");
-@@ -298,7 +298,7 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
- 		uint64_t record;
- 		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_uint_array_member, 0);
- 	}
-@@ -1170,7 +1170,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))
-@@ -1206,7 +1206,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))
-@@ -1284,7 +1284,7 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
- 			struct btrfs_ioctl_space_info info;
- 			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/src/defs.h b/src/defs.h
-index 465d58139..ae1d1d1dc 100644
---- a/src/defs.h
-+++ b/src/defs.h
-@@ -1162,7 +1162,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)
- 
-@@ -2045,8 +2045,8 @@ scno_pers_is_valid(kernel_ulong_t scno, unsigned int pers)
- 
- # define ILOG2_ITER_(val_, ret_, bit_)					\
- 	do {								\
--		typeof(ret_) shift_ =					\
--			((val_) > ((((typeof(val_)) 1)			\
-+		__typeof__(ret_) shift_ =				\
-+			((val_) > ((((__typeof__(val_)) 1)		\
- 				   << (1 << (bit_))) - 1)) << (bit_);	\
- 		(val_) >>= shift_;					\
- 		(ret_) |= shift_;					\
-diff --git a/src/fs_0x94_ioctl.c b/src/fs_0x94_ioctl.c
-index 7aa170af0..b908ea1fb 100644
---- a/src/fs_0x94_ioctl.c
-+++ b/src/fs_0x94_ioctl.c
-@@ -94,7 +94,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(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 7b51bc9f9..ee9a42754 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/landlock.c b/src/landlock.c
-index 7ee44f84c..16a430de8 100644
---- a/src/landlock.c
-+++ b/src/landlock.c
-@@ -21,9 +21,9 @@ print_landlock_ruleset_attr(struct tcb *tcp, const kernel_ulong_t addr,
- {
- 	struct landlock_ruleset_attr attr = { 0 };
- 	const size_t min_attr_size =
--		offsetofend(typeof(attr), handled_access_fs);
-+		offsetofend(__typeof__(attr), handled_access_fs);
- 	const size_t max_attr_size =
--		offsetofend(typeof(attr), handled_access_net);
-+		offsetofend(__typeof__(attr), handled_access_net);
- 
- 	if (size < min_attr_size) {
- 		printaddr(addr);
-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.
-  */
- # define list_next(var, field) \
--	list_elem((var)->field.next, typeof(*(var)), field)
-+	list_elem((var)->field.next, __typeof__(*(var)), field)
- /**
-  * Get the previous element in a list.
-  *
-@@ -166,7 +166,7 @@ list_is_empty(const struct list_item *l)
-  * @param field Name of the field that holds the respective struct list_item.
-  */
- # define list_prev(var, field) \
--	list_elem((var)->field.prev, typeof(*(var)), field)
-+	list_elem((var)->field.prev, __typeof__(*(var)), field)
- 
- /**
-  * Insert an item into a list. The item is placed as the next list item
-@@ -280,7 +280,7 @@ list_replace(struct list_item *old, struct list_item *new)
-  *               inside list items.
-  */
- # define list_foreach(var_, head_, field_) \
--	for (var_ = list_elem((head_)->next, typeof(*var_), field_); \
-+	for (var_ = list_elem((head_)->next, __typeof__(*var_), field_); \
- 	    &(var_->field_) != (head_); var_ = list_next(var_, field_))
- 
- /**
-@@ -293,8 +293,8 @@ list_replace(struct list_item *old, struct list_item *new)
-  * @param _tmp   Temporary variable for storing pointer to the next item.
-  */
- # define list_foreach_safe(var_, head_, field_, _tmp) \
--	for (var_ = list_elem((head_)->next, typeof(*var_), field_), \
--	    _tmp = list_elem((var_)->field_.next, typeof(*var_), field_); \
-+	for (var_ = list_elem((head_)->next, __typeof__(*var_), field_), \
-+	    _tmp = list_elem((var_)->field_.next, __typeof__(*var_), field_); \
- 	    &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 cb290c612..81cde400a 100644
---- a/src/macros.h
-+++ b/src/macros.h
-@@ -62,7 +62,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/print_fields.h b/src/print_fields.h
-index 09548ce21..6a7e76982 100644
---- a/src/print_fields.h
-+++ b/src/print_fields.h
-@@ -792,7 +792,7 @@ tprint_sysret_end(void)
- # 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/s390.c b/src/s390.c
-index ca71730c4..455144fe7 100644
---- a/src/s390.c
-+++ b/src/s390.c
-@@ -505,7 +505,7 @@ static void
- print_sthyi_machine(struct tcb *tcp, struct sthyi_machine *hdr, uint16_t size,
- 		    bool *dummy)
- {
--	size_t last_decoded = offsetofend(typeof(*hdr), infmpman);
-+	size_t last_decoded = offsetofend(__typeof__(*hdr), infmpman);
- 	int cnt_val, name_val, id_val;
- 
- 	CHECK_SIZE_EX(hdr, last_decoded, size, "machine structure");
-@@ -611,7 +611,7 @@ static void
- print_sthyi_partition(struct tcb *tcp, struct sthyi_partition *hdr,
- 		      uint16_t size, bool *mt)
- {
--	size_t last_decoded = offsetofend(typeof(*hdr), infpabif);
-+	size_t last_decoded = offsetofend(__typeof__(*hdr), infpabif);
- 	int cnt_val, wcap_val, acap_val, id_val, lpar_val;
- 
- 	*mt = false;
-@@ -802,7 +802,7 @@ static void
- print_sthyi_hypervisor(struct tcb *tcp, struct sthyi_hypervisor *hdr,
- 		       uint16_t size, int num, bool mt)
- {
--	size_t last_decoded = offsetofend(typeof(*hdr), infydifl);
-+	size_t last_decoded = offsetofend(__typeof__(*hdr), infydifl);
- 
- 	CHECK_SIZE_EX(hdr, last_decoded, size, "hypervisor %d structure", num);
- 
-diff --git a/src/tee.c b/src/tee.c
-index 25f6e76c5..c62566800 100644
---- a/src/tee.c
-+++ b/src/tee.c
-@@ -33,7 +33,7 @@ struct tee_ioctl_shm_register_fd_data {
- 
- #define TEE_FETCH_BUF_DATA(buf_, arg_, params_) \
- 	tee_fetch_buf_data(tcp, arg, &buf_, sizeof(arg_), \
--			   &arg_, offsetof(typeof(arg_), num_params), \
-+			   &arg_, offsetof(__typeof__(arg_), num_params), \
- 			   params_)
- 
- /* session id is printed as 0x%x in libteec */
-diff --git a/src/ubi.c b/src/ubi.c
-index 11a435b10..e75377783 100644
---- a/src/ubi.c
-+++ b/src/ubi.c
-@@ -76,7 +76,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 ab5bfae68..a3161875b 100644
---- a/tests/btrfs.c
-+++ b/tests/btrfs.c
-@@ -876,7 +876,7 @@ btrfs_print_tree_search_buf(struct btrfs_ioctl_search_key *key,
- 		printf("buf=[");
- 		for (uint64_t i = 0; i < key->nr_items; ++i) {
- 			struct btrfs_ioctl_search_header *sh;
--			sh = (typeof(sh))(buf + off);
-+			sh = (__typeof__(sh))(buf + off);
- 			if (i)
- 				printf(", ");
- 			printf("{transid=%" PRI__u64 ", objectid=",
-diff --git a/tests/fcntl-common.c b/tests/fcntl-common.c
-index 20f92dd1d..aa6ecc8f5 100644
---- a/tests/fcntl-common.c
-+++ b/tests/fcntl-common.c
-@@ -28,7 +28,7 @@
- #endif
- 
- #ifdef HAVE_TYPEOF
--# define TYPEOF_FLOCK_OFF_T typeof(((struct flock *) NULL)->l_len)
-+# define TYPEOF_FLOCK_OFF_T __typeof__(((struct flock *) NULL)->l_len)
- #else
- # define TYPEOF_FLOCK_OFF_T off_t
- #endif
--- 
-2.44.0
-
diff --git a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch b/pkg/strace/patch/0003-Avoid-pointer-arithmetic-on-void.patch
index 3c8754c2..3c8754c2 100644
--- a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/strace/patch/0003-Avoid-pointer-arithmetic-on-void.patch
diff --git a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
deleted file mode 100644
index c65ce3a3..00000000
--- a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 70c04478b105ab15e3e3a4bfcfcf96ace104b32e 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
-
----
- src/bpf.c               | 4 ++--
- 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 +-
- tests/restart_syscall.c | 2 +-
- tests/setrlimit.c       | 2 +-
- tests/timer_create.c    | 2 +-
- tests/wait4.c           | 2 +-
- tests/waitid.c          | 2 +-
- 12 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/src/bpf.c b/src/bpf.c
-index 690df570d..16f2b7d31 100644
---- a/src/bpf.c
-+++ b/src/bpf.c
-@@ -50,7 +50,7 @@ bpf_cmd_decoder(struct tcb *const tcp,					\
- #define BEGIN_BPF_CMD_DECODER(bpf_cmd)					\
- 	static DECL_BPF_CMD_DECODER(decode_ ## bpf_cmd)			\
- 	{								\
--		struct bpf_cmd ## _struct attr = {};			\
-+		struct bpf_cmd ## _struct attr = {0};			\
- 		size_t attr_size = bpf_cmd ## _struct_size;	\
- 		const unsigned int len = MIN(size, attr_size);		\
- 		memcpy(&attr, data, len);				\
-@@ -161,7 +161,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
- 	if (abbrev(tcp)) {
- 		printaddr(addr);
- 	} else {
--		struct ebpf_insns_data eid = {};
-+		struct ebpf_insns_data eid = {0};
- 		struct ebpf_insn insn;
- 
- 		print_array(tcp, addr, len, &insn, sizeof(insn),
-diff --git a/src/sched.c b/src/sched.c
-index 010366871..2dda5b872 100644
---- a/src/sched.c
-+++ b/src/sched.c
-@@ -111,7 +111,7 @@ static void
- print_sched_attr(struct tcb *const tcp, const kernel_ulong_t addr,
- 		 unsigned int usize)
- {
--	struct sched_attr attr = {};
-+	struct sched_attr attr = {0};
- 	unsigned int size;
- 	bool is_set = false;
- 
-diff --git a/src/signal.c b/src/signal.c
-index 98f84d500..8680b10fb 100644
---- a/src/signal.c
-+++ b/src/signal.c
-@@ -257,7 +257,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
- 		printaddr(addr);
- 		return;
- 	}
--	int mask[NSIG_BYTES / sizeof(int)] = {};
-+	int mask[NSIG_BYTES / sizeof(int)] = {0};
- 	if (umoven_or_printaddr(tcp, addr, len, mask))
- 		return;
- 	tprints_string(sprintsigmask_n("", mask, len));
-diff --git a/src/strace.c b/src/strace.c
-index 649b8d160..9c87e34ed 100644
---- a/src/strace.c
-+++ b/src/strace.c
-@@ -3891,7 +3891,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
- 		syscall_entering_finish(tcp, res);
- 		return res;
- 	} else {
--		struct timespec ts = {};
-+		struct timespec ts = {0};
- 		int res = syscall_exiting_decode(tcp, &ts);
- 		if (res != 0) {
- 			res = syscall_exiting_trace(tcp, &ts, res);
-diff --git a/tests/btrfs.c b/tests/btrfs.c
-index a3161875b..88112e463 100644
---- a/tests/btrfs.c
-+++ b/tests/btrfs.c
-@@ -313,7 +313,7 @@ btrfs_test_subvol_ioctls(void)
- 	char *long_subvol_name;
- 	void *bad_pointer = (void *) (unsigned long) 0xdeadbeeffffffeedULL;
- 	uint64_t u64val = 0xdeadbeefbadc0dedULL;
--	struct btrfs_ioctl_vol_args vol_args = {};
-+	struct btrfs_ioctl_vol_args vol_args = {0};
- 	struct btrfs_ioctl_vol_args_v2 vol_args_v2 = {
- 		.fd = 2,
- 		.flags = max_flags_plus_one(2),
-@@ -554,7 +554,7 @@ btrfs_test_balance_ioctls(void)
- 			.devid = 1,
- 		},
- 	};
--	struct btrfs_ioctl_vol_args vol_args = {};
-+	struct btrfs_ioctl_vol_args vol_args = {0};
- 
- 	ioctl(-1, BTRFS_IOC_BALANCE_CTL, 1);
- 	printf("ioctl(-1, %s, %sBTRFS_BALANCE_CTL_PAUSE%s)" RVAL_EBADF,
-@@ -764,7 +764,7 @@ btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args,
- static void
- btrfs_test_defrag_ioctls(void)
- {
--	struct btrfs_ioctl_vol_args vol_args = {};
-+	struct btrfs_ioctl_vol_args vol_args = {0};
- 	struct btrfs_ioctl_defrag_range_args args = {
- 		.start = 0,
- 		.len = -1ULL,
-@@ -1092,7 +1092,7 @@ btrfs_test_ino_lookup_ioctl(void)
- static void
- btrfs_test_space_info_ioctl(void)
- {
--	struct btrfs_ioctl_space_args args = {};
-+	struct btrfs_ioctl_space_args args = {0};
- 
- 	ioctl(-1, BTRFS_IOC_SPACE_INFO, NULL);
- 	printf("ioctl(-1, %s, NULL)" RVAL_EBADF,
-diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
-index 13c3dad87..4638d492b 100644
---- a/tests/clock_nanosleep.c
-+++ b/tests/clock_nanosleep.c
-@@ -39,7 +39,7 @@ main(void)
- 		.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
- 		.pad = { 0xdeadbeef, 0xbadc0ded }
- 	};
--	const sigset_t set = {};
-+	const sigset_t set = {0};
- 	const struct sigaction act = { .sa_handler = handler };
- 	const struct itimerval itv = {
- 		.it_interval.tv_usec = 222222,
-diff --git a/tests/nanosleep.c b/tests/nanosleep.c
-index 743105e80..2a7ddff5c 100644
---- a/tests/nanosleep.c
-+++ b/tests/nanosleep.c
-@@ -53,7 +53,7 @@ main(void)
- 		.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
- 		.pad = { 0xdeadbeef, 0xbadc0ded }
- 	};
--	const sigset_t set = {};
-+	const sigset_t set = {0};
- 	const struct sigaction act = { .sa_handler = handler };
- 	const struct itimerval itv = { .it_value.tv_usec = 111111 };
- 
-diff --git a/tests/restart_syscall.c b/tests/restart_syscall.c
-index a9b1d2291..7fd7fb602 100644
---- a/tests/restart_syscall.c
-+++ b/tests/restart_syscall.c
-@@ -26,7 +26,7 @@ main(void)
- 	 */
- 	error_msg_and_skip("x32 is broken");
- #else
--	const sigset_t set = {};
-+	const sigset_t set = {0};
- 	const struct sigaction act = { .sa_handler = SIG_IGN };
- 	const struct itimerval itv = { .it_interval.tv_usec = 22222,
- 				       .it_value.tv_usec = 11111 };
-diff --git a/tests/setrlimit.c b/tests/setrlimit.c
-index d4953f6f8..60d54fbd8 100644
---- a/tests/setrlimit.c
-+++ b/tests/setrlimit.c
-@@ -39,7 +39,7 @@ main(void)
- 		printf("setrlimit(%s, NULL) = %s\n", xlat->str, sprintrc(rc));
- # endif
- 
--		struct rlimit libc_rlim = {};
-+		struct rlimit libc_rlim = {0};
- 		if (getrlimit((int) res, &libc_rlim))
- 			continue;
- 		rlimit[0] = libc_rlim.rlim_cur;
-diff --git a/tests/timer_create.c b/tests/timer_create.c
-index e4357b2cf..8d6cd415f 100644
---- a/tests/timer_create.c
-+++ b/tests/timer_create.c
-@@ -24,7 +24,7 @@ main(void)
- 	printf("timer_create(CLOCK_REALTIME, NULL, NULL) = %s\n",
- 	       sprintrc(-1));
- 
--	int tid[4] = {};
-+	int tid[4] = {0};
- 	struct_sigevent sev = {
- 		.sigev_notify = 0xdefaced,
- 		.sigev_signo = 0xfacefeed,
-diff --git a/tests/wait4.c b/tests/wait4.c
-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,
- static pid_t
- do_wait4(pid_t pid, int *wstatus, int options, kernel_rusage_t *ru)
- {
--	sigset_t mask = {};
-+	sigset_t mask = {0};
- 	sigaddset(&mask, SIGCHLD);
- 
- 	assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
-diff --git a/tests/waitid.c b/tests/waitid.c
-index 1ed763840..fef941874 100644
---- a/tests/waitid.c
-+++ b/tests/waitid.c
-@@ -146,7 +146,7 @@ do_waitid(const unsigned int idtype,
- 	  const unsigned int options,
- 	  const kernel_rusage_t *const rusage)
- {
--	sigset_t mask = {};
-+	sigset_t mask = {0};
- 	sigaddset(&mask, SIGCHLD);
- 
- 	assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
--- 
-2.44.0
-
diff --git a/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch b/pkg/strace/patch/0004-Avoid-empty-struct-definition.patch
index ca4fc3ab..ca4fc3ab 100644
--- a/pkg/strace/patch/0006-Avoid-empty-struct-definition.patch
+++ b/pkg/strace/patch/0004-Avoid-empty-struct-definition.patch
diff --git a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch b/pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch
index 87141306..87141306 100644
--- a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
+++ b/pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch
diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0006-Avoid-unnecessary-VLAs.patch
index 18040297..18040297 100644
--- a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
+++ b/pkg/strace/patch/0006-Avoid-unnecessary-VLAs.patch
diff --git a/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch b/pkg/strace/patch/0007-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch
index 2a65be80..2a65be80 100644
--- a/pkg/strace/patch/0009-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch
+++ b/pkg/strace/patch/0007-Avoid-index-ranges-and-empty-initializer-lists-in-sy.patch
diff --git a/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch b/pkg/strace/patch/0008-Use-alloca-when-VLAs-aren-t-available.patch
index 07dae470..07dae470 100644
--- a/pkg/strace/patch/0010-Use-alloca-when-VLAs-aren-t-available.patch
+++ b/pkg/strace/patch/0008-Use-alloca-when-VLAs-aren-t-available.patch
diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0009-Avoid-index-ranges.patch
index 8b8d9cf1..8b8d9cf1 100644
--- a/pkg/strace/patch/0011-Avoid-index-ranges.patch
+++ b/pkg/strace/patch/0009-Avoid-index-ranges.patch