diff --git a/fix-test-failure-with-secilc.patch b/fix-test-failure-with-secilc.patch index 95cb2c26e74b1c0cd165eb4dcfc94d3ef903688e..da3cd4a0d103d1fb46e3cabe354dfd68a721b114 100644 --- a/fix-test-failure-with-secilc.patch +++ b/fix-test-failure-with-secilc.patch @@ -1,22 +1,17 @@ -From b4dff18c54fd666100d10581ce9215c8d5cbde93 Mon Sep 17 00:00:00 2001 -From: gengqihu -Date: Tue, 11 May 2021 04:28:37 -0400 +From 8c2996e89966639ccb6f0f03aff01e86b86afaad Mon Sep 17 00:00:00 2001 +From: zhangxingrong +Date: Tue, 16 Jan 2024 15:07:33 +0800 Subject: [PATCH] fix test failure with secilc -There's no secilc here. The SELinux CIL Compiler is a compiler that -converts the CIL language as described on the CIL design wiki into a -kernel binary policy file. -This patch deletes the testcode related to secilc. - --- - tests/Makefile | 12 ++++++------ - tests/libsemanage-tests.c | 16 ---------------- - 2 files changed, 6 insertions(+), 22 deletions(-) + libsemanage/tests/Makefile | 11 +++-------- + libsemanage/tests/libsemanage-tests.c | 16 ---------------- + 2 files changed, 3 insertions(+), 24 deletions(-) -diff --git a/tests/Makefile b/tests/Makefile -index 69f49a3..c98dae0 100644 ---- a/tests/Makefile -+++ b/tests/Makefile +diff --git a/libsemanage/tests/Makefile b/libsemanage/tests/Makefile +index 69f49a3..6806b84 100644 +--- a/libsemanage/tests/Makefile ++++ b/libsemanage/tests/Makefile @@ -1,6 +1,5 @@ # Add your test source files here: -SOURCES = $(sort $(wildcard *.c)) @@ -36,20 +31,20 @@ index 69f49a3..c98dae0 100644 $(EXECUTABLE): $(OBJECTS) ../src/libsemanage.a $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) -- + -%.policy: %.cil - ../../secilc/secilc $*.cil -o $*.policy -f /dev/null - +- clean distclean: - rm -rf $(OBJECTS) $(POLICIES) $(EXECUTABLE) + rm -rf $(OBJECTS) $(EXECUTABLE) test: all ./$(EXECUTABLE) -diff --git a/tests/libsemanage-tests.c b/tests/libsemanage-tests.c -index 2ae4a21..df2d5b2 100644 ---- a/tests/libsemanage-tests.c -+++ b/tests/libsemanage-tests.c +diff --git a/libsemanage/tests/libsemanage-tests.c b/libsemanage/tests/libsemanage-tests.c +index 1d41a03..6e3f4db 100644 +--- a/libsemanage/tests/libsemanage-tests.c ++++ b/libsemanage/tests/libsemanage-tests.c @@ -21,14 +21,6 @@ #include "test_semanage_store.h" @@ -65,12 +60,12 @@ index 2ae4a21..df2d5b2 100644 #include "test_other.h" #include -@@ -68,14 +60,6 @@ static bool do_tests(int interactive, int verbose) +@@ -72,14 +64,6 @@ static bool do_tests(int interactive, int verbose) DECLARE_SUITE(semanage_store); DECLARE_SUITE(semanage_utilities); - DECLARE_SUITE(handle); -- DECLARE_SUITE(bool); +- DECLARE_SUITE(boolean); - DECLARE_SUITE(fcontext); - DECLARE_SUITE(iface); - DECLARE_SUITE(ibendport); @@ -80,5 +75,6 @@ index 2ae4a21..df2d5b2 100644 DECLARE_SUITE(other); if (verbose) --- -2.19.1 +-- +2.33.0 + diff --git a/libsemanage-3.5.tar.gz b/libsemanage-3.5.tar.gz deleted file mode 100644 index 4db89695df48cb3d5866788de5ffb1fb90ec6d15..0000000000000000000000000000000000000000 Binary files a/libsemanage-3.5.tar.gz and /dev/null differ diff --git a/libsemanage-3.6.tar.gz b/libsemanage-3.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..99d75684240a45b059c15cad4187e315f4f8ed71 Binary files /dev/null and b/libsemanage-3.6.tar.gz differ diff --git a/libsemanage.spec b/libsemanage.spec index 1c823535d18fa6d14f7d56b4c76b055c2f265b24..f9810e73da2139df6495780ce3c856ed412b2980 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -2,7 +2,7 @@ %define libselinux_version 3.5-1 Name: libsemanage -Version: 3.5 +Version: 3.6 Release: 1 License: LGPLv2+ Summary: SELinux binary policy manipulation library @@ -104,6 +104,9 @@ make test %changelog +* Tue Jan 16 2024 zhangxingrong - 3.6-1 +- upgrade to 3.6 + * Mon Jul 17 2023 zhangguangzhi - 3.5-1 - update version to 3.5