Compare commits

...

5 Commits

Author SHA1 Message Date
Vit Mojzis 522fb13c60 setools-4.2.0-1
- Changes since 4.2.0-rc
-- Restored missing statement() methods in some policyrep classes
-- Fixed NULL pointer dereference when iterating over type attributes when the policy has none
-- Added xdp_socket permission mapping
2018-11-14 17:12:12 +01:00
Vit Mojzis c6b3f2cce1 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
2018-10-02 09:22:55 +02:00
Vit Mojzis 56e46874bd Remove old tar from sources 2018-09-25 18:12:41 +02:00
Vit Mojzis bb7caed6f5 setools-4.2.0-0.2.beta
- Require userspace release 2.8
- setools-gui requires python3-setools
- Add Requires for python[23]-setuptools - no longer required (just recommended) by python[23] (#1623371)
2018-09-19 10:39:26 +02:00
Vit Mojzis b2c4c6ff83 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)
2018-08-10 10:34:03 +02:00
8 changed files with 98 additions and 300 deletions

3
.gitignore vendored
View File

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

View File

@ -1,49 +0,0 @@
From 617c3ae83c1c72ead627a57e1529724c62df807f Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Thu, 23 Feb 2017 08:17:07 +0100
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
--- 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,
- extra_compile_args=['-Werror', '-Wextra',
+ extra_compile_args=['-Wextra',
'-Waggregate-return',
'-Wfloat-equal',
'-Wformat', '-Wformat=2',
--
2.9.3

View File

@ -1,26 +0,0 @@
From 2ac588919dd96d3d624e6ec20c67d1d91386e879 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Thu, 10 Aug 2017 08:23:47 +0200
Subject: [PATCH] bswap_* macros are defined in byteswap.h
Fixes ImportError on s390x:
/usr/lib64/python3.6/site-packages/setools/policyrep/_qpol.cpython-36m-s390x-linux-gnu.so: undefined symbol: bswap_32
---
libqpol/policy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libqpol/policy.c b/libqpol/policy.c
index ae3acb5..e412be0 100644
--- a/libqpol/policy.c
+++ b/libqpol/policy.c
@@ -28,6 +28,7 @@
#include "qpol_internal.h"
#include <assert.h>
+#include <byteswap.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
--
2.13.3

View File

@ -1,131 +0,0 @@
From 3ef6369a22691e8e11cbf63f37b114941b3577a1 Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
Date: Mon, 16 Apr 2018 20:46:20 +0200
Subject: [PATCH] Add support for SCTP protocol
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1568333
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
---
libqpol/include/qpol/linux_types.h | 1 +
libqpol/policy_define.c | 5 +++++
setools/perm_map | 30 ++++++++++++++++++++++++++++++
setools/policyrep/netcontext.py | 5 +++++
4 files changed, 41 insertions(+)
diff --git a/libqpol/include/qpol/linux_types.h b/libqpol/include/qpol/linux_types.h
index c3c056b..0985162 100644
--- a/libqpol/include/qpol/linux_types.h
+++ b/libqpol/include/qpol/linux_types.h
@@ -12,6 +12,7 @@ typedef uint16_t __u16;
#define s6_addr32 __u6_addr32
#define IPPROTO_DCCP 33
+#define IPPROTO_SCTP 132
#endif
#endif
diff --git a/libqpol/policy_define.c b/libqpol/policy_define.c
index dcc69fc..1e623a3 100644
--- a/libqpol/policy_define.c
+++ b/libqpol/policy_define.c
@@ -44,6 +44,9 @@
#ifndef IPPROTO_DCCP
#define IPPROTO_DCCP 33
#endif
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
#include <arpa/inet.h>
#include <stdlib.h>
#include <limits.h>
@@ -4933,6 +4936,8 @@ int define_port_context(unsigned int low, unsigned int high)
protocol = IPPROTO_UDP;
} else if ((strcmp(id, "dccp") == 0) || (strcmp(id, "DCCP") == 0)) {
protocol = IPPROTO_DCCP;
+ } else if ((strcmp(id, "sctp") == 0) || (strcmp(id, "SCTP") == 0)) {
+ protocol = IPPROTO_SCTP;
} else {
yyerror2("unrecognized protocol %s", id);
goto bad;
diff --git a/setools/perm_map b/setools/perm_map
index 0a9f91c..25fae09 100644
--- a/setools/perm_map
+++ b/setools/perm_map
@@ -385,6 +385,8 @@ class node 11
udp_send w 10
dccp_recv r 10
dccp_send w 10
+ sctp_recv r 10
+ sctp_send w 10
enforce_dest n 1
sendto w 10
recvfrom r 10
@@ -699,6 +701,32 @@ class dccp_socket 24
relabelto w 10
listen r 1
+class sctp_socket 24
+ node_bind n 1
+ name_connect w 10
+ append w 10
+ bind w 1
+ connect w 1
+ create w 1
+ write w 10
+ relabelfrom r 10
+ ioctl n 1
+ name_bind n 1
+ sendto w 10
+ recv_msg r 10
+ send_msg w 10
+ getattr r 7
+ setattr w 7
+ accept r 1
+ getopt r 1
+ read r 10
+ setopt w 1
+ shutdown w 1
+ recvfrom r 10
+ lock n 1
+ relabelto w 10
+ listen r 1
+
class netlink_firewall_socket 24
nlmsg_write w 10
nlmsg_read r 10
@@ -984,6 +1012,8 @@ class netif 10
udp_send w 10
dccp_recv r 10
dccp_send w 10
+ sctp_recv r 10
+ sctp_send w 10
class packet_socket 22
append w 10
diff --git a/setools/policyrep/netcontext.py b/setools/policyrep/netcontext.py
index c7076d2..2d890f3 100644
--- a/setools/policyrep/netcontext.py
+++ b/setools/policyrep/netcontext.py
@@ -38,6 +38,10 @@ try:
IPPROTO_DCCP = getprotobyname("dccp")
except socket.error:
IPPROTO_DCCP = 33
+try:
+ IPPROTO_SCTP = getprotobyname("sctp")
+except socket.error:
+ IPPROTO_SCTP = 132
def netifcon_factory(policy, name):
@@ -196,6 +200,7 @@ class PortconProtocol(int, PolicyEnum):
tcp = IPPROTO_TCP
udp = IPPROTO_UDP
dccp = IPPROTO_DCCP
+ sctp = IPPROTO_SCTP
class Portcon(NetContext):
--
2.14.3

View File

@ -0,0 +1,27 @@
From 8ef1a20824c2055cc16b66b56018a95e30b9a73c Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
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
want to suppress -Werror for now
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 0530d59..027d315 100644
--- a/setup.py
+++ b/setup.py
@@ -105,7 +105,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'],
libraries=['selinux', 'sepol'],
library_dirs=lib_dirs,
define_macros=macros,
- extra_compile_args=['-Werror', '-Wextra',
+ extra_compile_args=['-Wextra',
'-Waggregate-return',
'-Wfloat-equal',
'-Wformat', '-Wformat=2',
--
2.17.1

View File

@ -1,6 +1,6 @@
From 2512c3ba608077db3a5e0286b976fadc8a04a5c4 Mon Sep 17 00:00:00 2001 From 7a38c92583b5b6d6b14b43ba9b8c56d4e04b0b82 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: Vit Mojzis <vmojzis@redhat.com>
Date: Thu, 23 Feb 2017 08:17:07 +0100 Date: Mon, 1 Oct 2018 17:16:28 +0200
Subject: [PATCH 2/2] Do not export/use setools.InfoFlowAnalysis and Subject: [PATCH 2/2] Do not export/use setools.InfoFlowAnalysis and
setools.DomainTransitionAnalysis setools.DomainTransitionAnalysis
@ -12,28 +12,29 @@ Therefore it's better to use setools.infoflow.InfoFlowAnalysis and
setools.dta.DomainTransitionAnalysis and let the package containing setools.dta.DomainTransitionAnalysis and let the package containing
sedta and seinfoflow to require python3-networkx sedta and seinfoflow to require python3-networkx
--- ---
sedta | 3 ++- sedta | 4 ++--
seinfoflow | 3 ++- seinfoflow | 4 ++--
setools/__init__.py | 4 ++-- setools/__init__.py | 4 ++--
setoolsgui/apol/dta.py | 2 +- setoolsgui/apol/dta.py | 2 +-
setoolsgui/apol/infoflow.py | 2 +- setoolsgui/apol/infoflow.py | 2 +-
tests/dta.py | 3 ++- tests/dta.py | 2 +-
tests/infoflow.py | 3 ++- tests/infoflow.py | 2 +-
7 files changed, 12 insertions(+), 8 deletions(-) 7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sedta b/sedta diff --git a/sedta b/sedta
index 1c76ebb..255ad49 100755 index 10cf43a..b75b4e1 100755
--- a/sedta --- a/sedta
+++ b/sedta +++ b/sedta
@@ -23,6 +23,7 @@ import argparse @@ -21,7 +21,7 @@ import sys
import argparse
import logging import logging
import setools -import setools
+import setools.dta +import setools.dta
def print_transition(trans): def print_transition(trans):
@@ -111,7 +112,7 @@ else: @@ -111,7 +111,7 @@ else:
try: try:
p = setools.SELinuxPolicy(args.policy) p = setools.SELinuxPolicy(args.policy)
@ -43,18 +44,19 @@ index 1c76ebb..255ad49 100755
if args.shortest_path or args.all_paths: if args.shortest_path or args.all_paths:
if args.shortest_path: if args.shortest_path:
diff --git a/seinfoflow b/seinfoflow diff --git a/seinfoflow b/seinfoflow
index b287921..d53bdef 100755 index 3ec05ca..32a9a3e 100755
--- a/seinfoflow --- a/seinfoflow
+++ b/seinfoflow +++ b/seinfoflow
@@ -19,6 +19,7 @@ @@ -17,7 +17,7 @@
# along with SETools. If not, see <http://www.gnu.org/licenses/>.
#
from __future__ import print_function -import setools
import setools
+import setools.infoflow +import setools.infoflow
import argparse import argparse
import sys import sys
import logging import logging
@@ -79,7 +80,7 @@ else: @@ -78,7 +78,7 @@ else:
try: try:
p = setools.SELinuxPolicy(args.policy) p = setools.SELinuxPolicy(args.policy)
m = setools.PermissionMap(args.map) m = setools.PermissionMap(args.map)
@ -64,10 +66,10 @@ index b287921..d53bdef 100755
if args.shortest_path or args.all_paths: if args.shortest_path or args.all_paths:
if args.shortest_path: if args.shortest_path:
diff --git a/setools/__init__.py b/setools/__init__.py diff --git a/setools/__init__.py b/setools/__init__.py
index a84c846..a53c5a7 100644 index 7b70f5e..020be31 100644
--- a/setools/__init__.py --- a/setools/__init__.py
+++ b/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 from .devicetreeconquery import DevicetreeconQuery
# Information Flow Analysis # Information Flow Analysis
@ -82,59 +84,57 @@ index a84c846..a53c5a7 100644
# Policy difference # Policy difference
from .diff import PolicyDifference from .diff import PolicyDifference
diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py 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 --- a/setoolsgui/apol/dta.py
+++ b/setoolsgui/apol/dta.py +++ b/setoolsgui/apol/dta.py
@@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread @@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtGui import QPalette, QTextCursor
from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
QTreeWidgetItem QTreeWidgetItem
-from setools import DomainTransitionAnalysis -from setools import DomainTransitionAnalysis
+from setools.dta import DomainTransitionAnalysis +from setools.dta import DomainTransitionAnalysis
from ..logtosignal import LogHandlerToSignal from ..logtosignal import LogHandlerToSignal
from .analysistab import AnalysisTab from .analysistab import AnalysisTab
diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
index 1ae16de..fdf8f7b 100644 index 7bca299..7fee277 100644
--- a/setoolsgui/apol/infoflow.py --- a/setoolsgui/apol/infoflow.py
+++ b/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.QtGui import QPalette, QTextCursor
from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
QTreeWidgetItem QTreeWidgetItem
-from setools import InfoFlowAnalysis -from setools import InfoFlowAnalysis
+from setools.infoflow import InfoFlowAnalysis +from setools.infoflow import InfoFlowAnalysis
from setools.exception import UnmappedClass, UnmappedPermission from setools.exception import UnmappedClass, UnmappedPermission
from ..logtosignal import LogHandlerToSignal from ..logtosignal import LogHandlerToSignal
diff --git a/tests/dta.py b/tests/dta.py diff --git a/tests/dta.py b/tests/dta.py
index 32b9271..2bdd052 100644 index a0cc938..177e6fb 100644
--- a/tests/dta.py --- a/tests/dta.py
+++ b/tests/dta.py +++ b/tests/dta.py
@@ -17,7 +17,8 @@ @@ -18,7 +18,7 @@
# import os
import unittest import unittest
-from setools import SELinuxPolicy, DomainTransitionAnalysis -from setools import DomainTransitionAnalysis
+from setools import SELinuxPolicy
+from setools.dta import DomainTransitionAnalysis +from setools.dta import DomainTransitionAnalysis
from setools import TERuletype as TERT from setools import TERuletype as TERT
from setools.policyrep.exception import InvalidType from setools.exception import InvalidType
from setools.policyrep.typeattr import Type from setools.policyrep import Type
diff --git a/tests/infoflow.py b/tests/infoflow.py diff --git a/tests/infoflow.py b/tests/infoflow.py
index 7751dda..a21c683 100644 index aa0e44a..fca2848 100644
--- a/tests/infoflow.py --- a/tests/infoflow.py
+++ b/tests/infoflow.py +++ b/tests/infoflow.py
@@ -17,7 +17,8 @@ @@ -18,7 +18,7 @@
# import os
import unittest import unittest
-from setools import SELinuxPolicy, InfoFlowAnalysis -from setools import InfoFlowAnalysis
+from setools import SELinuxPolicy
+from setools.infoflow import InfoFlowAnalysis +from setools.infoflow import InfoFlowAnalysis
from setools import TERuletype as TERT from setools import TERuletype as TERT
from setools.exception import InvalidType
from setools.permmap import PermissionMap from setools.permmap import PermissionMap
from setools.policyrep.exception import InvalidType
-- --
2.9.3 2.17.1

View File

@ -1,28 +1,21 @@
# sitelib for noarch packages, sitearch for others (remove the unneeded one) # % global setools_pre_ver rc
%{!?__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 gitver f1e5b20 # % global gitver f1e5b20
%global sepol_ver 2.7-1 %global sepol_ver 2.8-1
%global selinux_ver 2.7-1 %global selinux_ver 2.8-1
Name: setools Name: setools
Version: 4.1.1 Version: 4.2.0
Release: 11%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist} Release: 1%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
Summary: Policy analysis tools for SELinux Summary: Policy analysis tools for SELinux
License: GPLv2 License: GPLv2
URL: https://github.com/TresysTechnology/setools/wiki URL: https://github.com/SELinuxProject/setools/wiki
Source0: https://github.com/TresysTechnology/setools/archive/%{version}%{?setools_pre_ver:-%{setools_pre_ver}}.tar.gz Source0: https://github.com/SELinuxProject/setools/archive/%{version}%{?setools_pre_ver:-%{setools_pre_ver}}.tar.gz
Source1: setools.pam Source1: setools.pam
Source2: apol.desktop Source2: apol.desktop
Patch1: 0001-Do-not-use-Werror-during-build.patch Patch1001: 1001-Do-not-use-Werror-during-build.patch
Patch2: 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch Patch1002: 1002-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 Obsoletes: setools < 4.0.0, setools-devel < 4.0.0
BuildRequires: flex, bison BuildRequires: flex, bison
@ -30,10 +23,10 @@ BuildRequires: glibc-devel, gcc, git
BuildRequires: libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver} BuildRequires: libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver}
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: swig BuildRequires: swig
BuildRequires: python2-devel BuildRequires: python3-Cython
BuildRequires: python2-setuptools
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: libselinux-devel
# BuildArch: # BuildArch:
Requires: python3-%{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release}
@ -76,29 +69,15 @@ This package includes the following console tools:
seinfoflow Perform information flow analyses. 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 %package -n python3-setools
Summary: Policy analysis tools for SELinux Summary: Policy analysis tools for SELinux
Obsoletes: setools-libs < 4.0.0 Obsoletes: setools-libs < 4.0.0
Recommends: libselinux-python3 Recommends: libselinux-python3
%{?python_provide:%python_provide python2-setools}
# Remove before F30 # Remove before F30
Provides: %{name}-python3 = %{version}-%{release} Provides: %{name}-python3 = %{version}-%{release}
Provides: %{name}-python3%{?_isa} = %{version}-%{release} Provides: %{name}-python3%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python3 < %{version}-%{release} Obsoletes: %{name}-python3 < %{version}-%{release}
Requires: python3-setuptools
%description -n python3-setools %description -n python3-setools
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -107,6 +86,7 @@ Python 3 modules designed to facilitate SELinux policy analysis.
%package gui %package gui
Summary: Policy analysis graphical tools for SELinux Summary: Policy analysis graphical tools for SELinux
Requires: python3-setools = %{version}-%{release}
Requires: python3-qt5 Requires: python3-qt5
Requires: python3-networkx Requires: python3-networkx
@ -116,37 +96,20 @@ Python modules designed to facilitate SELinux policy analysis.
%prep %prep
%autosetup -p 1 -S git %autosetup -p 1 -S git -n setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}
cp -a ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}} ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}-python2
%build %build
# Remove CFLAGS=... for noarch packages (unneeded) # Remove CFLAGS=... for noarch packages (unneeded)
CFLAGS="%{optflags}" %{__python3} setup.py build 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 %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} %{__python3} setup.py install --root %{buildroot}
%check %check
%if %{?_with_check:1}%{!?_with_check:0} %if %{?_with_check:1}%{!?_with_check:0}
%{__python3} setup.py test %{__python3} setup.py test
pushd ../setools-%{version}%{?setools_pre_ver:-%{setools_pre_ver}}-python2
%{__python2} setup.py test
popd
%endif %endif
@ -166,10 +129,6 @@ popd
%{_mandir}/man1/sedta* %{_mandir}/man1/sedta*
%{_mandir}/man1/seinfoflow* %{_mandir}/man1/seinfoflow*
%files -n python2-setools
%license COPYING COPYING.GPL COPYING.LGPL
%{python2_sitearch}/*
%files -n python3-setools %files -n python3-setools
%license COPYING COPYING.GPL COPYING.LGPL %license COPYING COPYING.GPL COPYING.LGPL
%{python3_sitearch}/setools %{python3_sitearch}/setools
@ -181,6 +140,21 @@ popd
%{_mandir}/man1/apol* %{_mandir}/man1/apol*
%changelog %changelog
* Wed Nov 14 2018 Vit Mojzis <vmojzis@redhat.com> - 4.2.0-1
- Update source to SETools 4.2.0 release
* 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
- Add Requires for python[23]-setuptools - no longer required (just recommended) by python[23] (#1623371)
* 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 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (4.1.1.tar.gz) = 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04 SHA512 (4.2.0.tar.gz) = b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680