diff --git a/0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch b/0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch new file mode 100644 index 0000000..3ab1d0d --- /dev/null +++ b/0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch @@ -0,0 +1,30 @@ +From e71489b24a49899ca016068cbe39ad0576c52eb5 Mon Sep 17 00:00:00 2001 +From: zhanchengbin +Date: Thu, 17 Mar 2022 10:53:18 +0800 +Subject: [PATCH] tests: skip m_rootdir_acl if selinux is not disabled + +Signed-off-by: zhanchengbin +--- + tests/m_rootdir_acl/script | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/tests/m_rootdir_acl/script b/tests/m_rootdir_acl/script +index e81c82c..6b78d3d 100644 +--- a/tests/m_rootdir_acl/script ++++ b/tests/m_rootdir_acl/script +@@ -16,6 +16,12 @@ if [ "$os" = "GNU" ]; then + return 0 + fi + ++selinux=`grep -nRE "^SELINUX=" /etc/selinux/config | awk -F "=" '{print $2}'` ++if [ $selinux != "disabled" ]; then ++ echo "$test_name: $test_description: skipped (selinux is not disabled)" ++ return 0 ++fi ++ + MKFS_DIR=$TMPFILE.dir + OUT=$test_name.log + EXP=$test_dir/expect +-- +1.8.3.1 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 6058a84..d9245e8 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.46.4 -Release: 6 +Release: 7 Summary: Second extended file system management tools License: GPLv2+ and LGPLv2 and MIT URL: http://e2fsprogs.sourceforge.net/ @@ -17,6 +17,7 @@ Patch8: 0008-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch Patch9: 0009-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch Patch10: 0010-tests-update-expect-file-for-u_direct_io.patch Patch11: 0011-libext2fs-don-t-old-the-CACHE_MTX-while-doing-I-O.patch +Patch12: 0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch BuildRequires: gcc pkgconfig texinfo @@ -139,6 +140,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Feb 17 2022 zhanchengbin - 1.46.4-7 +- tests: skip m_rootdir_acl if selinux is not disabled + * Wed Feb 9 2022 zhanchengbin - 1.46.4-6 - libext2fs: don't old the CACHE_MTX while doing I/O