1231587-build-libselinux-with-swig-4.3.0.patch

@@ -1,22 +0,0 @@
-Index: libselinux-3.7/src/selinuxswig_python.i
-===================================================================
---- libselinux-3.7.orig/src/selinuxswig_python.i
-+++ libselinux-3.7/src/selinuxswig_python.i
-@@ -71,7 +71,7 @@ def install(src, dest):
- 	for (i = 0; i < *$2; i++) {
- 		PyList_SetItem(list, i, PyString_FromString((*$1)[i]));
- 	}
--	$result = SWIG_Python_AppendOutput($result, list);
-+	$result = SWIG_Python_AppendOutput($result, list, $isvoid);
- }
- 
- /* return a sid along with the result */
-@@ -108,7 +108,7 @@ def install(src, dest):
- 		plist = PyList_New(0);
- 	}
- 
--	$result = SWIG_Python_AppendOutput($result, plist);
-+	$result = SWIG_Python_AppendOutput($result, plist, $isvoid);
- }
- 
- /* Makes functions in get_context_list.h return a Python list of contexts */

libselinux-bindings.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Oct 15 11:42:31 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
-
-- Add 1231587-build-libselinux-with-swig-4.3.0.patch to fix build
-  failure with swig 4.3.0 (bsc#1231587)
-
 -------------------------------------------------------------------
 Mon Jul  1 07:53:14 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
 

libselinux-bindings.spec

@@ -39,9 +39,6 @@ Patch5:         skip_cycles.patch
 # Make linking working even when default pkg-config doesn’t provide -lpython<ver>
 Patch6:         python3.8-compat.patch
 Patch7:         swig4_moduleimport.patch
-%if %{pkg_vcmp swig > 4.2.1}
-Patch8:         1231587-build-libselinux-with-swig-4.3.0.patch
-%endif
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}

libselinux.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Thu Nov  7 08:24:33 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
-
-- Drop check_runlevel from selinux-ready script and remove restorecond
-  from check_packages as we don't require it to be selinux-ready.
-
 -------------------------------------------------------------------
 Thu Jul 11 19:47:41 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
 

selinux-ready

@@ -167,9 +167,19 @@ check_initupstart()
 	fi
 }
 
+check_runlevel()
+{
+	if [ "$(systemctl is-enabled restorecond.service 2>/dev/null)" == "enabled" ]; then
+		printf "\tcheck_runlevel: OK. restorecond is enabled on your system\n"
+		return 0;
+	fi
+	printf "\tcheck_runlevel: ERR. please enable restorecond with systemctl enable restorecond.service.\n"
+	return 1
+}
+
 check_packages()
 {
-	PKGLST="checkpolicy policycoreutils selinux-tools libselinux1 libsepol2 libsemanage2"
+	PKGLST="checkpolicy policycoreutils selinux-tools libselinux1 libsepol2 libsemanage2 restorecond"
 	FAIL=0
 
 	for i in $PKGLST
@@ -230,5 +240,6 @@ check_packages
 check_config
 check_initupstart
 check_pam
+check_runlevel
 
 rm -rf $TD