I'm attaching updated patch. The getcap output actually changed like this:
- dir/file = cap_chown+ei
+ dir/file cap_chown=ei
Pavel
On Tuesday, January 19, 2021 4:47:44 PM CET Pavel Raiskup wrote:
> Related discussion in the Fedora pull-request:
> https://src.fedoraproject.org/rpms/tar/pull-request/8
>
> * tests/capabs_raw01.at: Newer systems (currently e.g. Fedora 34)
> print getcap output in format CAP=VAL, not CAP+VAL.
> ---
> tests/capabs_raw01.at | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/capabs_raw01.at b/tests/capabs_raw01.at
> index f9b97736..a1d94116 100644
> --- a/tests/capabs_raw01.at
> +++ b/tests/capabs_raw01.at
> @@ -44,10 +44,11 @@ rm -rf dir
> # restore _all_ xattrs (not just the user.* domain)
> tar --xattrs --xattrs-include='*' -xf archive.tar
>
> -getcap dir/file
> +# Newer systems print = instead of + here
> +getcap dir/file | sed 's/+/=/'
> ],
> [0],
> -[dir/file = cap_chown+ei
> +[dir/file = cap_chown=ei
> ])
>
> AT_CLEANUP
>
>From 8b32042ed8e06ac13643945d0a6b5bacaa8cbc9f Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <prais...@redhat.com>
Date: Tue, 19 Jan 2021 16:45:23 +0100
Subject: [PATCH] xattrs: fix capabilities root test
Related discussion in the Fedora pull-request:
https://src.fedoraproject.org/rpms/tar/pull-request/8
* tests/capabs_raw01.at: Newer systems (currently e.g. Fedora 34)
print getcap output in format CAP=VAL, not CAP+VAL.
---
tests/capabs_raw01.at | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/capabs_raw01.at b/tests/capabs_raw01.at
index f9b97736..988251cf 100644
--- a/tests/capabs_raw01.at
+++ b/tests/capabs_raw01.at
@@ -44,10 +44,13 @@ rm -rf dir
# restore _all_ xattrs (not just the user.* domain)
tar --xattrs --xattrs-include='*' -xf archive.tar
-getcap dir/file
+# Newer systems switched to different format:
+# - dir/file = cap_chown+ei
+# + dir/file cap_chown=ei
+getcap dir/file | sed -e 's/+/=/' -e 's|dir/file = |dir/file |'
],
[0],
-[dir/file = cap_chown+ei
+[dir/file cap_chown=ei
])
AT_CLEANUP
--
2.29.2
