strace: bump to 6.12

3 files changed, 23 insertions, 37 deletions

diff --git a/pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch b/pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch
index 87141306..e4344468 100644
--- a/pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch
+++ b/pkg/strace/patch/0005-Don-t-omit-second-operand-to-operator.patch
@@ -1,30 +1,16 @@
-From 586b8d1808d18149a872f0ee1dc8903b9f9e8750 Mon Sep 17 00:00:00 2001
+From e245f2d71d44d2a858517321a01d3ca71147042f 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
 
 ---
- src/kd_ioctl.c | 2 +-
- src/open.c     | 5 +++--
- src/prctl.c    | 8 ++++----
- src/strace.c   | 8 ++++----
- src/strauss.c  | 4 +++-
- src/util.c     | 2 +-
- 6 files changed, 16 insertions(+), 13 deletions(-)
+ src/open.c    | 5 +++--
+ src/prctl.c   | 8 ++++----
+ src/strace.c  | 8 ++++----
+ src/strauss.c | 4 +++-
+ src/util.c    | 2 +-
+ 5 files changed, 15 insertions(+), 12 deletions(-)
 
-diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c
-index ada23d536..fddbd38fb 100644
---- a/src/kd_ioctl.c
-+++ b/src/kd_ioctl.c
-@@ -457,7 +457,7 @@ kd_kbd_str_entry(struct tcb *const tcp, const kernel_ulong_t arg,
- 
- 	if (print_quoted_string((char *) val.kb_string,
- 				MIN(max_strlen,
--				   (unsigned int) ret ?: sizeof(val.kb_string)),
-+				   ret ? (unsigned int) ret : sizeof(val.kb_string)),
- 				QUOTE_OMIT_TRAILING_0))
- 		tprint_more_data_follows();
- 
 diff --git a/src/open.c b/src/open.c
 index 6356c5831..df59ea999 100644
 --- a/src/open.c
@@ -42,10 +28,10 @@ index 6356c5831..df59ea999 100644
  
  const char *
 diff --git a/src/prctl.c b/src/prctl.c
-index f6b4dd741..951133a83 100644
+index dbabb3a18..712715b98 100644
 --- a/src/prctl.c
 +++ b/src/prctl.c
-@@ -92,10 +92,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
+@@ -98,10 +98,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 " */",
@@ -58,7 +44,7 @@ index f6b4dd741..951133a83 100644
  	}
  
  	return out;
-@@ -128,10 +128,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
+@@ -134,10 +134,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 " */",
@@ -72,10 +58,10 @@ index f6b4dd741..951133a83 100644
  
  	return out;
 diff --git a/src/strace.c b/src/strace.c
-index 9c87e34ed..13904f6e1 100644
+index 1a9d53bc8..9ac16c8c3 100644
 --- a/src/strace.c
 +++ b/src/strace.c
-@@ -2609,7 +2609,7 @@ init(int argc, char *argv[])
+@@ -2649,7 +2649,7 @@ init(int argc, char *argv[])
  			break;
  		case GETOPT_TS:
  			tflag_long_set = true;
@@ -84,7 +70,7 @@ index 9c87e34ed..13904f6e1 100644
  				error_opt_arg(c, lopt, optarg);
  			break;
  		case 'T':
-@@ -2683,7 +2683,7 @@ init(int argc, char *argv[])
+@@ -2723,7 +2723,7 @@ init(int argc, char *argv[])
  				error_opt_arg(c, lopt, optarg);
  			break;
  		case GETOPT_TIPS:
@@ -93,7 +79,7 @@ index 9c87e34ed..13904f6e1 100644
  				error_opt_arg(c, lopt, optarg);
  			break;
  		case GETOPT_ARGV0:
-@@ -2729,10 +2729,10 @@ init(int argc, char *argv[])
+@@ -2772,10 +2772,10 @@ init(int argc, char *argv[])
  			qualify_kvm(optarg);
  			break;
  		case GETOPT_QUAL_QUIET:
@@ -131,7 +117,7 @@ index bec85021b..5d49f950a 100644
  			strauss[MIN(3 + i, strauss_lines - 1)]);
  	}
 diff --git a/src/util.c b/src/util.c
-index efd390577..5e87559dc 100644
+index ada3ba76a..a88dd008d 100644
 --- a/src/util.c
 +++ b/src/util.c
 @@ -640,7 +640,7 @@ printsocket(struct tcb *tcp, int fd, const char *path)
diff --git a/pkg/strace/patch/0006-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0006-Avoid-unnecessary-VLAs.patch
index 18040297..195deaf7 100644
--- a/pkg/strace/patch/0006-Avoid-unnecessary-VLAs.patch
+++ b/pkg/strace/patch/0006-Avoid-unnecessary-VLAs.patch
@@ -1,4 +1,4 @@
-From ab57c5ea74c7a1ced31c07bb62c43fc766811e01 Mon Sep 17 00:00:00 2001
+From 8c03823959bcb53e16a6555fcc880fe4560cb79f 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 2494a44d6..704e3a8d5 100644
  		const size_t c = columns[i];
  
 diff --git a/src/nlattr.c b/src/nlattr.c
-index 1fb394d7c..6f2d54979 100644
+index 9944afb8c..1252510a5 100644
 --- a/src/nlattr.c
 +++ b/src/nlattr.c
-@@ -357,7 +357,7 @@ decode_nla_hwaddr(struct tcb *const tcp,
+@@ -310,7 +310,7 @@ DECL_NLA(hwaddr)
  	if (len > MAX_ADDR_LEN)
  		return false;
  
@@ -60,7 +60,7 @@ index d3a3b9283..e0079456f 100644
  		if (!inet_ntop(diag_msg->idiag_family, diag_msg->id.idiag_dst,
  			       dst_buf, text_size))
 diff --git a/src/syscall.c b/src/syscall.c
-index 6d9e843fe..44d5e9e0b 100644
+index 1f4d86dc1..84d448253 100644
 --- a/src/syscall.c
 +++ b/src/syscall.c
 @@ -287,7 +287,7 @@ decode_socket_subcall(struct tcb *tcp)
@@ -73,7 +73,7 @@ index 6d9e843fe..44d5e9e0b 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 efd390577..c9e0c6212 100644
+index a88dd008d..eb5896eec 100644
 --- a/src/util.c
 +++ b/src/util.c
 @@ -569,8 +569,7 @@ enum sock_proto
diff --git a/pkg/strace/patch/0009-Avoid-index-ranges.patch b/pkg/strace/patch/0009-Avoid-index-ranges.patch
index 8b8d9cf1..46681b13 100644
--- a/pkg/strace/patch/0009-Avoid-index-ranges.patch
+++ b/pkg/strace/patch/0009-Avoid-index-ranges.patch
@@ -1,4 +1,4 @@
-From b7f05e44f267fde2bc317a54430ec106d5af2808 Mon Sep 17 00:00:00 2001
+From 0663a21f8a5d9d9ffd8e79bfb0c326365d98e384 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
@@ -33,10 +33,10 @@ index cad1013a8..73d7bbe28 100644
  
  	return sprint_mac_addr(hwaddr, MIN(size, sz));
 diff --git a/src/util.c b/src/util.c
-index c9e0c6212..875c3ae9c 100644
+index eb5896eec..e92a25264 100644
 --- a/src/util.c
 +++ b/src/util.c
-@@ -1519,16 +1519,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
+@@ -1660,16 +1660,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;