File use-older-libsepol.patch of Package setools

Overview Repositories Revisions Requests Users Attributes Meta

File use-older-libsepol.patch of Package setools (Revision 239a7f1427782ed714ad2eaa15873243)

Currently displaying revision 239a7f1427782ed714ad2eaa15873243 , Show latest

---
 README.md                    |    2 +-
 setools/policyrep/sepol.pxd  |    9 ++++-----
 setools/policyrep/terule.pxi |   41 +++++++----------------------------------
 3 files changed, 12 insertions(+), 40 deletions(-)

--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ To run SETools command line tools, the f
 * NetworkX 2.0+ (2.6+ for Python 3.9+)
 * setuptools
 * libselinux
-* libsepol 3.2+
+* libsepol 3.0+
 
 To run SETools graphical tools, the following packages are also required:
 * PyQt5
--- a/setools/policyrep/sepol.pxd
+++ b/setools/policyrep/sepol.pxd
@@ -530,22 +530,21 @@ cdef extern from "<sepol/policydb/policy
     ctypedef cond_bool_datum cond_bool_datum_t
 
     #
-    # filename_trans_key_t
+    # filename_trans_t
     #
-    cdef struct filename_trans_key:
+    cdef struct filename_trans:
+        uint32_t stype
         uint32_t ttype
         uint32_t tclass
         char *name
 
-    ctypedef filename_trans_key filename_trans_key_t
+    ctypedef filename_trans filename_trans_t
 
     #
     # filename_trans_datum_t
     #
     cdef struct filename_trans_datum:
-        ebitmap_t stypes
         uint32_t otype
-        filename_trans_datum *next
 
     ctypedef filename_trans_datum filename_trans_datum_t
 
--- a/setools/policyrep/terule.pxi
+++ b/setools/policyrep/terule.pxi
@@ -456,18 +456,17 @@ cdef class FileNameTERule(BaseTERule):
         readonly str filename
 
     @staticmethod
-    cdef inline FileNameTERule factory(SELinuxPolicy policy,
-                                       sepol.filename_trans_key_t *key,
-                                       Type stype, size_t otype):
+    cdef inline FileNameTERule factory(SELinuxPolicy policy, sepol.filename_trans_t *key,
+                                       sepol.filename_trans_datum_t *datum):
         """Factory function for creating FileNameTERule objects."""
         cdef FileNameTERule r = FileNameTERule.__new__(FileNameTERule)
         r.policy = policy
         r.key = <uintptr_t>key
         r.ruletype = TERuletype.type_transition
-        r.source = stype
+        r.source = type_or_attr_factory(policy, policy.type_value_to_datum(key.stype - 1))
         r.target = type_or_attr_factory(policy, policy.type_value_to_datum(key.ttype - 1))
         r.tclass = ObjClass.factory(policy, policy.class_value_to_datum(key.tclass - 1))
-        r.dft = Type.factory(policy, policy.type_value_to_datum(otype - 1))
+        r.dft = Type.factory(policy, policy.type_value_to_datum(datum.otype - 1))
         r.filename = intern(key.name)
         r.origin = None
         return r
@@ -695,10 +694,6 @@ cdef class FileNameTERuleIterator(Hashta
 
     """Iterate over FileNameTERules in the policy."""
 
-    cdef:
-        sepol.filename_trans_datum_t *datum
-        TypeEbitmapIterator stypei
-
     @staticmethod
     cdef factory(SELinuxPolicy policy, sepol.hashtab_t *table):
         """Factory function for creating FileNameTERule iterators."""
@@ -708,29 +703,7 @@ cdef class FileNameTERuleIterator(Hashta
         i.reset()
         return i
 
-    def _next_stype(self):
-        while True:
-            if self.datum == NULL:
-                super().__next__()
-                self.datum = <sepol.filename_trans_datum_t *>self.curr.datum
-                self.stypei = TypeEbitmapIterator.factory(self.policy, &self.datum.stypes)
-            try:
-                return next(self.stypei)
-            except StopIteration:
-                pass
-            self.datum = self.datum.next
-            if self.datum != NULL:
-                self.stypei = TypeEbitmapIterator.factory(self.policy, &self.datum.stypes)
-
     def __next__(self):
-        stype = self._next_stype()
-        return FileNameTERule.factory(self.policy,
-                                      <sepol.filename_trans_key_t *>self.curr.key,
-                                      stype, self.datum.otype)
-
-    def __len__(self):
-        return sum(1 for r in FileNameTERuleIterator.factory(self.policy, self.table))
-
-    def reset(self):
-        super().reset()
-        self.datum = NULL
+        super().__next__()
+        return FileNameTERule.factory(self.policy, <sepol.filename_trans_t *>self.curr.key,
+                                      <sepol.filename_trans_datum_t *>self.curr.datum)

Places

File use-older-libsepol.patch of Package setools (Revision 239a7f1427782ed714ad2eaa15873243)

Places