setools-4.2.0-0.3.rc

- Changes since v4.2.0-beta:
-- Fixed performance regressions
-- Made further memory usage improvements
-- Fixed build issues with clean target and runtime_library_dirs
-- Revised package structure to make policyrep a module of the setools
   package
-- Symbol names are now available as the name attribute
   (e.g. Boolean.name, Type.name, etc.)
-- Fixed some apol layouts to increase the size of text fields
-- Move constraint expression to its own class
-- Made Conditional.evaluate() more useful and added
   BaseTERule.enabled() method to determine if a rule is enabled

- Rebase patches

.gitignore

@@ -4,3 +4,4 @@ setools-3.3.8-f1e5b20.tar.bz2
 /4.1.0.tar.gz
 /4.1.1.tar.gz
 /4.2.0-beta.tar.gz
+/4.2.0-rc.tar.gz

0001-Do-not-use-Werror-during-build.patch

@@ -1,6 +1,6 @@
-From 42e691b12c03aac388e39071f4b8d76cbc40e5c5 Mon Sep 17 00:00:00 2001
+From 8ef1a20824c2055cc16b66b56018a95e30b9a73c Mon Sep 17 00:00:00 2001
 From: Vit Mojzis <vmojzis@redhat.com>
-Date: Fri, 29 Jun 2018 10:34:14 +0200
+Date: Mon, 1 Oct 2018 15:50:09 +0200
 Subject: [PATCH 1/2] Do not use -Werror during build
 
 There are new warnings when setools are built with gcc 7 therefore we
@@ -10,12 +10,12 @@ want to suppress -Werror for now
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index aa4f14b..e4da575 100644
+index 0530d59..027d315 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -62,7 +62,7 @@ ext_py_mods = [Extension('setools.policyrep.libpolicyrep', ['setools/policyrep/l
+@@ -105,7 +105,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'],
+                          libraries=['selinux', 'sepol'],
                           library_dirs=lib_dirs,
-                          runtime_library_dirs=lib_dirs,
                           define_macros=macros,
 -                         extra_compile_args=['-Werror', '-Wextra',
 +                         extra_compile_args=['-Wextra',
@@ -23,5 +23,5 @@ index aa4f14b..e4da575 100644
                                               '-Wfloat-equal',
                                               '-Wformat', '-Wformat=2',
 -- 
-2.14.3
+2.17.1
 

0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch

@@ -1,6 +1,6 @@
-From 39a28c23990f667ef1dc50c3fe6d0ca79a7e793d Mon Sep 17 00:00:00 2001
+From 7a38c92583b5b6d6b14b43ba9b8c56d4e04b0b82 Mon Sep 17 00:00:00 2001
 From: Vit Mojzis <vmojzis@redhat.com>
-Date: Fri, 29 Jun 2018 10:31:18 +0200
+Date: Mon, 1 Oct 2018 17:16:28 +0200
 Subject: [PATCH 2/2] Do not export/use setools.InfoFlowAnalysis and
  setools.DomainTransitionAnalysis
 
@@ -13,16 +13,16 @@ setools.dta.DomainTransitionAnalysis and let the package containing
 sedta and seinfoflow to require python3-networkx
 ---
  sedta                       | 4 ++--
- seinfoflow                  | 3 ++-
+ seinfoflow                  | 4 ++--
  setools/__init__.py         | 4 ++--
  setoolsgui/apol/dta.py      | 2 +-
  setoolsgui/apol/infoflow.py | 2 +-
  tests/dta.py                | 2 +-
  tests/infoflow.py           | 2 +-
- 7 files changed, 10 insertions(+), 9 deletions(-)
+ 7 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/sedta b/sedta
-index 84820b0..8c380ab 100755
+index 10cf43a..b75b4e1 100755
 --- a/sedta
 +++ b/sedta
 @@ -21,7 +21,7 @@ import sys
@@ -34,7 +34,7 @@ index 84820b0..8c380ab 100755
  
  
  def print_transition(trans):
-@@ -110,7 +110,7 @@ else:
+@@ -111,7 +111,7 @@ else:
  
  try:
      p = setools.SELinuxPolicy(args.policy)
@@ -44,18 +44,19 @@ index 84820b0..8c380ab 100755
      if args.shortest_path or args.all_paths:
          if args.shortest_path:
 diff --git a/seinfoflow b/seinfoflow
-index 3ec05ca..89764fe 100755
+index 3ec05ca..32a9a3e 100755
 --- a/seinfoflow
 +++ b/seinfoflow
-@@ -18,6 +18,7 @@
+@@ -17,7 +17,7 @@
+ # along with SETools.  If not, see <http://www.gnu.org/licenses/>.
  #
  
- import setools
+-import setools
 +import setools.infoflow
  import argparse
  import sys
  import logging
-@@ -78,7 +79,7 @@ else:
+@@ -78,7 +78,7 @@ else:
  try:
      p = setools.SELinuxPolicy(args.policy)
      m = setools.PermissionMap(args.map)
@@ -65,51 +66,51 @@ index 3ec05ca..89764fe 100755
      if args.shortest_path or args.all_paths:
          if args.shortest_path:
 diff --git a/setools/__init__.py b/setools/__init__.py
-index a84c846..cbb2a00 100644
+index 7b70f5e..020be31 100644
 --- a/setools/__init__.py
 +++ b/setools/__init__.py
-@@ -74,11 +74,11 @@ from .pcideviceconquery import PcideviceconQuery
+@@ -73,11 +73,11 @@ from .pcideviceconquery import PcideviceconQuery
  from .devicetreeconquery import DevicetreeconQuery
  
  # Information Flow Analysis
 -from .infoflow import InfoFlowAnalysis
-+#from .infoflow import InfoFlowAnalysis
++# from .infoflow import InfoFlowAnalysis
  from .permmap import PermissionMap
  
  # Domain Transition Analysis
 -from .dta import DomainTransitionAnalysis
-+#from .dta import DomainTransitionAnalysis
++# from .dta import DomainTransitionAnalysis
  
  # Policy difference
  from .diff import PolicyDifference
 diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py
-index 0aaf13f..5b1ea20 100644
+index 4608b9d..2cde44c 100644
 --- a/setoolsgui/apol/dta.py
 +++ b/setoolsgui/apol/dta.py
 @@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
  from PyQt5.QtGui import QPalette, QTextCursor
  from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
-                             QTreeWidgetItem
+     QTreeWidgetItem
 -from setools import DomainTransitionAnalysis
 +from setools.dta import DomainTransitionAnalysis
  
  from ..logtosignal import LogHandlerToSignal
  from .analysistab import AnalysisTab
 diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
-index b272a99..7b05945 100644
+index 7bca299..7fee277 100644
 --- a/setoolsgui/apol/infoflow.py
 +++ b/setoolsgui/apol/infoflow.py
 @@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
  from PyQt5.QtGui import QPalette, QTextCursor
  from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
-                             QTreeWidgetItem
+     QTreeWidgetItem
 -from setools import InfoFlowAnalysis
 +from setools.infoflow import InfoFlowAnalysis
  from setools.exception import UnmappedClass, UnmappedPermission
  
  from ..logtosignal import LogHandlerToSignal
 diff --git a/tests/dta.py b/tests/dta.py
-index be04ae4..de4f337 100644
+index a0cc938..177e6fb 100644
 --- a/tests/dta.py
 +++ b/tests/dta.py
 @@ -18,7 +18,7 @@
@@ -119,10 +120,10 @@ index be04ae4..de4f337 100644
 -from setools import DomainTransitionAnalysis
 +from setools.dta import DomainTransitionAnalysis
  from setools import TERuletype as TERT
- from setools.policyrep.exception import InvalidType
- from setools.policyrep.libpolicyrep import Type
+ from setools.exception import InvalidType
+ from setools.policyrep import Type
 diff --git a/tests/infoflow.py b/tests/infoflow.py
-index 87bb1b0..dc1e7b9 100644
+index aa0e44a..fca2848 100644
 --- a/tests/infoflow.py
 +++ b/tests/infoflow.py
 @@ -18,7 +18,7 @@
@@ -132,8 +133,8 @@ index 87bb1b0..dc1e7b9 100644
 -from setools import InfoFlowAnalysis
 +from setools.infoflow import InfoFlowAnalysis
  from setools import TERuletype as TERT
+ from setools.exception import InvalidType
  from setools.permmap import PermissionMap
- from setools.policyrep.exception import InvalidType
 -- 
-2.14.3
+2.17.1
 

setools.spec

@@ -1,4 +1,4 @@
-%global setools_pre_ver beta
+%global setools_pre_ver rc
 # % global gitver f1e5b20
 
 %global sepol_ver 2.8-1
@@ -6,7 +6,7 @@
 
 Name:           setools
 Version:        4.2.0
-Release:        0.2%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
+Release:        0.3%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
 Summary:        Policy analysis tools for SELinux
 
 License:        GPLv2
@@ -142,6 +142,9 @@ rm -rf %{buildroot}%{_bindir}
 %{_mandir}/man1/apol*
 
 %changelog
+* Mon Oct 01 2018 Vit Mojzis <vmojzis@redhat.com> - 4.2.0-0.3.rc
+- Update upstream source to 4.2.0-rc
+
 * Wed Sep 19 2018 Vit Mojzis <vmojzis@redhat.com> - 4.2.0-0.2.beta
 - Require userspace release 2.8
 - setools-gui requires python3-setools

sources

@@ -1 +1 @@
-SHA512 (4.2.0-beta.tar.gz) = 97d27d16d0aa0c6346e42eb0948114c52e1d25f29a33827c3f4663311e134bd4195eb54b38e4b5fe99b3f6a28a7aa2c90043ebab16c1e0407f4663133cc815b8
+SHA512 (4.2.0-rc.tar.gz) = 0bd0921d945b96b6126a0e7bbb9497881a12784fea54573c0a87655979f25c14406406bede55ccbcfce54c256f55a764c11424167dced8aa76b0d3892aaec20f