strace: Update to 5.19

7 files changed, 76 insertions, 65 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 41d00421..8861fc15 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,4 +1,4 @@
-From ea3a66eaff044dcdbf29062d771f931e0777430e Mon Sep 17 00:00:00 2001
+From 524e22352b2a39b5839375c65b4fc9c2282d6c40 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Don't return expression in void function
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/defs.h b/src/defs.h
-index b95f6bdd3..fd11d60c3 100644
+index f90763dd5..861b667ff 100644
 --- a/src/defs.h
 +++ b/src/defs.h
-@@ -784,7 +784,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *);
+@@ -782,7 +782,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *);
  static inline void
  pathtrace_select(const char *path)
  {
@@ -21,5 +21,5 @@ index b95f6bdd3..fd11d60c3 100644
  
  static inline bool
 -- 
-2.34.1
+2.37.3
 
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 72e562b5..130460c0 100644
--- a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
+++ b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
@@ -1,4 +1,4 @@
-From deb58e1542286779d0bd95482ae3e4e7e7ce7fb7 Mon Sep 17 00:00:00 2001
+From 8ec1f34a8943d175270cbfde3d3a576512e5d2e6 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
@@ -11,12 +11,11 @@ Subject: [PATCH] Use __typeof__ spelling of typeof
  src/landlock.c       |  4 ++--
  src/list.h           | 10 +++++-----
  src/macros.h         |  2 +-
- src/net.c            |  2 +-
  src/tee.c            |  2 +-
  src/ubi.c            |  2 +-
  tests/btrfs.c        |  2 +-
  tests/fcntl-common.c |  2 +-
- 12 files changed, 24 insertions(+), 24 deletions(-)
+ 11 files changed, 23 insertions(+), 23 deletions(-)
 
 diff --git a/src/btrfs.c b/src/btrfs.c
 index 349fee657..c641d2408 100644
@@ -77,10 +76,10 @@ index 349fee657..c641d2408 100644
  				    &info, sizeof(info), tfetch_mem,
  				    print_btrfs_ioctl_space_info, 0);
 diff --git a/src/defs.h b/src/defs.h
-index fd11d60c3..71cec62b4 100644
+index 861b667ff..c44935796 100644
 --- a/src/defs.h
 +++ b/src/defs.h
-@@ -1089,7 +1089,7 @@ print_local_array_ex(struct tcb *tcp,
+@@ -1120,7 +1120,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,				     \
@@ -89,7 +88,7 @@ index fd11d60c3..71cec62b4 100644
  			     sizeof((start_addr_)[0]), (print_func_),        \
  			     NULL, 0, NULL, NULL)
  
-@@ -1926,8 +1926,8 @@ scno_is_valid(kernel_ulong_t scno)
+@@ -1986,8 +1986,8 @@ scno_pers_is_valid(kernel_ulong_t scno, unsigned int pers)
  
  # define ILOG2_ITER_(val_, ret_, bit_)					\
  	do {								\
@@ -191,7 +190,7 @@ index 4de4cb3be..f4ec11f0e 100644
  
  #endif /* !STRACE_LIST_H */
 diff --git a/src/macros.h b/src/macros.h
-index fc563ce2d..02f58d726 100644
+index 659d47191..57a0123b4 100644
 --- a/src/macros.h
 +++ b/src/macros.h
 @@ -62,7 +62,7 @@
@@ -203,19 +202,6 @@ index fc563ce2d..02f58d726 100644
  
  # ifndef offsetofend
  #  define offsetofend(type_, member_)	\
-diff --git a/src/net.c b/src/net.c
-index 3ba2330fb..8d4458a70 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -524,7 +524,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/tee.c b/src/tee.c
 index d7e9b15d9..fc735e0da 100644
 --- a/src/tee.c
@@ -269,5 +255,5 @@ index 20f92dd1d..aa6ecc8f5 100644
  # define TYPEOF_FLOCK_OFF_T off_t
  #endif
 -- 
-2.34.1
+2.37.3
 
diff --git a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
index f21f2f8e..9c2e391b 100644
--- a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
+++ b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
@@ -1,4 +1,4 @@
-From d24d8f3d9a658f2732c99d92376a675af58aee25 Mon Sep 17 00:00:00 2001
+From 1ea9b617255ce7ae228fa6fec171a0d960ab7e96 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
@@ -20,19 +20,19 @@ Subject: [PATCH] Avoid empty initializer lists
  13 files changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/src/bpf.c b/src/bpf.c
-index 801968048..841bb33e3 100644
+index 7bdeb4f65..3c6889eb0 100644
 --- a/src/bpf.c
 +++ b/src/bpf.c
-@@ -43,7 +43,7 @@ bpf_cmd_decoder(struct tcb *const tcp,					\
+@@ -48,7 +48,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};			\
- 		const size_t attr_size = bpf_cmd ## _struct_size;	\
+ 		size_t attr_size = bpf_cmd ## _struct_size;	\
  		const unsigned int len = MIN(size, attr_size);		\
  		memcpy(&attr, data, len);				\
-@@ -154,7 +154,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
+@@ -159,7 +159,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
  	if (abbrev(tcp)) {
  		printaddr(addr);
  	} else {
@@ -81,10 +81,10 @@ index fc13a6613..f7b6e6e49 100644
  		return;
  	tprints(sprintsigmask_n("", mask, len));
 diff --git a/src/strace.c b/src/strace.c
-index 7370275e1..d12e1f34a 100644
+index 3f5a00a0a..cea52bb22 100644
 --- a/src/strace.c
 +++ b/src/strace.c
-@@ -3532,7 +3532,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
+@@ -3621,7 +3621,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
  		syscall_entering_finish(tcp, res);
  		return res;
  	} else {
@@ -212,10 +212,10 @@ index faf9423f8..eacee2366 100644
  
  	assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
 diff --git a/tests/waitid.c b/tests/waitid.c
-index a14899530..b08881ae7 100644
+index 1ed763840..fef941874 100644
 --- a/tests/waitid.c
 +++ b/tests/waitid.c
-@@ -130,7 +130,7 @@ do_waitid(const unsigned int idtype,
+@@ -146,7 +146,7 @@ do_waitid(const unsigned int idtype,
  	  const unsigned int options,
  	  const kernel_rusage_t *const rusage)
  {
@@ -225,5 +225,5 @@ index a14899530..b08881ae7 100644
  
  	assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
 -- 
-2.34.1
+2.37.3
 
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 afb64a88..2d9149b7 100644
--- a/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/strace/patch/0005-Avoid-pointer-arithmetic-on-void.patch
@@ -1,4 +1,4 @@
-From 4cd0019ddd66505ce71f0cffa3627a4a038640ef Mon Sep 17 00:00:00 2001
+From 989bfd76544b4f62ade9e35d2476332934d27d86 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 *`
@@ -60,10 +60,10 @@ index 9603a6bb6..f5f747c42 100644
  
  	tprint_array_end();
 diff --git a/src/sockaddr.c b/src/sockaddr.c
-index a6e698d4b..52c10eac4 100644
+index 9139da1cd..7126ad2fc 100644
 --- a/src/sockaddr.c
 +++ b/src/sockaddr.c
-@@ -580,7 +580,7 @@ print_sockaddr_data_ll(struct tcb *tcp, const void *const buf,
+@@ -583,7 +583,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)
  {
@@ -72,7 +72,7 @@ index a6e698d4b..52c10eac4 100644
  	const int datalen = addrlen - SIZEOF_SA_FAMILY;
  
  	tprints_field_name("sa_data");
-@@ -777,7 +777,7 @@ print_sockaddr_data_rxrpc(struct tcb *tcp, const void *const buf,
+@@ -780,7 +780,7 @@ print_sockaddr_data_rxrpc(struct tcb *tcp, const void *const buf,
  	tprints_field_name("transport");
  	tprint_struct_begin();
  
@@ -148,5 +148,5 @@ index c769a1916..ed401ae74 100644
  	}
  
 -- 
-2.34.1
+2.37.3
 
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 e737858a..f1020b11 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,4 +1,4 @@
-From 91ba17ac11b0994dc28019a7b643d479a2f201c5 Mon Sep 17 00:00:00 2001
+From b77a4eb06db5c9ec06dfb8386364a5966bbcb1a8 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
@@ -6,9 +6,9 @@ Subject: [PATCH] Don't omit second operand to '?' operator
 ---
  src/kd_ioctl.c | 2 +-
  src/open.c     | 5 +++--
- src/prctl.c    | 2 +-
+ src/prctl.c    | 9 ++++-----
  src/strace.c   | 6 +++---
- 4 files changed, 8 insertions(+), 7 deletions(-)
+ 4 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c
 index eadc1a457..35a89ffed 100644
@@ -40,23 +40,48 @@ index d7654d7e8..6c5c4a2a5 100644
  
  const char *
 diff --git a/src/prctl.c b/src/prctl.c
-index 4275e5f70..a52b3348d 100644
+index 97f42fe15..c0394782b 100644
 --- a/src/prctl.c
 +++ b/src/prctl.c
-@@ -80,7 +80,7 @@ sprint_sve_val(kernel_ulong_t arg)
- 	const char *flags_str = sprintflags("", pr_sve_vl_flags, flags);
+@@ -82,7 +82,6 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
+ 	kernel_ulong_t vl = arg & PR_SVE_VL_LEN_MASK;
+ 	kernel_ulong_t flags = arg & ~PR_SVE_VL_LEN_MASK;
  
- 	xsprintf(out, "%s%s%#" PRI_klx,
--		 flags_str ?: "", flags_str ? "|" : "", vl);
-+		 flags_str ? flags_str : "", flags_str ? "|" : "", vl);
+-	if (!flags && aux)
+ 		return NULL;
+ 
+ 	const char *flags_str = sprintflags_ex("", pr_sve_vl_flags, flags, '\0',
+@@ -91,10 +90,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
+ 	if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
+ 	{
+ 		xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
+-			 arg, flags_str ?: "", flags_str ? "|" : "", vl);
++			 arg, flags_str ? flags_str : "", flags_str ? "|" : "", vl);
+ 	} else {
+ 		xsprintf(out, "%s%s%#" PRI_klx,
+-			 flags_str ?: "", flags_str ? "|" : "", vl);
++			 flags_str ? flags_str : "", flags_str ? "|" : "", vl);
+ 	}
+ 
+ 	return out;
+@@ -127,10 +126,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
+ 	if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
+ 	{
+ 		xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
+-			 arg, flags_str ?: "", flags_str ? "|" : "", vl);
++			 arg, flags_str ? flags_str : "", flags_str ? "|" : "", vl);
+ 	} else {
+ 		xsprintf(out, "%s%s%#" PRI_klx,
+-			 flags_str ?: "", flags_str ? "|" : "", vl);
++			 flags_str ? flags_str : "", flags_str ? "|" : "", vl);
+ 	}
  
  	return out;
- }
 diff --git a/src/strace.c b/src/strace.c
-index d12e1f34a..85c8568fe 100644
+index cea52bb22..154ee684f 100644
 --- a/src/strace.c
 +++ b/src/strace.c
-@@ -2380,7 +2380,7 @@ init(int argc, char *argv[])
+@@ -2463,7 +2463,7 @@ init(int argc, char *argv[])
  			break;
  		case GETOPT_TS:
  			tflag_long_set = true;
@@ -65,7 +90,7 @@ index d12e1f34a..85c8568fe 100644
  				error_opt_arg(c, lopt, optarg);
  			break;
  		case 'T':
-@@ -2488,10 +2488,10 @@ init(int argc, char *argv[])
+@@ -2572,10 +2572,10 @@ init(int argc, char *argv[])
  			qualify_kvm(optarg);
  			break;
  		case GETOPT_QUAL_QUIET:
@@ -79,5 +104,5 @@ index d12e1f34a..85c8568fe 100644
  		case GETOPT_QUAL_DECODE_PID:
  			qualify_decode_pid(optarg);
 -- 
-2.34.1
+2.37.3
 
diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
index 753113a9..7c087ff6 100644
--- a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
+++ b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
@@ -1,4 +1,4 @@
-From fa5aa4ec41eafb8a65732dd599bd645a8650d0d1 Mon Sep 17 00:00:00 2001
+From ecb0b8b820e7777d3270e1ba48583fcf6ef6e9ed 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
@@ -25,10 +25,10 @@ index e4f362787..ad203748b 100644
  		const size_t c = columns[i];
  
 diff --git a/src/nlattr.c b/src/nlattr.c
-index 9b4879a84..ffa8be53e 100644
+index c0563c804..298f6e6da 100644
 --- a/src/nlattr.c
 +++ b/src/nlattr.c
-@@ -356,7 +356,7 @@ decode_nla_hwaddr(struct tcb *const tcp,
+@@ -355,7 +355,7 @@ decode_nla_hwaddr(struct tcb *const tcp,
  	if (len > MAX_ADDR_LEN)
  		return false;
  
@@ -73,7 +73,7 @@ index 92aaee092..159a2a511 100644
  	if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0)
  		return;
 diff --git a/src/util.c b/src/util.c
-index 302496d36..4ed870ac6 100644
+index c4c4bc0ef..6e513ede0 100644
 --- a/src/util.c
 +++ b/src/util.c
 @@ -571,8 +571,7 @@ enum sock_proto
@@ -96,5 +96,5 @@ index 302496d36..4ed870ac6 100644
  		return SOCK_PROTO_UNKNOWN;
  	else {
 -- 
-2.34.1
+2.37.3
 
diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch
index 0292e350..436db264 100644
--- a/pkg/strace/patch/0011-Avoid-index-ranges.patch
+++ b/pkg/strace/patch/0011-Avoid-index-ranges.patch
@@ -1,4 +1,4 @@
-From ec81ad56aec0cdfe0eff2cd4cb9ea396e3ab9794 Mon Sep 17 00:00:00 2001
+From 2aed2fd146be2c7b36f1f618accf166c8be109b6 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
@@ -11,7 +11,7 @@ ignore this for now.
  2 files changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/src/print_mac.c b/src/print_mac.c
-index 9674b9841..7446fa719 100644
+index 38a1f57e8..ebcc708a3 100644
 --- a/src/print_mac.c
 +++ b/src/print_mac.c
 @@ -17,8 +17,6 @@
@@ -24,7 +24,7 @@ index 9674b9841..7446fa719 100644
  	[ARPHRD_ETHER]      =  6 /* ETH_ALEN */,
  	/* ARPHRD_EETHER - no actual devices in Linux */
 @@ -129,7 +127,7 @@ print_mac_addr(const char *prefix, const uint8_t addr[], size_t size)
- const char *
+ static const char *
  sprint_hwaddr(const uint8_t hwaddr[], size_t size, uint32_t devtype)
  {
 -	uint8_t sz = (devtype < ARRAY_SIZE(hwaddr_sizes))
@@ -33,10 +33,10 @@ index 9674b9841..7446fa719 100644
  
  	return sprint_mac_addr(hwaddr, MIN(size, sz));
 diff --git a/src/util.c b/src/util.c
-index 4ed870ac6..e6a7fdfba 100644
+index 6e513ede0..88f25aa83 100644
 --- a/src/util.c
 +++ b/src/util.c
-@@ -1382,16 +1382,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
+@@ -1389,16 +1389,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 4ed870ac6..e6a7fdfba 100644
  
  		/* Fetching data from tracee.  */
 -- 
-2.34.1
+2.37.3