setools-4.2.0-0.1.beta
- New upstream release
-- Replaced the Python/SWIG/static-linked-libsepol policyrep module with
a Cython implementation. This will have performance and memory-usage
improvements and breaks the static linking to libsepol.
-- Significant memory usage reduction in sediff (approximately 60%,
depending on the policies).
-- Added support for SCTP portcons
-- Updated permission maps
-- Support for Python 2.7 was dropped
- Drop python2 subpackage (4.2.0 no longer supports python2)
This commit is contained in:
Vit Mojzis
parent
950d0d171f
commit
b2c4c6ff83
|
|
@ -1,49 +1,27 @@
|
|||
From 617c3ae83c1c72ead627a57e1529724c62df807f Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 23 Feb 2017 08:17:07 +0100
|
||||
From 42e691b12c03aac388e39071f4b8d76cbc40e5c5 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Fri, 29 Jun 2018 10:34:14 +0200
|
||||
Subject: [PATCH 1/2] Do not use -Werror during build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
There are new warnings when setools are built with gcc 7 therefore we
|
||||
want to suppress -Werror for now
|
||||
|
||||
Fixes:
|
||||
libqpol/policy_extend.c: In function ‘policy_extend’:
|
||||
libqpol/policy_extend.c:161:27: error: ‘%04zd’ directive output may be truncated writing between 4 and 10 bytes into a region of size 5 [-Werror=format-truncation=]
|
||||
snprintf(buff, 9, "@ttr%04zd", i + 1);
|
||||
^~~~~
|
||||
libqpol/policy_extend.c:161:22: note: directive argument in the range [1, 4294967295]
|
||||
snprintf(buff, 9, "@ttr%04zd", i + 1);
|
||||
^~~~~~~~~~~
|
||||
In file included from /usr/include/stdio.h:939:0,
|
||||
from /usr/include/sepol/policydb/policydb.h:53,
|
||||
from libqpol/policy_extend.c:29:
|
||||
/usr/include/bits/stdio2.h:64:10: note: ‘__builtin___snprintf_chk’ output between 9 and 15 bytes into a destination of size 9
|
||||
return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
__bos (__s), __fmt, __va_arg_pack ());
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
error: command 'gcc' failed with exit status 1
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 2ca44c9..9319bf6 100644
|
||||
index aa4f14b..e4da575 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -146,7 +146,7 @@ ext_py_mods = [Extension('setools.policyrep._qpol',
|
||||
'libqpol/policy_scan.c',
|
||||
'libqpol/xen_query.c'],
|
||||
include_dirs=include_dirs,
|
||||
@@ -62,7 +62,7 @@ ext_py_mods = [Extension('setools.policyrep.libpolicyrep', ['setools/policyrep/l
|
||||
library_dirs=lib_dirs,
|
||||
runtime_library_dirs=lib_dirs,
|
||||
define_macros=macros,
|
||||
- extra_compile_args=['-Werror', '-Wextra',
|
||||
+ extra_compile_args=['-Wextra',
|
||||
'-Waggregate-return',
|
||||
'-Wfloat-equal',
|
||||
'-Wformat', '-Wformat=2',
|
||||
--
|
||||
2.9.3
|
||||
2.14.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 2512c3ba608077db3a5e0286b976fadc8a04a5c4 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 23 Feb 2017 08:17:07 +0100
|
||||
From 39a28c23990f667ef1dc50c3fe6d0ca79a7e793d Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Fri, 29 Jun 2018 10:31:18 +0200
|
||||
Subject: [PATCH 2/2] Do not export/use setools.InfoFlowAnalysis and
|
||||
setools.DomainTransitionAnalysis
|
||||
|
||||
|
|
@ -12,28 +12,29 @@ Therefore it's better to use setools.infoflow.InfoFlowAnalysis and
|
|||
setools.dta.DomainTransitionAnalysis and let the package containing
|
||||
sedta and seinfoflow to require python3-networkx
|
||||
---
|
||||
sedta | 3 ++-
|
||||
sedta | 4 ++--
|
||||
seinfoflow | 3 ++-
|
||||
setools/__init__.py | 4 ++--
|
||||
setoolsgui/apol/dta.py | 2 +-
|
||||
setoolsgui/apol/infoflow.py | 2 +-
|
||||
tests/dta.py | 3 ++-
|
||||
tests/infoflow.py | 3 ++-
|
||||
7 files changed, 12 insertions(+), 8 deletions(-)
|
||||
tests/dta.py | 2 +-
|
||||
tests/infoflow.py | 2 +-
|
||||
7 files changed, 10 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/sedta b/sedta
|
||||
index 1c76ebb..255ad49 100755
|
||||
index 84820b0..8c380ab 100755
|
||||
--- a/sedta
|
||||
+++ b/sedta
|
||||
@@ -23,6 +23,7 @@ import argparse
|
||||
@@ -21,7 +21,7 @@ import sys
|
||||
import argparse
|
||||
import logging
|
||||
|
||||
import setools
|
||||
-import setools
|
||||
+import setools.dta
|
||||
|
||||
|
||||
def print_transition(trans):
|
||||
@@ -111,7 +112,7 @@ else:
|
||||
@@ -110,7 +110,7 @@ else:
|
||||
|
||||
try:
|
||||
p = setools.SELinuxPolicy(args.policy)
|
||||
|
|
@ -43,18 +44,18 @@ index 1c76ebb..255ad49 100755
|
|||
if args.shortest_path or args.all_paths:
|
||||
if args.shortest_path:
|
||||
diff --git a/seinfoflow b/seinfoflow
|
||||
index b287921..d53bdef 100755
|
||||
index 3ec05ca..89764fe 100755
|
||||
--- a/seinfoflow
|
||||
+++ b/seinfoflow
|
||||
@@ -19,6 +19,7 @@
|
||||
@@ -18,6 +18,7 @@
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import setools
|
||||
+import setools.infoflow
|
||||
import argparse
|
||||
import sys
|
||||
import logging
|
||||
@@ -79,7 +80,7 @@ else:
|
||||
@@ -78,7 +79,7 @@ else:
|
||||
try:
|
||||
p = setools.SELinuxPolicy(args.policy)
|
||||
m = setools.PermissionMap(args.map)
|
||||
|
|
@ -64,7 +65,7 @@ index b287921..d53bdef 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..a53c5a7 100644
|
||||
index a84c846..cbb2a00 100644
|
||||
--- a/setools/__init__.py
|
||||
+++ b/setools/__init__.py
|
||||
@@ -74,11 +74,11 @@ from .pcideviceconquery import PcideviceconQuery
|
||||
|
|
@ -72,12 +73,12 @@ index a84c846..a53c5a7 100644
|
|||
|
||||
# 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
|
||||
|
|
@ -95,10 +96,10 @@ index 0aaf13f..5b1ea20 100644
|
|||
from ..logtosignal import LogHandlerToSignal
|
||||
from .analysistab import AnalysisTab
|
||||
diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
|
||||
index 1ae16de..fdf8f7b 100644
|
||||
index b272a99..7b05945 100644
|
||||
--- a/setoolsgui/apol/infoflow.py
|
||||
+++ b/setoolsgui/apol/infoflow.py
|
||||
@@ -25,7 +25,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
|
||||
@@ -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
|
||||
|
|
@ -108,33 +109,31 @@ index 1ae16de..fdf8f7b 100644
|
|||
|
||||
from ..logtosignal import LogHandlerToSignal
|
||||
diff --git a/tests/dta.py b/tests/dta.py
|
||||
index 32b9271..2bdd052 100644
|
||||
index be04ae4..de4f337 100644
|
||||
--- a/tests/dta.py
|
||||
+++ b/tests/dta.py
|
||||
@@ -17,7 +17,8 @@
|
||||
#
|
||||
@@ -18,7 +18,7 @@
|
||||
import os
|
||||
import unittest
|
||||
|
||||
-from setools import SELinuxPolicy, DomainTransitionAnalysis
|
||||
+from setools import SELinuxPolicy
|
||||
-from setools import DomainTransitionAnalysis
|
||||
+from setools.dta import DomainTransitionAnalysis
|
||||
from setools import TERuletype as TERT
|
||||
from setools.policyrep.exception import InvalidType
|
||||
from setools.policyrep.typeattr import Type
|
||||
from setools.policyrep.libpolicyrep import Type
|
||||
diff --git a/tests/infoflow.py b/tests/infoflow.py
|
||||
index 7751dda..a21c683 100644
|
||||
index 87bb1b0..dc1e7b9 100644
|
||||
--- a/tests/infoflow.py
|
||||
+++ b/tests/infoflow.py
|
||||
@@ -17,7 +17,8 @@
|
||||
#
|
||||
@@ -18,7 +18,7 @@
|
||||
import os
|
||||
import unittest
|
||||
|
||||
-from setools import SELinuxPolicy, InfoFlowAnalysis
|
||||
+from setools import SELinuxPolicy
|
||||
-from setools import InfoFlowAnalysis
|
||||
+from setools.infoflow import InfoFlowAnalysis
|
||||
from setools import TERuletype as TERT
|
||||
from setools.permmap import PermissionMap
|
||||
from setools.policyrep.exception import InvalidType
|
||||
--
|
||||
2.9.3
|
||||
2.14.3
|
||||
|
||||
|
|
|
|||
61
setools.spec
61
setools.spec
|
|
@ -1,28 +1,21 @@
|
|||
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
|
||||
%{!?__python2: %global __python2 %__python}
|
||||
%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
|
||||
# % global setools_pre_ver beta.1.8e09d95
|
||||
%global setools_pre_ver beta
|
||||
# % global gitver f1e5b20
|
||||
|
||||
%global sepol_ver 2.7-1
|
||||
%global selinux_ver 2.7-1
|
||||
|
||||
Name: setools
|
||||
Version: 4.1.1
|
||||
Release: 11%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
|
||||
Version: 4.2.0
|
||||
Release: 0.1%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
|
||||
Summary: Policy analysis tools for SELinux
|
||||
|
||||
License: GPLv2
|
||||
URL: https://github.com/TresysTechnology/setools/wiki
|
||||
Source0: https://github.com/TresysTechnology/setools/archive/%{version}%{?setools_pre_ver:-%{setools_pre_ver}}.tar.gz
|
||||
URL: https://github.com/SELinuxProject/setools/wiki
|
||||
Source0: https://github.com/SELinuxProject/setools/archive/%{version}%{?setools_pre_ver:-%{setools_pre_ver}}.tar.gz
|
||||
Source1: setools.pam
|
||||
Source2: apol.desktop
|
||||
Patch1: 0001-Do-not-use-Werror-during-build.patch
|
||||
Patch2: 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
|
||||
Patch3: 0003-bswap_-macros-are-defined-in-byteswap.h.patch
|
||||
Patch4: 0004-Add-support-for-SCTP-protocol.patch
|
||||
|
||||
Obsoletes: setools < 4.0.0, setools-devel < 4.0.0
|
||||
BuildRequires: flex, bison
|
||||
|
|
@ -30,10 +23,10 @@ BuildRequires: glibc-devel, gcc, git
|
|||
BuildRequires: libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver}
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python3-Cython
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: libselinux-devel
|
||||
|
||||
# BuildArch:
|
||||
Requires: python3-%{name} = %{version}-%{release}
|
||||
|
|
@ -76,25 +69,10 @@ This package includes the following console tools:
|
|||
seinfoflow Perform information flow analyses.
|
||||
|
||||
|
||||
%package -n python2-setools
|
||||
Summary: Policy analysis tools for SELinux
|
||||
Recommends: python2-libselinux
|
||||
%{?python_provide:%python_provide python2-setools}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
Requires: python2-enum34
|
||||
|
||||
%description -n python2-setools
|
||||
SETools is a collection of graphical tools, command-line tools, and
|
||||
Python 2 modules designed to facilitate SELinux policy analysis.
|
||||
|
||||
%package -n python3-setools
|
||||
Summary: Policy analysis tools for SELinux
|
||||
Obsoletes: setools-libs < 4.0.0
|
||||
Recommends: libselinux-python3
|
||||
%{?python_provide:%python_provide python2-setools}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python3 = %{version}-%{release}
|
||||
Provides: %{name}-python3%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -116,37 +94,22 @@ Python modules designed to facilitate SELinux policy analysis.
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p 1 -S git
|
||||
|
||||
cp -a ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}} ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}-python2
|
||||
%autosetup -p 1 -S git -n setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}
|
||||
|
||||
|
||||
%build
|
||||
# Remove CFLAGS=... for noarch packages (unneeded)
|
||||
CFLAGS="%{optflags}" %{__python3} setup.py build
|
||||
|
||||
pushd ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}-python2
|
||||
# Remove CFLAGS=... for noarch packages (unneeded)
|
||||
CFLAGS="%{optflags}" %{__python2} setup.py build
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
pushd ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}-python2
|
||||
%{__python2} setup.py install --root %{buildroot}
|
||||
popd
|
||||
|
||||
rm -rf %{buildroot}%{_bindir}
|
||||
%{__python3} setup.py install --root %{buildroot}
|
||||
|
||||
%check
|
||||
%if %{?_with_check:1}%{!?_with_check:0}
|
||||
%{__python3} setup.py test
|
||||
|
||||
pushd ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}-python2
|
||||
%{__python2} setup.py test
|
||||
popd
|
||||
%endif
|
||||
|
||||
|
||||
|
|
@ -166,10 +129,6 @@ popd
|
|||
%{_mandir}/man1/sedta*
|
||||
%{_mandir}/man1/seinfoflow*
|
||||
|
||||
%files -n python2-setools
|
||||
%license COPYING COPYING.GPL COPYING.LGPL
|
||||
%{python2_sitearch}/*
|
||||
|
||||
%files -n python3-setools
|
||||
%license COPYING COPYING.GPL COPYING.LGPL
|
||||
%{python3_sitearch}/setools
|
||||
|
|
@ -181,6 +140,10 @@ popd
|
|||
%{_mandir}/man1/apol*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 Vit Mojzis <vmojzis@redhat.com> - 4.2.0-0.1.beta
|
||||
- New upstream release
|
||||
- Drop python2 subpackage (4.2.0 no longer supports python2)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
1
sources
1
sources
|
|
@ -1 +1,2 @@
|
|||
SHA512 (4.1.1.tar.gz) = 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
|
||||
SHA512 (4.2.0-beta.tar.gz) = 97d27d16d0aa0c6346e42eb0948114c52e1d25f29a33827c3f4663311e134bd4195eb54b38e4b5fe99b3f6a28a7aa2c90043ebab16c1e0407f4663133cc815b8
|
||||
|
|
|
|||
Loading…
Reference in New Issue