Auto sync2gitlab import of strace-5.13-4.el8.src.rpm

.gitignore

@@ -0,0 +1 @@
+/strace-5.13.tar.xz

0155-m4-mpers.m4-generate-HAVE_-_SELINUX_RUNTIME-config-d.patch

@@ -0,0 +1,86 @@
+From bbe5eefaa928449de5994c5288a7c85fae54f716 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Sat, 31 Jul 2021 15:17:41 +0200
+Subject: [PATCH] m4/mpers.m4: generate HAVE_*_SELINUX_RUNTIME config defines
+
+While bootstrap has some provisions for mangling HAVE_SELINUX_RUNTIME
+into HAVE_{M32,MX32}_SELINUX_RUNTIME, and there is logic for checking
+SELinux runtime presence in non-native personalities, the relevant
+configuration definition is not ultimately generated, as it has to be
+defined explicitly, similarly to HAVE_*_MPERS.
+
+* m4/mpers.m4 (st_MPERS) [$st_cv_selinux_runtime == yes]: AC_DEFINE
+HAVE_SELINUX_RUNTIME.
+
+Complements: v5.12~49 "Implement --secontext[=full] option to display SELinux contexts"
+---
+ m4/mpers.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: strace-5.7/m4/mpers.m4
+===================================================================
+--- strace-5.7.orig/m4/mpers.m4	2021-08-24 21:08:43.252246052 +0200
++++ strace-5.7/m4/mpers.m4	2021-08-24 21:26:07.436408149 +0200
+@@ -179,6 +179,10 @@
+ 				popdef([SIZEOF_STRUCT_MSQID64_DS])
+ 			fi
+ 		fi
++		if test "x$st_cv_selinux_runtime" = xyes; then
++			AC_DEFINE([HAVE_SELINUX_RUNTIME], [1],
++				  [Define to enable SELinux security contexts testing for ]mpers_name[ personality])
++		fi
+ 	fi
+ 	CPPFLAGS="$saved_CPPFLAGS"
+ 	CFLAGS="$saved_CFLAGS"
+Index: strace-5.7/src/config.h.in
+===================================================================
+--- strace-5.7.orig/src/config.h.in	2021-08-24 21:08:43.304245612 +0200
++++ strace-5.7/src/config.h.in	2021-08-24 21:26:07.437408141 +0200
+@@ -2181,6 +2181,9 @@
+ /* Define to 1 if you have mpers_name mpers support */
+ #undef HAVE_M32_MPERS
+ 
++/* Define to enable SELinux security contexts testing for m32 personality */
++#undef HAVE_M32_SELINUX_RUNTIME
++
+ /* Define to 1 if m32 has the type 'struct stat'. */
+ #undef HAVE_M32_STRUCT_STAT
+ 
+@@ -2202,6 +2205,9 @@
+ /* Define to 1 if you have mpers_name mpers support */
+ #undef HAVE_MX32_MPERS
+ 
++/* Define to enable SELinux security contexts testing for mx32 personality */
++#undef HAVE_MX32_SELINUX_RUNTIME
++
+ /* Define to 1 if mx32 has the type 'struct stat'. */
+ #undef HAVE_MX32_STRUCT_STAT
+ 
+Index: strace-5.7/configure
+===================================================================
+--- strace-5.7.orig/configure	2021-08-24 21:08:43.315245519 +0200
++++ strace-5.7/configure	2021-08-24 21:26:07.439408124 +0200
+@@ -19317,6 +19217,11 @@
+ 
+ 			fi
+ 		fi
++		if test "x$st_cv_m32_selinux_runtime" = xyes; then
++
++$as_echo "#define HAVE_M32_SELINUX_RUNTIME 1" >>confdefs.h
++
++		fi
+ 	fi
+ 	CPPFLAGS="$saved_CPPFLAGS"
+ 	CFLAGS="$saved_CFLAGS"
+@@ -20001,6 +20006,11 @@
+ 
+ 			fi
+ 		fi
++		if test "x$st_cv_mx32_selinux_runtime" = xyes; then
++
++$as_echo "#define HAVE_MX32_SELINUX_RUNTIME 1" >>confdefs.h
++
++		fi
+ 	fi
+ 	CPPFLAGS="$saved_CPPFLAGS"
+ 	CFLAGS="$saved_CFLAGS"

0163-filter_qualify-free-allocated-data-on-the-error-path.patch

@@ -0,0 +1,77 @@
+From a034f8a50cbe15d250457ed2eefbf9db059f724f Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Wed, 18 Aug 2021 21:48:38 +0200
+Subject: [PATCH 147/150] filter_qualify: free allocated data on the error path
+ exit of parse_poke_token
+
+While not terribly required due to the fact that issues with option
+parsing lead to program termination, these changes avoid leaking data
+allocated in the function's scope and not stored elsewhere, which might
+come handy if it ever be used dynamically during the runtime.
+
+This also has been reported as resource leaks by covscan, and these
+changes should calm it.
+
+* src/filter_qualify.c (parse_poke_token): Go to err label instead of
+returning right away; free poke->data, poke, and str_tokenized before
+returning false.
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1995509
+---
+ src/filter_qualify.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/filter_qualify.c b/src/filter_qualify.c
+index df05496..a1a6471 100644
+--- a/src/filter_qualify.c
++++ b/src/filter_qualify.c
+@@ -169,34 +169,40 @@ parse_poke_token(const char *input, struct inject_opts *fopts, bool isenter)
+ 		poke->is_enter = isenter;
+ 
+ 		if ((val = STR_STRIP_PREFIX(token, "@arg")) == token)
+-			return false;
++			goto err;
+ 		if ((val[0] >= '1') && (val[0] <= '7')) {
+ 			poke->arg_no = val[0] - '0';
+ 		} else {
+-			return false;
++			goto err;
+ 		}
+ 		if (val[1] != '=')
+-			return false;
++			goto err;
+ 		val += 2;
+ 
+ 		data_len = strlen(val);
+ 		if ((data_len == 0) || (data_len % 2) || (data_len > 2048))
+-			return false;
++			goto err;
+ 		data_len /= 2;
+ 		poke->data_len = data_len;
+ 		poke->data = xmalloc(data_len);
+ 
+ 		for (size_t i = 0; i < data_len; i++)
+ 			if (sscanf(&val[2 * i], "%2hhx", &poke->data[i]) != 1)
+-				return false;
++				goto err;
+ 
+ 		if (poke_add(fopts->data.poke_idx, poke))
+-			return false;
++			goto err;
+ 	}
+ 	free(str_tokenized);
+ 
+ 	fopts->data.flags |= flag;
+ 	return true;
++
++err:
++	free(poke->data);
++	free(poke);
++	free(str_tokenized);
++	return false;
+ }
+ 
+ static bool
+-- 
+2.1.4
+

0164-macros-expand-BIT-macros-add-MASK-macros-add-_SAFE-m.patch

@@ -0,0 +1,70 @@
+From 3f3dd44f1964c54b55e8c84343579bd7c1924df5 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Wed, 18 Aug 2021 21:49:12 +0200
+Subject: [PATCH 148/150] macros: expand BIT macros, add MASK macros; add
+ *_SAFE macros
+
+These macros might make reading a code that often converts between powers
+of 2 and values/masks a bit easier;  moreover, the *_SAFE versions should
+help in cases where the shift values are expected to be equal to the type
+bit width (which lead to UB otherwise).
+
+Switching from BIT to BIT32 should also clarify bitness, which may be somewhat
+murky at times (cf. printxval, printflags, and printxvals).
+
+* src/macros.h [!BIT] (BIT): Rename to...
+[!BIT32] (BIT32): ...this.
+[!BIT64] (BIT64): New macro.
+[!MASK32] (MASK32): Likewise.
+[!MASK64] (MASK64): Likewise.
+(BIT32_SAFE, BIT64_SAFE, MASK32_SAFE, MASK64_SAFE): New macros.
+(FLAG): Use BIT32.
+---
+ src/macros.h | 30 +++++++++++++++++++++++++++---
+ 1 file changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/src/macros.h b/src/macros.h
+index 467f5d0..2d7a83d 100644
+--- a/src/macros.h
++++ b/src/macros.h
+@@ -78,10 +78,34 @@ is_filled(const char *ptr, char fill, size_t size)
+ # define IS_ARRAY_ZERO(arr_)	\
+ 	is_filled((const char *) (arr_), 0, sizeof(arr_) + MUST_BE_ARRAY(arr_))
+ 
+-# ifndef BIT
+-#  define BIT(x_) (1U << (x_))
++# ifndef BIT32
++#  define BIT32(x_) (1U << (x_))
+ # endif
+ 
+-# define FLAG(name_) name_ = BIT(name_##_BIT)
++# ifndef BIT64
++#  define BIT64(x_) (1ULL << (x_))
++# endif
++
++# ifndef MASK32
++#  define MASK32(x_) (BIT32(x_) - 1U)
++# endif
++
++# ifndef MASK64
++#  define MASK64(x_) (BIT64(x_) - 1ULL)
++# endif
++
++/*
++ * "Safe" versions that avoid UB for values that are >= type bit size
++ * (the usually expected behaviour of the bit shift in that case is zero,
++ * but at least powerpc is notorious for returning the input value when shift
++ * by 64 bits is performed).
++ */
++
++# define BIT32_SAFE(x_) ((x_) < 32 ? BIT32(x_) : 0)
++# define BIT64_SAFE(x_) ((x_) < 64 ? BIT64(x_) : 0)
++# define MASK32_SAFE(x_) (BIT32_SAFE(x_) - 1U)
++# define MASK64_SAFE(x_) (BIT64_SAFE(x_) - 1ULL)
++
++# define FLAG(name_) name_ = BIT32(name_##_BIT)
+ 
+ #endif /* !STRACE_MACROS_H */
+-- 
+2.1.4
+

0165-trie-use-BIT-and-MASK-macros.patch

@@ -0,0 +1,151 @@
+From 8ef5456338a947944cc03b95c22c837af5884ddc Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Wed, 18 Aug 2021 21:51:22 +0200
+Subject: [PATCH 149/150] trie: use BIT* and MASK* macros
+
+This makes reading the code a bit easier.  It also solves some issues
+where there is a hypothertical possibility of having bit shifts of size
+64, by virtue of using the *_SAFE macros (that should silence some
+reported "left shifting by more than 63 bits has undefined behavior"
+covscan issues).
+
+* src/trie.c (trie_create): Use BIT32, MASK64.
+(trie_create_data_block): Use BIT32, change iterator variable type
+to size_t.
+(trie_get_node): Use BIT64, MASK64.
+(trie_data_block_calc_pos): Use BIT32, MASK64, MASK64_SAFE.
+(trie_iterate_keys_node): Use BIT64, MASK64, MASK64_SAFE.
+(trie_free_node): Use BIT64.
+---
+ src/trie.c | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/trie.c b/src/trie.c
+index 586ff25..0a231e4 100644
+--- a/src/trie.c
++++ b/src/trie.c
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ 
+ #include "trie.h"
++#include "macros.h"
+ #include "xmalloc.h"
+ 
+ static const uint8_t ptr_sz_lg = (sizeof(void *) == 8 ? 6 : 5);
+@@ -87,7 +88,7 @@ trie_create(uint8_t key_size, uint8_t item_size_lg, uint8_t node_key_bits,
+ 		/ t->node_key_bits;
+ 
+ 	if (item_size_lg != 6)
+-		t->empty_value &= (((uint64_t) 1 << (1 << t->item_size_lg)) - 1);
++		t->empty_value &= MASK64(BIT32(t->item_size_lg));
+ 
+ 	return t;
+ }
+@@ -96,8 +97,8 @@ static void *
+ trie_create_data_block(struct trie *t)
+ {
+ 	uint64_t fill_value = t->empty_value;
+-	for (int i = 1; i < 1 << (6 - t->item_size_lg); i++) {
+-		fill_value <<= (1 << t->item_size_lg);
++	for (size_t i = 1; i < BIT32(6 - t->item_size_lg); i++) {
++		fill_value <<= BIT32(t->item_size_lg);
+ 		fill_value |= t->empty_value;
+ 	}
+ 
+@@ -105,7 +106,7 @@ trie_create_data_block(struct trie *t)
+ 	if (sz < 6)
+ 		sz = 6;
+ 
+-	size_t count = 1 << (sz - 6);
++	size_t count = BIT32(sz - 6);
+ 	uint64_t *data_block = xcalloc(count, 8);
+ 
+ 	for (size_t i = 0; i < count; i++)
+@@ -119,7 +120,7 @@ trie_get_node(struct trie *t, uint64_t key, bool auto_create)
+ {
+ 	void **cur_node = &(t->data);
+ 
+-	if (t->key_size < 64 && key > (uint64_t) 1 << t->key_size)
++	if (t->key_size < 64 && key > MASK64(t->key_size))
+ 		return NULL;
+ 
+ 	for (uint8_t cur_depth = 0; cur_depth <= t->max_depth; cur_depth++) {
+@@ -133,13 +134,13 @@ trie_get_node(struct trie *t, uint64_t key, bool auto_create)
+ 			if (cur_depth == t->max_depth)
+ 				*cur_node = trie_create_data_block(t);
+ 			else
+-				*cur_node = xcalloc(1 << sz, 1);
++				*cur_node = xcalloc(BIT64(sz), 1);
+ 		}
+ 
+ 		if (cur_depth == t->max_depth)
+ 			break;
+ 
+-		size_t pos = (key >> offs) & ((1 << (sz - ptr_sz_lg)) - 1);
++		size_t pos = (key >> offs) & MASK64(sz - ptr_sz_lg);
+ 		cur_node = (((void **) (*cur_node)) + pos);
+ 	}
+ 
+@@ -152,7 +153,7 @@ trie_data_block_calc_pos(struct trie *t, uint64_t key,
+ {
+ 	uint64_t key_mask;
+ 
+-	key_mask = (1 << t->data_block_key_bits) - 1;
++	key_mask = MASK64(t->data_block_key_bits);
+ 	*pos = (key & key_mask) >> (6 - t->item_size_lg);
+ 
+ 	if (t->item_size_lg == 6) {
+@@ -161,10 +162,10 @@ trie_data_block_calc_pos(struct trie *t, uint64_t key,
+ 		return;
+ 	}
+ 
+-	key_mask = (1 << (6 - t->item_size_lg)) - 1;
+-	*offs = (key & key_mask) * (1 << t->item_size_lg);
++	key_mask = MASK64(6 - t->item_size_lg);
++	*offs = (key & key_mask) << t->item_size_lg;
+ 
+-	*mask = (((uint64_t) 1 << (1 << t->item_size_lg)) - 1) << *offs;
++	*mask = MASK64_SAFE(BIT32(t->item_size_lg)) << *offs;
+ }
+ 
+ bool
+@@ -211,7 +212,7 @@ trie_iterate_keys_node(struct trie *t,
+ 		return 0;
+ 
+ 	if (t->key_size < 64) {
+-		uint64_t key_max = ((uint64_t) 1 << t->key_size) - 1;
++		uint64_t key_max = MASK64(t->key_size);
+ 		if (end > key_max)
+ 			end = key_max;
+ 	}
+@@ -228,15 +229,14 @@ trie_iterate_keys_node(struct trie *t,
+ 		t->key_size :
+ 		trie_get_node_bit_offs(t, depth - 1);
+ 
+-	uint64_t first_key_in_node = start &
+-		(uint64_t) -1 << parent_node_bit_off;
++	uint64_t first_key_in_node = start & ~MASK64_SAFE(parent_node_bit_off);
+ 
+ 	uint8_t node_bit_off = trie_get_node_bit_offs(t, depth);
+ 	uint8_t node_key_bits = parent_node_bit_off - node_bit_off;
+-	uint64_t mask = ((uint64_t) 1 << (node_key_bits)) - 1;
++	uint64_t mask = MASK64_SAFE(node_key_bits);
+ 	uint64_t start_index = (start >> node_bit_off) & mask;
+ 	uint64_t end_index = (end >> node_bit_off) & mask;
+-	uint64_t child_key_count = (uint64_t) 1 << node_bit_off;
++	uint64_t child_key_count = BIT64(node_bit_off);
+ 
+ 	uint64_t count = 0;
+ 
+@@ -274,7 +274,7 @@ trie_free_node(struct trie *t, void *node, uint8_t depth)
+ 	if (depth >= t->max_depth)
+ 		goto free_node;
+ 
+-	size_t sz = 1 << (trie_get_node_size(t, depth) - ptr_sz_lg);
++	size_t sz = BIT64(trie_get_node_size(t, depth) - ptr_sz_lg);
+ 	for (size_t i = 0; i < sz; i++)
+ 		trie_free_node(t, ((void **) node)[i], depth + 1);
+ 
+-- 
+2.1.4
+

0166-tee-rewrite-num_params-access-in-tee_fetch_buf_data.patch

@@ -0,0 +1,52 @@
+From 3a68f90c2a5a208b475cc2014f85ae04541ec5b6 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Fri, 20 Aug 2021 21:31:01 +0200
+Subject: [PATCH 150/150] tee: rewrite num_params access in tee_fetch_buf_data
+
+Pointer to num_params field of the fetched structure is passed in a
+separate function argument which provokes covscan complaints about
+uninitialised accesses and also tingles my aliasing rules senses.
+Rewrite to access it via the arg_struct argument which is fetched
+earlier in the function flow.
+
+* src/tee.c (TEE_FETCH_BUF_DATA): Change &arg_.num_params
+to offsetof(typeof(arg_), num_params).
+(tee_fetch_buf_data): Accept offset of the num_params field instead
+of pointer to it; reconstruct the num_params pointer using it.
+---
+ src/tee.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/tee.c b/src/tee.c
+index f9eda52..d7e9b15 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_, &arg_.num_params, \
++			   &arg_, offsetof(typeof(arg_), num_params), \
+ 			   params_)
+ 
+ /* session id is printed as 0x%x in libteec */
+@@ -56,7 +56,7 @@ tee_fetch_buf_data(struct tcb *const tcp,
+ 		   struct tee_ioctl_buf_data *buf,
+ 		   size_t arg_size,
+ 		   void *arg_struct,
+-		   unsigned *num_params,
++		   size_t num_params_offs,
+ 		   uint64_t *params)
+ {
+ 	if (umove_or_printaddr(tcp, arg, buf))
+@@ -69,6 +69,7 @@ tee_fetch_buf_data(struct tcb *const tcp,
+ 		tee_print_buf(buf);
+ 		return RVAL_IOCTL_DECODED;
+ 	}
++	uint32_t *num_params = (uint32_t *) (arg_struct + num_params_offs);
+ 	if (entering(tcp) &&
+ 	    (arg_size + TEE_IOCTL_PARAM_SIZE(*num_params) != buf->buf_len)) {
+ 		/*
+-- 
+2.1.4
+

0167-print_ifindex-fix-IFNAME_QUOTED_SZ-definition.patch

@@ -0,0 +1,55 @@
+From e27b06773eaf5c0307bcc5637d7457be9be1e6ea Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Wed, 1 Dec 2021 17:11:02 +0100
+Subject: [PATCH] print_ifindex: fix IFNAME_QUOTED_SZ definition
+
+sizeof(IFNAMSIZ) instead of IFNAMSIZ was mistakenly used
+for IFNAME_QUOTED_SZ initial definition in commit v4.23~87
+"print_ifindex: respect xlat style settings".
+
+* src/print_ifindex.c (IFNAME_QUOTED_SZ): Use IFNAMSIZ
+instead of sizeof(IFNAMSIZ).
+* NEWS: Mention it.
+
+Reported-by: Paulo Andrade <pandrade@redhat.com>
+Suggested-by: Paulo Andrade <pandrade@redhat.com>
+Fixes: v4.23~87 "print_ifindex: respect xlat style settings"
+References: https://bugzilla.redhat.com/show_bug.cgi?id=2028146
+---
+ NEWS                | 4 ++++
+ src/print_ifindex.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index 9bab673..a3036b8 100644
+--- a/NEWS
++++ b/NEWS
+@@ -16,6 +16,12 @@ Noteworthy changes in release ?.?? (????-??-??)
+     PTRACE_*, RTM_*, RTPROT_*, TRAP_*, UFFD_*, UFFDIO_*, and V4L2_* constants.
+   * Updated lists of ioctl commands from Linux 5.13.
+ 
++ * Bug fixes
++  * Fixed insufficient buffer size used for network interface name printing,
++    that previously led to assertions on attempts of printing interface names
++    that require quoting, for example, names longer than 4 characters in -xx
++    mode (addresses RHBZ bug #2028146).
++
+ * Portability
+   * On powerpc and powerpc64, linux kernel >= 2.6.23 is required.
+     Older versions without a decent PTRACE_GETREGS support will not work.
+diff --git a/src/print_ifindex.c b/src/print_ifindex.c
+index ec48093..dc9d592 100644
+--- a/src/print_ifindex.c
++++ b/src/print_ifindex.c
+@@ -13,7 +13,7 @@
+ 
+ # define INI_PFX "if_nametoindex(\""
+ # define INI_SFX "\")"
+-# define IFNAME_QUOTED_SZ (sizeof(IFNAMSIZ) * 4 + 3)
++# define IFNAME_QUOTED_SZ (IFNAMSIZ * 4 + 3)
+ 
+ const char *
+ get_ifname(const unsigned int ifindex)
+-- 
+2.1.4
+

0168-m4-fix-st_SELINUX-check.patch

@@ -0,0 +1,208 @@
+From b8f375c2c8140e759122bca3e3469386d3ba5184 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@strace.io>
+Date: Mon, 29 Nov 2021 08:00:00 +0000
+Subject: [PATCH 168/174] m4: fix st_SELINUX check
+
+* m4/st_selinux.m4: Make sure selinux support is enabled only if
+all expected functions are provided by libselinux.
+
+Fixes: v5.12~49 "Implement --secontext[=full] option to display SELinux contexts"
+---
+ m4/st_selinux.m4 | 36 ++++++++++++++++--------------------
+ 1 file changed, 16 insertions(+), 20 deletions(-)
+
+diff --git a/m4/st_selinux.m4 b/m4/st_selinux.m4
+index da72a48..7b24eba 100644
+--- a/m4/st_selinux.m4
++++ b/m4/st_selinux.m4
+@@ -34,29 +34,25 @@ AS_IF([test "x$with_libselinux" != xno],
+        AS_IF([test "x$found_selinux_h" = xyes],
+ 	     [saved_LDFLAGS="$LDFLAGS"
+ 	      LDFLAGS="$LDFLAGS $libselinux_LDFLAGS"
+-	      AC_CHECK_LIB([selinux],[getpidcon],
+-		[libselinux_LIBS="-lselinux"
+-		 enable_secontext=yes
+-		],
+-		[if test "x$with_libselinux" != xcheck; then
+-		   AC_MSG_FAILURE([failed to find getpidcon in libselinux])
+-		 fi
+-		]
+-	      )
+-	      AC_CHECK_LIB([selinux],[getfilecon],
+-		[libselinux_LIBS="-lselinux"
+-		 enable_secontext=yes
+-		],
+-		[if test "x$with_libselinux" != xcheck; then
+-		   AC_MSG_FAILURE([failed to find getfilecon in libselinux])
+-		 fi
+-		]
++	      missing=
++	      for func in getpidcon getfilecon; do
++		AC_CHECK_LIB([selinux], [$func], [:],
++			     [missing="$missing $func"])
++	      done
++	      AS_IF([test "x$missing" = x],
++	            [libselinux_LIBS="-lselinux"
++		     enable_secontext=yes
++		    ],
++		    [AS_IF([test "x$with_libselinux" != xcheck],
++			   [AC_MSG_FAILURE([failed to find in libselinux:$missing])]
++		     )
++		    ]
+ 	      )
+ 	      LDFLAGS="$saved_LDFLAGS"
+ 	     ],
+-	     [if test "x$with_libselinux" != xcheck; then
+-		AC_MSG_FAILURE([failed to find selinux.h])
+-	      fi
++	     [AS_IF([test "x$with_libselinux" != xcheck],
++		    [AC_MSG_FAILURE([failed to find selinux.h])]
++	      )
+ 	     ]
+        )
+       ]
+--- old/configure	2022-02-07 20:17:58.364068436 +0100
++++ new/configure	2022-02-07 20:19:17.092067347 +0100
+@@ -18437,9 +18437,12 @@
+        if test "x$found_selinux_h" = xyes; then :
+   saved_LDFLAGS="$LDFLAGS"
+ 	      LDFLAGS="$LDFLAGS $libselinux_LDFLAGS"
+-	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpidcon in -lselinux" >&5
+-$as_echo_n "checking for getpidcon in -lselinux... " >&6; }
+-if ${ac_cv_lib_selinux_getpidcon+:} false; then :
++	      missing=
++	      for func in getpidcon getfilecon; do
++		as_ac_Lib=`$as_echo "ac_cv_lib_selinux_$func" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $func in -lselinux" >&5
++$as_echo_n "checking for $func in -lselinux... " >&6; }
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -18453,101 +18456,59 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char getpidcon ();
++char $func ();
+ int
+ main ()
+ {
+-return getpidcon ();
++return $func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_selinux_getpidcon=yes
++  eval "$as_ac_Lib=yes"
+ else
+-  ac_cv_lib_selinux_getpidcon=no
++  eval "$as_ac_Lib=no"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_getpidcon" >&5
+-$as_echo "$ac_cv_lib_selinux_getpidcon" >&6; }
+-if test "x$ac_cv_lib_selinux_getpidcon" = xyes; then :
+-  libselinux_LIBS="-lselinux"
+-		 enable_secontext=yes
+-
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++  :
+ else
+-  if test "x$with_libselinux" != xcheck; then
+-		   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "failed to find getpidcon in libselinux
+-See \`config.log' for more details" "$LINENO" 5; }
+-		 fi
+-
+-
++  missing="$missing $func"
+ fi
+ 
+-	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getfilecon in -lselinux" >&5
+-$as_echo_n "checking for getfilecon in -lselinux... " >&6; }
+-if ${ac_cv_lib_selinux_getfilecon+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lselinux  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char getfilecon ();
+-int
+-main ()
+-{
+-return getfilecon ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_selinux_getfilecon=yes
+-else
+-  ac_cv_lib_selinux_getfilecon=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_getfilecon" >&5
+-$as_echo "$ac_cv_lib_selinux_getfilecon" >&6; }
+-if test "x$ac_cv_lib_selinux_getfilecon" = xyes; then :
++	      done
++	      if test "x$missing" = x; then :
+   libselinux_LIBS="-lselinux"
+-		 enable_secontext=yes
++		     enable_secontext=yes
+ 
+ else
+-  if test "x$with_libselinux" != xcheck; then
+-		   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++  if test "x$with_libselinux" != xcheck; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "failed to find getfilecon in libselinux
++as_fn_error $? "failed to find in libselinux:$missing
+ See \`config.log' for more details" "$LINENO" 5; }
+-		 fi
+-
+ 
+ fi
+ 
++
++fi
+ 	      LDFLAGS="$saved_LDFLAGS"
+ 
+ else
+-  if test "x$with_libselinux" != xcheck; then
+-		{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++  if test "x$with_libselinux" != xcheck; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to find selinux.h
+ See \`config.log' for more details" "$LINENO" 5; }
+-	      fi
++
++fi
+ 
+ 
+ fi
+-- 
+2.1.4
+

0170-tests-linkat-reset-errno-before-SELinux-context-mani.patch

@@ -0,0 +1,122 @@
+From f5fd689e40322a7b08a97eb2d26f192610728230 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 18 Jan 2022 16:10:28 +0100
+Subject: [PATCH 170/174] tests/linkat: reset errno before SELinux context
+ manipulation
+
+To avoid printing a stale error information in case of mismatch check
+failure.
+
+* tests/linkat.c: Include <errno.h>.
+(main): Add "errno = 0" before update_secontext_field calls.
+---
+ tests/linkat.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/linkat.c b/tests/linkat.c
+index 1a869e3..c3e2ee4 100644
+--- a/tests/linkat.c
++++ b/tests/linkat.c
+@@ -10,6 +10,7 @@
+ #include "tests.h"
+ #include "scno.h"
+ 
++#include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -91,6 +92,7 @@ main(void)
+ 	free(sample_1_secontext);
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
++	errno = 0;
+ 	update_secontext_field(sample_1, SECONTEXT_USER, "system_u");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 
+@@ -112,6 +114,7 @@ main(void)
+ 	free(sample_1_secontext);
+ #endif
+ 
++	errno = 0;
+ 	update_secontext_field(sample_1, SECONTEXT_TYPE, "default_t");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 	sample_2_secontext = sample_1_secontext;
+@@ -142,6 +145,7 @@ main(void)
+ 	int dfd_old = get_dir_fd(".");
+ 	char *cwd = get_fd_path(dfd_old);
+ 
++	errno = 0;
+ 	update_secontext_field(".", SECONTEXT_TYPE, "default_t");
+ 	char *dfd_old_secontext = SECONTEXT_FILE(".");
+ 
+--- a/tests-m32/linkat.c
++++ b/tests-m32/linkat.c
+@@ -10,6 +10,7 @@
+ #include "tests.h"
+ #include "scno.h"
+ 
++#include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -91,6 +92,7 @@ main(void)
+ 	free(sample_1_secontext);
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
++	errno = 0;
+ 	update_secontext_field(sample_1, SECONTEXT_USER, "system_u");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 
+@@ -112,6 +114,7 @@ main(void)
+ 	free(sample_1_secontext);
+ #endif
+ 
++	errno = 0;
+ 	update_secontext_field(sample_1, SECONTEXT_TYPE, "default_t");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 	sample_2_secontext = sample_1_secontext;
+@@ -142,6 +145,7 @@ main(void)
+ 	int dfd_old = get_dir_fd(".");
+ 	char *cwd = get_fd_path(dfd_old);
+ 
++	errno = 0;
+ 	update_secontext_field(".", SECONTEXT_TYPE, "default_t");
+ 	char *dfd_old_secontext = SECONTEXT_FILE(".");
+ 
+--- a/tests-mx32/linkat.c
++++ b/tests-mx32/linkat.c
+@@ -10,6 +10,7 @@
+ #include "tests.h"
+ #include "scno.h"
+ 
++#include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -91,6 +92,7 @@ main(void)
+ 	free(sample_1_secontext);
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
++	errno = 0;
+ 	update_secontext_field(sample_1, SECONTEXT_USER, "system_u");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 
+@@ -112,6 +114,7 @@ main(void)
+ 	free(sample_1_secontext);
+ #endif
+ 
++	errno = 0;
+ 	update_secontext_field(sample_1, SECONTEXT_TYPE, "default_t");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 	sample_2_secontext = sample_1_secontext;
+@@ -142,6 +145,7 @@ main(void)
+ 	int dfd_old = get_dir_fd(".");
+ 	char *cwd = get_fd_path(dfd_old);
+ 
++	errno = 0;
+ 	update_secontext_field(".", SECONTEXT_TYPE, "default_t");
+ 	char *dfd_old_secontext = SECONTEXT_FILE(".");
+ 
+-- 
+2.1.4
+

0171-tests-secontext-add-secontext-field-getters.patch

@@ -0,0 +1,356 @@
+From 4951286eb634c00c11883b851c91f3a21975eabd Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 18 Jan 2022 18:03:57 +0100
+Subject: [PATCH 171/174] tests/secontext: add secontext field getters
+
+* tests/secontext.h (get_secontext_field, get_secontext_field_file): New
+declarations.
+* tests/secontext.c (get_type_from_context): Rename to...
+(get_secontext_field): ...this;  remove "static" qualifier;  add "field"
+argument, use it.
+(raw_expected_secontext_short_file, raw_secontext_short_pid): Replace
+get_type_from_context call with get_secontext_field.
+(get_secontext_field_file): New function.
+(raw_secontext_short_file): Replace body with get_secontext_field_file
+call.
+---
+ tests/secontext.c | 27 +++++++++++++++------------
+ tests/secontext.h | 20 ++++++++++++++++++++
+ 2 files changed, 35 insertions(+), 12 deletions(-)
+
+diff --git a/tests/secontext.c b/tests/secontext.c
+index 848eea9..52211ed 100644
+--- a/tests/secontext.c
++++ b/tests/secontext.c
+@@ -56,8 +56,8 @@ strip_trailing_newlines(char *context)
+ 	return context;
+ }
+ 
+-static char *
+-get_type_from_context(const char *full_context)
++char *
++get_secontext_field(const char *full_context, enum secontext_field field)
+ {
+ 	int saved_errno = errno;
+ 
+@@ -72,7 +72,7 @@ get_type_from_context(const char *full_context)
+ 	char *context = NULL;
+ 	for (token = strtok_r(ctx_copy, ":", &saveptr), i = 0;
+ 	     token; token = strtok_r(NULL, ":", &saveptr), i++) {
+-		if (i == 2) {
++		if (i == field) {
+ 			context = xstrdup(token);
+ 			break;
+ 		}
+@@ -122,7 +122,7 @@ raw_expected_secontext_short_file(const char *filename)
+ 	int saved_errno = errno;
+ 
+ 	char *ctx = raw_expected_secontext_full_file(filename);
+-	char *type = get_type_from_context(ctx);
++	char *type = get_secontext_field(ctx, SECONTEXT_TYPE);
+ 	free(ctx);
+ 
+ 	errno = saved_errno;
+@@ -144,20 +144,23 @@ raw_secontext_full_file(const char *filename)
+ 	return full_secontext;
+ }
+ 
+-static char *
+-raw_secontext_short_file(const char *filename)
++char *
++get_secontext_field_file(const char *file, enum secontext_field field)
+ {
+-	int saved_errno = errno;
+-
+-	char *ctx = raw_secontext_full_file(filename);
+-	char *type = get_type_from_context(ctx);
++	char *ctx = raw_secontext_full_file(file);
++	char *type =  get_secontext_field(ctx, field);
+ 	free(ctx);
+ 
+-	errno = saved_errno;
+ 	return type;
+ }
+ 
+ static char *
++raw_secontext_short_file(const char *filename)
++{
++	return get_secontext_field_file(filename, SECONTEXT_TYPE);
++}
++
++static char *
+ raw_secontext_full_pid(pid_t pid)
+ {
+ 	int saved_errno = errno;
+@@ -178,7 +181,7 @@ raw_secontext_short_pid(pid_t pid)
+ 	int saved_errno = errno;
+ 
+ 	char *ctx = raw_secontext_full_pid(pid);
+-	char *type = get_type_from_context(ctx);
++	char *type = get_secontext_field(ctx, SECONTEXT_TYPE);
+ 	free(ctx);
+ 
+ 	errno = saved_errno;
+diff --git a/tests/secontext.h b/tests/secontext.h
+index 1d0251a..e5571d5 100644
+--- a/tests/secontext.h
++++ b/tests/secontext.h
+@@ -23,6 +23,15 @@ enum secontext_field {
+ 
+ #if defined TEST_SECONTEXT && defined HAVE_SELINUX_RUNTIME
+ 
++/**
++ * Parse a SELinux context string and return a specified field, duplicated
++ * in a separate string.  The caller is responsible for freeing the memory
++ * pointed by the returned value.
++ */
++char *get_secontext_field(const char *full_context, enum secontext_field field);
++
++char *get_secontext_field_file(const char *file, enum secontext_field field);
++
+ void update_secontext_field(const char *file, enum secontext_field field,
+ 			    const char *newvalue);
+ 
+@@ -48,6 +57,17 @@ void update_secontext_field(const char *file, enum secontext_field field,
+ 
+ #else
+ 
++static inline char *
++get_secontext_field(const char *ctx, enum secontext_field field)
++{
++	return NULL;
++}
++static inline char *
++get_secontext_field_file(const char *file, enum secontext_field field)
++{
++	return NULL;
++}
++
+ static inline void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+diff --git a/tests-m32/secontext.c b/tests-m32/secontext.c
+index 848eea9..52211ed 100644
+--- a/tests-m32/secontext.c
++++ b/tests-m32/secontext.c
+@@ -56,8 +56,8 @@ strip_trailing_newlines(char *context)
+ 	return context;
+ }
+ 
+-static char *
+-get_type_from_context(const char *full_context)
++char *
++get_secontext_field(const char *full_context, enum secontext_field field)
+ {
+ 	int saved_errno = errno;
+ 
+@@ -72,7 +72,7 @@ get_type_from_context(const char *full_context)
+ 	char *context = NULL;
+ 	for (token = strtok_r(ctx_copy, ":", &saveptr), i = 0;
+ 	     token; token = strtok_r(NULL, ":", &saveptr), i++) {
+-		if (i == 2) {
++		if (i == field) {
+ 			context = xstrdup(token);
+ 			break;
+ 		}
+@@ -122,7 +122,7 @@ raw_expected_secontext_short_file(const char *filename)
+ 	int saved_errno = errno;
+ 
+ 	char *ctx = raw_expected_secontext_full_file(filename);
+-	char *type = get_type_from_context(ctx);
++	char *type = get_secontext_field(ctx, SECONTEXT_TYPE);
+ 	free(ctx);
+ 
+ 	errno = saved_errno;
+@@ -144,20 +144,23 @@ raw_secontext_full_file(const char *filename)
+ 	return full_secontext;
+ }
+ 
+-static char *
+-raw_secontext_short_file(const char *filename)
++char *
++get_secontext_field_file(const char *file, enum secontext_field field)
+ {
+-	int saved_errno = errno;
+-
+-	char *ctx = raw_secontext_full_file(filename);
+-	char *type = get_type_from_context(ctx);
++	char *ctx = raw_secontext_full_file(file);
++	char *type =  get_secontext_field(ctx, field);
+ 	free(ctx);
+ 
+-	errno = saved_errno;
+ 	return type;
+ }
+ 
+ static char *
++raw_secontext_short_file(const char *filename)
++{
++	return get_secontext_field_file(filename, SECONTEXT_TYPE);
++}
++
++static char *
+ raw_secontext_full_pid(pid_t pid)
+ {
+ 	int saved_errno = errno;
+@@ -178,7 +181,7 @@ raw_secontext_short_pid(pid_t pid)
+ 	int saved_errno = errno;
+ 
+ 	char *ctx = raw_secontext_full_pid(pid);
+-	char *type = get_type_from_context(ctx);
++	char *type = get_secontext_field(ctx, SECONTEXT_TYPE);
+ 	free(ctx);
+ 
+ 	errno = saved_errno;
+diff --git a/tests-m32/secontext.h b/tests-m32/secontext.h
+index 1d0251a..e5571d5 100644
+--- a/tests-m32/secontext.h
++++ b/tests-m32/secontext.h
+@@ -23,6 +23,15 @@ enum secontext_field {
+ 
+ #if defined TEST_SECONTEXT && defined HAVE_SELINUX_RUNTIME
+ 
++/**
++ * Parse a SELinux context string and return a specified field, duplicated
++ * in a separate string.  The caller is responsible for freeing the memory
++ * pointed by the returned value.
++ */
++char *get_secontext_field(const char *full_context, enum secontext_field field);
++
++char *get_secontext_field_file(const char *file, enum secontext_field field);
++
+ void update_secontext_field(const char *file, enum secontext_field field,
+ 			    const char *newvalue);
+ 
+@@ -48,6 +57,17 @@ void update_secontext_field(const char *file, enum secontext_field field,
+ 
+ #else
+ 
++static inline char *
++get_secontext_field(const char *ctx, enum secontext_field field)
++{
++	return NULL;
++}
++static inline char *
++get_secontext_field_file(const char *file, enum secontext_field field)
++{
++	return NULL;
++}
++
+ static inline void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+diff --git a/tests-mx32/secontext.c b/tests-mx32/secontext.c
+index 848eea9..52211ed 100644
+--- a/tests-mx32/secontext.c
++++ b/tests-mx32/secontext.c
+@@ -56,8 +56,8 @@ strip_trailing_newlines(char *context)
+ 	return context;
+ }
+ 
+-static char *
+-get_type_from_context(const char *full_context)
++char *
++get_secontext_field(const char *full_context, enum secontext_field field)
+ {
+ 	int saved_errno = errno;
+ 
+@@ -72,7 +72,7 @@ get_type_from_context(const char *full_context)
+ 	char *context = NULL;
+ 	for (token = strtok_r(ctx_copy, ":", &saveptr), i = 0;
+ 	     token; token = strtok_r(NULL, ":", &saveptr), i++) {
+-		if (i == 2) {
++		if (i == field) {
+ 			context = xstrdup(token);
+ 			break;
+ 		}
+@@ -122,7 +122,7 @@ raw_expected_secontext_short_file(const char *filename)
+ 	int saved_errno = errno;
+ 
+ 	char *ctx = raw_expected_secontext_full_file(filename);
+-	char *type = get_type_from_context(ctx);
++	char *type = get_secontext_field(ctx, SECONTEXT_TYPE);
+ 	free(ctx);
+ 
+ 	errno = saved_errno;
+@@ -144,20 +144,23 @@ raw_secontext_full_file(const char *filename)
+ 	return full_secontext;
+ }
+ 
+-static char *
+-raw_secontext_short_file(const char *filename)
++char *
++get_secontext_field_file(const char *file, enum secontext_field field)
+ {
+-	int saved_errno = errno;
+-
+-	char *ctx = raw_secontext_full_file(filename);
+-	char *type = get_type_from_context(ctx);
++	char *ctx = raw_secontext_full_file(file);
++	char *type =  get_secontext_field(ctx, field);
+ 	free(ctx);
+ 
+-	errno = saved_errno;
+ 	return type;
+ }
+ 
+ static char *
++raw_secontext_short_file(const char *filename)
++{
++	return get_secontext_field_file(filename, SECONTEXT_TYPE);
++}
++
++static char *
+ raw_secontext_full_pid(pid_t pid)
+ {
+ 	int saved_errno = errno;
+@@ -178,7 +181,7 @@ raw_secontext_short_pid(pid_t pid)
+ 	int saved_errno = errno;
+ 
+ 	char *ctx = raw_secontext_full_pid(pid);
+-	char *type = get_type_from_context(ctx);
++	char *type = get_secontext_field(ctx, SECONTEXT_TYPE);
+ 	free(ctx);
+ 
+ 	errno = saved_errno;
+diff --git a/tests-mx32/secontext.h b/tests-mx32/secontext.h
+index 1d0251a..e5571d5 100644
+--- a/tests-mx32/secontext.h
++++ b/tests-mx32/secontext.h
+@@ -23,6 +23,15 @@ enum secontext_field {
+ 
+ #if defined TEST_SECONTEXT && defined HAVE_SELINUX_RUNTIME
+ 
++/**
++ * Parse a SELinux context string and return a specified field, duplicated
++ * in a separate string.  The caller is responsible for freeing the memory
++ * pointed by the returned value.
++ */
++char *get_secontext_field(const char *full_context, enum secontext_field field);
++
++char *get_secontext_field_file(const char *file, enum secontext_field field);
++
+ void update_secontext_field(const char *file, enum secontext_field field,
+ 			    const char *newvalue);
+ 
+@@ -48,6 +57,17 @@ void update_secontext_field(const char *file, enum secontext_field field,
+ 
+ #else
+ 
++static inline char *
++get_secontext_field(const char *ctx, enum secontext_field field)
++{
++	return NULL;
++}
++static inline char *
++get_secontext_field_file(const char *file, enum secontext_field field)
++{
++	return NULL;
++}
++
+ static inline void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+-- 
+2.1.4
+

0172-tests-linkat-provide-fallback-values-for-secontext-f.patch

@@ -0,0 +1,181 @@
+From 97e2742a7f1e6e113354911d04505ada3bfb5d70 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 18 Jan 2022 18:04:42 +0100
+Subject: [PATCH 172/174] tests/linkat: provide fallback values for secontext
+ fields changes
+
+* tests/linkat.c (mangle_secontext_field): New function.
+(main): Replace calls to update_secontext_field
+with mangle_secontext_field calls.
+---
+ tests/linkat.c | 23 ++++++++++++++++++++---
+ 1 file changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/tests/linkat.c b/tests/linkat.c
+index c3e2ee4..decb736 100644
+--- a/tests/linkat.c
++++ b/tests/linkat.c
+@@ -21,6 +21,20 @@
+ #include "secontext.h"
+ #include "xmalloc.h"
+ 
++static void
++mangle_secontext_field(const char *path, enum secontext_field field,
++		       const char *new_val, const char *fallback_val)
++{
++	char *orig = get_secontext_field_file(path, field);
++	if (!orig)
++		return;
++
++	update_secontext_field(path, field,
++			       strcmp(new_val, orig) ? new_val : fallback_val);
++
++	free(orig);
++}
++
+ int
+ main(void)
+ {
+@@ -93,7 +107,8 @@ main(void)
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+ 	errno = 0;
+-	update_secontext_field(sample_1, SECONTEXT_USER, "system_u");
++	mangle_secontext_field(sample_1, SECONTEXT_USER, "system_u",
++							 "unconfined_u");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 
+ # ifdef PRINT_SECONTEXT_FULL
+@@ -115,7 +130,8 @@ main(void)
+ #endif
+ 
+ 	errno = 0;
+-	update_secontext_field(sample_1, SECONTEXT_TYPE, "default_t");
++	mangle_secontext_field(sample_1, SECONTEXT_TYPE, "default_t",
++							 "unconfined_t");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 	sample_2_secontext = sample_1_secontext;
+ 
+@@ -146,7 +162,8 @@ main(void)
+ 	char *cwd = get_fd_path(dfd_old);
+ 
+ 	errno = 0;
+-	update_secontext_field(".", SECONTEXT_TYPE, "default_t");
++	mangle_secontext_field(".", SECONTEXT_TYPE, "default_t",
++						    "unconfined_t");
+ 	char *dfd_old_secontext = SECONTEXT_FILE(".");
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+diff --git a/tests-m32/linkat.c b/tests-m32/linkat.c
+index c3e2ee4..decb736 100644
+--- a/tests-m32/linkat.c
++++ b/tests-m32/linkat.c
+@@ -21,6 +21,20 @@
+ #include "secontext.h"
+ #include "xmalloc.h"
+ 
++static void
++mangle_secontext_field(const char *path, enum secontext_field field,
++		       const char *new_val, const char *fallback_val)
++{
++	char *orig = get_secontext_field_file(path, field);
++	if (!orig)
++		return;
++
++	update_secontext_field(path, field,
++			       strcmp(new_val, orig) ? new_val : fallback_val);
++
++	free(orig);
++}
++
+ int
+ main(void)
+ {
+@@ -93,7 +107,8 @@ main(void)
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+ 	errno = 0;
+-	update_secontext_field(sample_1, SECONTEXT_USER, "system_u");
++	mangle_secontext_field(sample_1, SECONTEXT_USER, "system_u",
++							 "unconfined_u");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 
+ # ifdef PRINT_SECONTEXT_FULL
+@@ -115,7 +130,8 @@ main(void)
+ #endif
+ 
+ 	errno = 0;
+-	update_secontext_field(sample_1, SECONTEXT_TYPE, "default_t");
++	mangle_secontext_field(sample_1, SECONTEXT_TYPE, "default_t",
++							 "unconfined_t");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 	sample_2_secontext = sample_1_secontext;
+ 
+@@ -146,7 +162,8 @@ main(void)
+ 	char *cwd = get_fd_path(dfd_old);
+ 
+ 	errno = 0;
+-	update_secontext_field(".", SECONTEXT_TYPE, "default_t");
++	mangle_secontext_field(".", SECONTEXT_TYPE, "default_t",
++						    "unconfined_t");
+ 	char *dfd_old_secontext = SECONTEXT_FILE(".");
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+diff --git a/tests-mx32/linkat.c b/tests-mx32/linkat.c
+index c3e2ee4..decb736 100644
+--- a/tests-mx32/linkat.c
++++ b/tests-mx32/linkat.c
+@@ -21,6 +21,20 @@
+ #include "secontext.h"
+ #include "xmalloc.h"
+ 
++static void
++mangle_secontext_field(const char *path, enum secontext_field field,
++		       const char *new_val, const char *fallback_val)
++{
++	char *orig = get_secontext_field_file(path, field);
++	if (!orig)
++		return;
++
++	update_secontext_field(path, field,
++			       strcmp(new_val, orig) ? new_val : fallback_val);
++
++	free(orig);
++}
++
+ int
+ main(void)
+ {
+@@ -93,7 +107,8 @@ main(void)
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+ 	errno = 0;
+-	update_secontext_field(sample_1, SECONTEXT_USER, "system_u");
++	mangle_secontext_field(sample_1, SECONTEXT_USER, "system_u",
++							 "unconfined_u");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 
+ # ifdef PRINT_SECONTEXT_FULL
+@@ -115,7 +130,8 @@ main(void)
+ #endif
+ 
+ 	errno = 0;
+-	update_secontext_field(sample_1, SECONTEXT_TYPE, "default_t");
++	mangle_secontext_field(sample_1, SECONTEXT_TYPE, "default_t",
++							 "unconfined_t");
+ 	sample_1_secontext = SECONTEXT_FILE(sample_1);
+ 	sample_2_secontext = sample_1_secontext;
+ 
+@@ -146,7 +162,8 @@ main(void)
+ 	char *cwd = get_fd_path(dfd_old);
+ 
+ 	errno = 0;
+-	update_secontext_field(".", SECONTEXT_TYPE, "default_t");
++	mangle_secontext_field(".", SECONTEXT_TYPE, "default_t",
++						    "unconfined_t");
+ 	char *dfd_old_secontext = SECONTEXT_FILE(".");
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+-- 
+2.1.4
+

0173-tests-secontext-eliminate-separate-secontext_format-.patch

@@ -0,0 +1,63 @@
+From 6e8aa3749cb7e11e9a59db996f79f036bf7ef263 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 18 Jan 2022 18:05:19 +0100
+Subject: [PATCH 173/174] tests/secontext: eliminate separate secontext_format
+ declaration
+
+* tests/secontext.c (secontext_format): Remove declaration, supply
+the attributes to the definition.
+---
+ tests/secontext.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tests/secontext.c b/tests/secontext.c
+index 52211ed..ba271c8 100644
+--- a/tests/secontext.c
++++ b/tests/secontext.c
+@@ -23,10 +23,7 @@
+ # define TEST_SECONTEXT
+ # include "secontext.h"
+ 
+-static char *
+-secontext_format(char *context, const char *fmt)
+-	ATTRIBUTE_FORMAT((printf, 2, 0)) ATTRIBUTE_MALLOC;
+-
++ATTRIBUTE_FORMAT((printf, 2, 0)) ATTRIBUTE_MALLOC
+ static char *
+ secontext_format(char *context, const char *fmt)
+ {
+diff --git a/tests-m32/secontext.c b/tests-m32/secontext.c
+index 52211ed..ba271c8 100644
+--- a/tests-m32/secontext.c
++++ b/tests-m32/secontext.c
+@@ -23,10 +23,7 @@
+ # define TEST_SECONTEXT
+ # include "secontext.h"
+ 
+-static char *
+-secontext_format(char *context, const char *fmt)
+-	ATTRIBUTE_FORMAT((printf, 2, 0)) ATTRIBUTE_MALLOC;
+-
++ATTRIBUTE_FORMAT((printf, 2, 0)) ATTRIBUTE_MALLOC
+ static char *
+ secontext_format(char *context, const char *fmt)
+ {
+diff --git a/tests-mx32/secontext.c b/tests-mx32/secontext.c
+index 52211ed..ba271c8 100644
+--- a/tests-mx32/secontext.c
++++ b/tests-mx32/secontext.c
+@@ -23,10 +23,7 @@
+ # define TEST_SECONTEXT
+ # include "secontext.h"
+ 
+-static char *
+-secontext_format(char *context, const char *fmt)
+-	ATTRIBUTE_FORMAT((printf, 2, 0)) ATTRIBUTE_MALLOC;
+-
++ATTRIBUTE_FORMAT((printf, 2, 0)) ATTRIBUTE_MALLOC
+ static char *
+ secontext_format(char *context, const char *fmt)
+ {
+-- 
+2.1.4
+

0174-tests-linkat-reset-context-to-the-expected-one-if-a-.patch

@@ -0,0 +1,190 @@
+From 78a81bcfb71ef3d9f6e8b1a32e123fbbc6112a60 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 18 Jan 2022 18:24:34 +0100
+Subject: [PATCH 174/174] tests/linkat: reset context to the expected one if a
+ mismatch has been detected
+
+* tests/secontext.h (reset_secontext_file): New declaration.
+* tests/secontext.c (reset_secontext_file): New function.
+* tests/linkat.c (main): Check that there is no initial mismatch
+in the sample_1 context, reset it otherwise.
+---
+ tests/linkat.c    | 3 +++
+ tests/secontext.c | 7 +++++++
+ tests/secontext.h | 7 +++++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/tests/linkat.c b/tests/linkat.c
+index decb736..781b85a 100644
+--- a/tests/linkat.c
++++ b/tests/linkat.c
+@@ -103,6 +103,9 @@ main(void)
+ 	if (close(fd_sample_2))
+ 		perror_msg_and_fail("close");
+ 
++	if (*sample_1_secontext && strstr(sample_1_secontext, "!!"))
++		reset_secontext_file(sample_1);
++
+ 	free(sample_1_secontext);
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+diff --git a/tests/secontext.c b/tests/secontext.c
+index ba271c8..94fadd4 100644
+--- a/tests/secontext.c
++++ b/tests/secontext.c
+@@ -235,6 +235,13 @@ secontext_short_pid(pid_t pid)
+ 	return FORMAT_SPACE_AFTER(raw_secontext_short_pid(pid));
+ }
+ 
++void reset_secontext_file(const char *file)
++{
++	char *proper_ctx = raw_expected_secontext_full_file(file);
++	(void) setfilecon(file, proper_ctx);
++	free(proper_ctx);
++}
++
+ void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+diff --git a/tests/secontext.h b/tests/secontext.h
+index e5571d5..387263e 100644
+--- a/tests/secontext.h
++++ b/tests/secontext.h
+@@ -32,6 +32,8 @@ char *get_secontext_field(const char *full_context, enum secontext_field field);
+ 
+ char *get_secontext_field_file(const char *file, enum secontext_field field);
+ 
++void reset_secontext_file(const char *file);
++
+ void update_secontext_field(const char *file, enum secontext_field field,
+ 			    const char *newvalue);
+ 
+@@ -69,6 +71,11 @@ get_secontext_field_file(const char *file, enum secontext_field field)
+ }
+ 
+ static inline void
++reset_secontext_file(const char *file)
++{
++}
++
++static inline void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+ {
+diff --git a/tests-m32/linkat.c b/tests-m32/linkat.c
+index decb736..781b85a 100644
+--- a/tests-m32/linkat.c
++++ b/tests-m32/linkat.c
+@@ -103,6 +103,9 @@ main(void)
+ 	if (close(fd_sample_2))
+ 		perror_msg_and_fail("close");
+ 
++	if (*sample_1_secontext && strstr(sample_1_secontext, "!!"))
++		reset_secontext_file(sample_1);
++
+ 	free(sample_1_secontext);
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+diff --git a/tests-m32/secontext.c b/tests-m32/secontext.c
+index ba271c8..94fadd4 100644
+--- a/tests-m32/secontext.c
++++ b/tests-m32/secontext.c
+@@ -235,6 +235,13 @@ secontext_short_pid(pid_t pid)
+ 	return FORMAT_SPACE_AFTER(raw_secontext_short_pid(pid));
+ }
+ 
++void reset_secontext_file(const char *file)
++{
++	char *proper_ctx = raw_expected_secontext_full_file(file);
++	(void) setfilecon(file, proper_ctx);
++	free(proper_ctx);
++}
++
+ void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+diff --git a/tests-m32/secontext.h b/tests-m32/secontext.h
+index e5571d5..387263e 100644
+--- a/tests-m32/secontext.h
++++ b/tests-m32/secontext.h
+@@ -32,6 +32,8 @@ char *get_secontext_field(const char *full_context, enum secontext_field field);
+ 
+ char *get_secontext_field_file(const char *file, enum secontext_field field);
+ 
++void reset_secontext_file(const char *file);
++
+ void update_secontext_field(const char *file, enum secontext_field field,
+ 			    const char *newvalue);
+ 
+@@ -69,6 +71,11 @@ get_secontext_field_file(const char *file, enum secontext_field field)
+ }
+ 
+ static inline void
++reset_secontext_file(const char *file)
++{
++}
++
++static inline void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+ {
+diff --git a/tests-mx32/linkat.c b/tests-mx32/linkat.c
+index decb736..781b85a 100644
+--- a/tests-mx32/linkat.c
++++ b/tests-mx32/linkat.c
+@@ -103,6 +103,9 @@ main(void)
+ 	if (close(fd_sample_2))
+ 		perror_msg_and_fail("close");
+ 
++	if (*sample_1_secontext && strstr(sample_1_secontext, "!!"))
++		reset_secontext_file(sample_1);
++
+ 	free(sample_1_secontext);
+ 
+ #ifdef PRINT_SECONTEXT_MISMATCH
+diff --git a/tests-mx32/secontext.c b/tests-mx32/secontext.c
+index ba271c8..94fadd4 100644
+--- a/tests-mx32/secontext.c
++++ b/tests-mx32/secontext.c
+@@ -235,6 +235,13 @@ secontext_short_pid(pid_t pid)
+ 	return FORMAT_SPACE_AFTER(raw_secontext_short_pid(pid));
+ }
+ 
++void reset_secontext_file(const char *file)
++{
++	char *proper_ctx = raw_expected_secontext_full_file(file);
++	(void) setfilecon(file, proper_ctx);
++	free(proper_ctx);
++}
++
+ void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+diff --git a/tests-mx32/secontext.h b/tests-mx32/secontext.h
+index e5571d5..387263e 100644
+--- a/tests-mx32/secontext.h
++++ b/tests-mx32/secontext.h
+@@ -32,6 +32,8 @@ char *get_secontext_field(const char *full_context, enum secontext_field field);
+ 
+ char *get_secontext_field_file(const char *file, enum secontext_field field);
+ 
++void reset_secontext_file(const char *file);
++
+ void update_secontext_field(const char *file, enum secontext_field field,
+ 			    const char *newvalue);
+ 
+@@ -69,6 +71,11 @@ get_secontext_field_file(const char *file, enum secontext_field field)
+ }
+ 
+ static inline void
++reset_secontext_file(const char *file)
++{
++}
++
++static inline void
+ update_secontext_field(const char *file, enum secontext_field field,
+ 		       const char *newvalue)
+ {
+-- 
+2.1.4
+

2001-limit-qual_fault-scope-on-aarch64.patch

@@ -0,0 +1,60 @@
+Limit the scope of qual_fault.tests on aarch64 as otherwise it takes
+unacceptable amount of time on available builders (more than an hour).
+Index: strace-5.7/tests/qual_fault.test
+===================================================================
+--- strace-5.7.orig/tests/qual_fault.test	2020-06-02 10:41:25.870177356 +0200
++++ strace-5.7/tests/qual_fault.test	2020-06-02 10:48:33.284302800 +0200
+@@ -83,19 +83,35 @@
+ 	done
+ }
+ 
+-for err in '' ENOSYS 22 einval; do
++
++case "$STRACE_ARCH" in
++	aarch64)
++	ERRS='EnoSys 22'
++	NUMBERS1='2'
++	NUMBERS2='3'
++	NUMBERS3='5'
++	;;
++	*)
++	ERRS='ENOSYS 22 einval'
++	NUMBERS1='1 2 3 5 7 11'
++	NUMBERS2='1 2 3 5 7 11'
++	NUMBERS3='1 2 3 5 7 11'
++	;;
++esac
++
++for err in '' $(echo $ERRS); do
+ 	for fault in writev desc,51; do
+ 		check_fault_injection \
+ 			writev $fault "$err" '' '' '' 1 -efault=chdir
+ 		check_fault_injection \
+ 			writev $fault "$err" '' '' '' 1 -efault=chdir -efault=none
+-		for F in 1 2 3 5 7 11; do
++		for F in $(echo $NUMBERS1); do
+ 			check_fault_injection \
+ 				writev $fault "$err" $F '' '' 1
+ 			check_fault_injection \
+ 				writev $fault "$err" $F '' + 1
+ 
+-			for L in 1 2 3 5 7 11; do
++			for L in $(echo $NUMBERS2); do
+ 				[ "$L" -ge "$F" ] ||
+ 					continue
+ 				check_fault_injection \
+@@ -104,12 +119,12 @@
+ 					writev $fault "$err" $F $L + 1
+ 			done
+ 
+-			for S in 1 2 3 5 7 11; do
++			for S in $(echo $NUMBERS2); do
+ 				check_fault_injection \
+ 					writev $fault "$err" $F '' $S 1
+ 				check_fault_injection \
+ 					writev $fault "$err" $F '' $S 4
+-				for L in 1 2 3 5 7 11; do
++				for L in $(echo $NUMBERS3); do
+ 					[ "$L" -ge "$F" ] ||
+ 						continue
+ 					check_fault_injection \

2003-undef-ARRAY_SIZE.patch

@@ -0,0 +1,17 @@
+Index: strace-5.12/src/unwind.c
+===================================================================
+--- strace-5.12.orig/src/unwind.c	2018-12-10 01:00:00.000000000 +0100
++++ strace-5.12/src/unwind.c	2020-06-02 11:13:42.777871147 +0200
+@@ -9,6 +9,12 @@
+ #include "unwind.h"
+ 
+ #ifdef USE_DEMANGLE
++/*
++ * demangle.h defines ARRAY_SIZE without proper guard, and its definition
++ * is "good enough" for us.
++ */
++#undef ARRAY_SIZE
++
+ # if defined HAVE_DEMANGLE_H
+ #  include <demangle.h>
+ # elif defined HAVE_LIBIBERTY_DEMANGLE_H

2004-glibc-msgctl-semctl-shmctl-backport-workaround.patch

@@ -0,0 +1,135 @@
+Index: strace-5.7/tests/ipc_msg.c
+===================================================================
+--- strace-5.7.orig/tests/ipc_msg.c	2021-08-24 21:39:53.102419769 +0200
++++ strace-5.7/tests/ipc_msg.c	2021-08-24 21:43:00.670841489 +0200
+@@ -55,8 +55,9 @@
+  * Starting with commit glibc-2.32.9000-149-gbe9b0b9a012780a403a2,
+  * glibc skips msgctl syscall invocations and returns EINVAL
+  * for invalid msgctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_MSGCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests/ipc_shm.c
+===================================================================
+--- strace-5.7.orig/tests/ipc_shm.c	2021-08-24 21:39:53.124419583 +0200
++++ strace-5.7/tests/ipc_shm.c	2021-08-24 21:43:00.670841489 +0200
+@@ -45,8 +45,9 @@
+  * Starting with commit glibc-2.32.9000-207-g9ebaabeaac1a96b0d91f,
+  * glibc skips shmctl syscall invocations and returns EINVAL
+  * for invalid shmctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_SHMCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests/ipc_sem.c
+===================================================================
+--- strace-5.7.orig/tests/ipc_sem.c	2021-08-24 21:39:53.135419490 +0200
++++ strace-5.7/tests/ipc_sem.c	2021-08-24 21:43:00.670841489 +0200
+@@ -26,8 +26,9 @@
+  * Starting with commit glibc-2.32.9000-147-ga16d2abd496bd974a882,
+  * glibc skips semctl syscall invocations and returns EINVAL
+  * for invalid semctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_SEMCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests-m32/ipc_msg.c
+===================================================================
+--- strace-5.7.orig/tests-m32/ipc_msg.c	2021-08-24 21:39:53.102419769 +0200
++++ strace-5.7/tests-m32/ipc_msg.c	2021-08-24 21:43:00.670841489 +0200
+@@ -55,8 +55,9 @@
+  * Starting with commit glibc-2.32.9000-149-gbe9b0b9a012780a403a2,
+  * glibc skips msgctl syscall invocations and returns EINVAL
+  * for invalid msgctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_MSGCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests-m32/ipc_shm.c
+===================================================================
+--- strace-5.7.orig/tests-m32/ipc_shm.c	2021-08-24 21:39:53.124419583 +0200
++++ strace-5.7/tests-m32/ipc_shm.c	2021-08-24 21:43:00.671841481 +0200
+@@ -45,8 +45,9 @@
+  * Starting with commit glibc-2.32.9000-207-g9ebaabeaac1a96b0d91f,
+  * glibc skips shmctl syscall invocations and returns EINVAL
+  * for invalid shmctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_SHMCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests-m32/ipc_sem.c
+===================================================================
+--- strace-5.7.orig/tests-m32/ipc_sem.c	2021-08-24 21:39:53.135419490 +0200
++++ strace-5.7/tests-m32/ipc_sem.c	2021-08-24 21:43:00.671841481 +0200
+@@ -26,8 +26,9 @@
+  * Starting with commit glibc-2.32.9000-147-ga16d2abd496bd974a882,
+  * glibc skips semctl syscall invocations and returns EINVAL
+  * for invalid semctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_SEMCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests-mx32/ipc_msg.c
+===================================================================
+--- strace-5.7.orig/tests-mx32/ipc_msg.c	2021-08-24 21:39:53.102419769 +0200
++++ strace-5.7/tests-mx32/ipc_msg.c	2021-08-24 21:43:00.671841481 +0200
+@@ -55,8 +55,9 @@
+  * Starting with commit glibc-2.32.9000-149-gbe9b0b9a012780a403a2,
+  * glibc skips msgctl syscall invocations and returns EINVAL
+  * for invalid msgctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_MSGCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests-mx32/ipc_shm.c
+===================================================================
+--- strace-5.7.orig/tests-mx32/ipc_shm.c	2021-08-24 21:39:53.124419583 +0200
++++ strace-5.7/tests-mx32/ipc_shm.c	2021-08-24 21:43:00.671841481 +0200
+@@ -45,8 +45,9 @@
+  * Starting with commit glibc-2.32.9000-207-g9ebaabeaac1a96b0d91f,
+  * glibc skips shmctl syscall invocations and returns EINVAL
+  * for invalid shmctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_SHMCTL_BOGUS_CMD 0
+ #endif
+ 
+Index: strace-5.7/tests-mx32/ipc_sem.c
+===================================================================
+--- strace-5.7.orig/tests-mx32/ipc_sem.c	2021-08-24 21:39:53.136419481 +0200
++++ strace-5.7/tests-mx32/ipc_sem.c	2021-08-24 21:43:00.672841472 +0200
+@@ -26,8 +26,9 @@
+  * Starting with commit glibc-2.32.9000-147-ga16d2abd496bd974a882,
+  * glibc skips semctl syscall invocations and returns EINVAL
+  * for invalid semctl commands.
++ * It has been backported into glic-2.28-153 in RHEL 8.5.
+  */
+-#if GLIBC_PREREQ_GE(2, 32)
++#if GLIBC_PREREQ_GE(2, 28)
+ # define TEST_SEMCTL_BOGUS_CMD 0
+ #endif
+ 

EMPTY

@@ -1 +0,0 @@
- 

sources

@@ -0,0 +1 @@
+SHA512 (strace-5.13.tar.xz) = ba8b0eae396fa2b762bf17cbcdcd84b0660b2a5d5e7e9caf098ef3414a87fd28d4140dd10136483f35904560e5044e40be2bf6117462868a360306d62887c8ed