since libcap2 2.41 or upstream commit 177cd418, the getcap output format changed

This commit is contained in:
Johannes 'josch' Schauer 2020-08-11 22:43:44 +02:00
parent e2ee5b1e84
commit d9153818f4
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1

View file

@ -553,12 +553,12 @@ mkdir /tmp/debian-chroot
tar --xattrs --xattrs-include='*' --directory /tmp/debian-chroot -xf /tmp/debian-chroot-shifted.tar tar --xattrs --xattrs-include='*' --directory /tmp/debian-chroot -xf /tmp/debian-chroot-shifted.tar
echo "100000 100000" > expected echo "100000 100000" > expected
stat --format="%u %g" /tmp/debian-chroot/bin/ping | diff expected - stat --format="%u %g" /tmp/debian-chroot/bin/ping | diff expected -
echo "/tmp/debian-chroot/bin/ping = cap_net_raw+ep" > expected echo "/tmp/debian-chroot/bin/ping cap_net_raw=ep" > expected
getcap /tmp/debian-chroot/bin/ping | diff expected - getcap /tmp/debian-chroot/bin/ping | diff expected -
echo "0 0" > expected echo "0 0" > expected
runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot stat --format="%u %g" /bin/ping \ runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot stat --format="%u %g" /bin/ping \
| diff expected - | diff expected -
echo "/bin/ping = cap_net_raw+ep" > expected echo "/bin/ping cap_net_raw=ep" > expected
runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot getcap /bin/ping \ runuser -u user -- $CMD --unshare-helper /usr/sbin/chroot /tmp/debian-chroot getcap /bin/ping \
| diff expected - | diff expected -
rm /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar expected rm /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar expected