|
@@ -15,22 +15,22 @@ sedta and seinfoflow to require python3-networkx
|
|
|
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
|
|
[Refreshed for 4.3.0]
|
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
|
-[Refreshed for 4.4.0]
|
|
|
+[Refreshed for 4.4.2]
|
|
|
---
|
|
|
sedta | 3 ++-
|
|
|
seinfoflow | 5 +++--
|
|
|
setools/__init__.py | 4 ++--
|
|
|
setoolsgui/apol/dta.py | 2 +-
|
|
|
setoolsgui/apol/infoflow.py | 2 +-
|
|
|
- tests/dta.py | 2 +-
|
|
|
- tests/infoflow.py | 2 +-
|
|
|
+ tests/test_dta.py | 2 +-
|
|
|
+ tests/test_infoflow.py | 2 +-
|
|
|
7 files changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
|
|
diff --git a/sedta b/sedta
|
|
|
-index 60861ca630a5..0056172a55e5 100755
|
|
|
+index ffd9ede..4c53825 100755
|
|
|
--- a/sedta
|
|
|
+++ b/sedta
|
|
|
-@@ -23,6 +23,7 @@ import logging
|
|
|
+@@ -10,6 +10,7 @@ import logging
|
|
|
import signal
|
|
|
|
|
|
import setools
|
|
@@ -38,7 +38,7 @@ index 60861ca630a5..0056172a55e5 100755
|
|
|
|
|
|
|
|
|
def print_transition(trans: setools.DomainTransition) -> None:
|
|
|
-@@ -114,7 +115,7 @@ else:
|
|
|
+@@ -104,7 +105,7 @@ else:
|
|
|
|
|
|
try:
|
|
|
p = setools.SELinuxPolicy(args.policy)
|
|
@@ -48,10 +48,10 @@ index 60861ca630a5..0056172a55e5 100755
|
|
|
if args.shortest_path or args.all_paths:
|
|
|
if args.shortest_path:
|
|
|
diff --git a/seinfoflow b/seinfoflow
|
|
|
-index f10c39de4d8e..fe733bbd0787 100755
|
|
|
+index 5f4e764..a27b781 100755
|
|
|
--- a/seinfoflow
|
|
|
+++ b/seinfoflow
|
|
|
-@@ -18,6 +18,7 @@
|
|
|
+@@ -5,6 +5,7 @@
|
|
|
#
|
|
|
|
|
|
import setools
|
|
@@ -59,7 +59,7 @@ index f10c39de4d8e..fe733bbd0787 100755
|
|
|
import argparse
|
|
|
import sys
|
|
|
import logging
|
|
|
-@@ -102,8 +103,8 @@ elif args.booleans is not None:
|
|
|
+@@ -91,8 +92,8 @@ elif args.booleans is not None:
|
|
|
try:
|
|
|
p = setools.SELinuxPolicy(args.policy)
|
|
|
m = setools.PermissionMap(args.map)
|
|
@@ -71,10 +71,10 @@ index f10c39de4d8e..fe733bbd0787 100755
|
|
|
if args.shortest_path or args.all_paths:
|
|
|
if args.shortest_path:
|
|
|
diff --git a/setools/__init__.py b/setools/__init__.py
|
|
|
-index d72d343..4d5aaaa 100644
|
|
|
+index ad9b36a..2bde01b 100644
|
|
|
--- a/setools/__init__.py
|
|
|
+++ b/setools/__init__.py
|
|
|
-@@ -91,11 +91,11 @@ from .pcideviceconquery import PcideviceconQuery
|
|
|
+@@ -77,11 +77,11 @@ from .pcideviceconquery import PcideviceconQuery
|
|
|
from .devicetreeconquery import DevicetreeconQuery
|
|
|
|
|
|
# Information Flow Analysis
|
|
@@ -89,10 +89,10 @@ index d72d343..4d5aaaa 100644
|
|
|
# Policy difference
|
|
|
from .diff import PolicyDifference
|
|
|
diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py
|
|
|
-index 4608b9dbf34e..2cde44c142e9 100644
|
|
|
+index a78d960..e71c70a 100644
|
|
|
--- a/setoolsgui/apol/dta.py
|
|
|
+++ b/setoolsgui/apol/dta.py
|
|
|
-@@ -24,7 +24,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
|
|
|
+@@ -11,7 +11,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
|
|
|
from PyQt5.QtGui import QPalette, QTextCursor
|
|
|
from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
|
|
|
QTreeWidgetItem
|
|
@@ -102,10 +102,10 @@ index 4608b9dbf34e..2cde44c142e9 100644
|
|
|
from ..logtosignal import LogHandlerToSignal
|
|
|
from .analysistab import AnalysisSection, AnalysisTab
|
|
|
diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
|
|
|
-index 7bca299d23fc..7fee2778f35f 100644
|
|
|
+index fb9b409..738f1b8 100644
|
|
|
--- a/setoolsgui/apol/infoflow.py
|
|
|
+++ b/setoolsgui/apol/infoflow.py
|
|
|
-@@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
|
|
|
+@@ -13,7 +13,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
|
|
|
from PyQt5.QtGui import QPalette, QTextCursor
|
|
|
from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
|
|
|
QTreeWidgetItem
|
|
@@ -114,11 +114,11 @@ index 7bca299d23fc..7fee2778f35f 100644
|
|
|
from setools.exception import UnmappedClass, UnmappedPermission
|
|
|
|
|
|
from ..logtosignal import LogHandlerToSignal
|
|
|
-diff --git a/tests/dta.py b/tests/dta.py
|
|
|
-index a0cc9381469c..177e6fb0b961 100644
|
|
|
---- a/tests/dta.py
|
|
|
-+++ b/tests/dta.py
|
|
|
-@@ -18,7 +18,7 @@
|
|
|
+diff --git a/tests/test_dta.py b/tests/test_dta.py
|
|
|
+index 7f9bbc9..48338c5 100644
|
|
|
+--- a/tests/test_dta.py
|
|
|
++++ b/tests/test_dta.py
|
|
|
+@@ -5,7 +5,7 @@
|
|
|
import os
|
|
|
import unittest
|
|
|
|
|
@@ -127,11 +127,11 @@ index a0cc9381469c..177e6fb0b961 100644
|
|
|
from setools import TERuletype as TERT
|
|
|
from setools.exception import InvalidType
|
|
|
from setools.policyrep import Type
|
|
|
-diff --git a/tests/infoflow.py b/tests/infoflow.py
|
|
|
-index aa0e44a7e4f8..fca2848aeca5 100644
|
|
|
---- a/tests/infoflow.py
|
|
|
-+++ b/tests/infoflow.py
|
|
|
-@@ -18,7 +18,7 @@
|
|
|
+diff --git a/tests/test_infoflow.py b/tests/test_infoflow.py
|
|
|
+index 5a8f745..e25993b 100644
|
|
|
+--- a/tests/test_infoflow.py
|
|
|
++++ b/tests/test_infoflow.py
|
|
|
+@@ -5,7 +5,7 @@
|
|
|
import os
|
|
|
import unittest
|
|
|
|