Unfortunately, the old variant of this patch was applied. So the test-case is not yet fixed. I'm attaching a correction patch.
Thank you! Pavel On Monday, January 25, 2021 10:08:39 AM CET Pavel Raiskup wrote: > 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 a27aa0fce1bb3ee60d63ab5577845cac004755e2 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup <prais...@redhat.com> Date: Mon, 1 Mar 2021 14:36:05 +0100 Subject: [PATCH] Fix tests/capabs_raw01.at once more The output format of getcap changed once more. * tests/capabs_raw01.at: Accept all three formats, with '+', '=' and also without any symbol. --- tests/capabs_raw01.at | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/capabs_raw01.at b/tests/capabs_raw01.at index a1d94116..6c167cb6 100644 --- a/tests/capabs_raw01.at +++ b/tests/capabs_raw01.at @@ -44,11 +44,15 @@ rm -rf dir # restore _all_ xattrs (not just the user.* domain) tar --xattrs --xattrs-include='*' -xf archive.tar -# Newer systems print = instead of + here -getcap dir/file | sed 's/+/=/' +# The output changed a few times, first the '+' sign was replaced with '=' and +# then the '=' symbol disappeared: +# 1. dir/file + cap_chown+ei +# 2. dir/file = cap_chown+ei +# 3. 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.30.1
