Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3fd20d3ca8 | ||
|
4db2bcefac | ||
|
339414d693 | ||
|
e789767476 | ||
|
e3f72ce011 | ||
|
a4d48dae14 |
@ -9,9 +9,9 @@ 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/perm_map | 36 +++++++++++++++++++++++++++---
|
||||
setools/policyrep/netcontext.py | 5 +++++
|
||||
4 files changed, 41 insertions(+)
|
||||
4 files changed, 44 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libqpol/include/qpol/linux_types.h b/libqpol/include/qpol/linux_types.h
|
||||
index c3c056b..0985162 100644
|
||||
@ -49,9 +49,27 @@ index dcc69fc..1e623a3 100644
|
||||
yyerror2("unrecognized protocol %s", id);
|
||||
goto bad;
|
||||
diff --git a/setools/perm_map b/setools/perm_map
|
||||
index 0a9f91c..25fae09 100644
|
||||
index 0a9f91c..8bd34f5 100644
|
||||
--- a/setools/perm_map
|
||||
+++ b/setools/perm_map
|
||||
@@ -27,7 +27,7 @@
|
||||
# Look to the examples below for further clarification.
|
||||
#
|
||||
# Number of object classes.
|
||||
-95
|
||||
+96
|
||||
|
||||
class netlink_audit_socket 27
|
||||
nlmsg_relay w 10
|
||||
@@ -376,7 +376,7 @@ class file 22
|
||||
quotaon b 1
|
||||
swapon b 1
|
||||
|
||||
-class node 11
|
||||
+class node 13
|
||||
rawip_recv r 10
|
||||
tcp_recv r 10
|
||||
udp_recv r 10
|
||||
@@ -385,6 +385,8 @@ class node 11
|
||||
udp_send w 10
|
||||
dccp_recv r 10
|
||||
@ -94,6 +112,15 @@ index 0a9f91c..25fae09 100644
|
||||
class netlink_firewall_socket 24
|
||||
nlmsg_write w 10
|
||||
nlmsg_read r 10
|
||||
@@ -973,7 +1001,7 @@ class key_socket 22
|
||||
relabelto w 10
|
||||
listen r 1
|
||||
|
||||
-class netif 10
|
||||
+class netif 12
|
||||
rawip_recv r 10
|
||||
tcp_recv r 10
|
||||
udp_recv r 10
|
||||
@@ -984,6 +1012,8 @@ class netif 10
|
||||
udp_send w 10
|
||||
dccp_recv r 10
|
||||
@ -104,10 +131,10 @@ index 0a9f91c..25fae09 100644
|
||||
class packet_socket 22
|
||||
append w 10
|
||||
diff --git a/setools/policyrep/netcontext.py b/setools/policyrep/netcontext.py
|
||||
index c7076d2..2d890f3 100644
|
||||
index 9a01fc5..630b42c 100644
|
||||
--- a/setools/policyrep/netcontext.py
|
||||
+++ b/setools/policyrep/netcontext.py
|
||||
@@ -38,6 +38,10 @@ try:
|
||||
@@ -35,6 +35,10 @@ try:
|
||||
IPPROTO_DCCP = getprotobyname("dccp")
|
||||
except socket.error:
|
||||
IPPROTO_DCCP = 33
|
||||
@ -118,7 +145,7 @@ index c7076d2..2d890f3 100644
|
||||
|
||||
|
||||
def netifcon_factory(policy, name):
|
||||
@@ -196,6 +200,7 @@ class PortconProtocol(int, PolicyEnum):
|
||||
@@ -161,6 +165,7 @@ class PortconProtocol(int, PolicyEnum):
|
||||
tcp = IPPROTO_TCP
|
||||
udp = IPPROTO_UDP
|
||||
dccp = IPPROTO_DCCP
|
||||
@ -127,5 +154,5 @@ index c7076d2..2d890f3 100644
|
||||
|
||||
class Portcon(NetContext):
|
||||
--
|
||||
2.14.3
|
||||
2.18.0
|
||||
|
||||
|
32
setools.spec
32
setools.spec
@ -6,17 +6,17 @@
|
||||
# % global setools_pre_ver beta.1.8e09d95
|
||||
# % global gitver f1e5b20
|
||||
|
||||
%global sepol_ver 2.7-1
|
||||
%global selinux_ver 2.7-1
|
||||
%global sepol_ver 2.8-1
|
||||
%global selinux_ver 2.8-1
|
||||
|
||||
Name: setools
|
||||
Version: 4.1.1
|
||||
Release: 8%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
|
||||
Release: 9%{?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
|
||||
@ -92,7 +92,7 @@ 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, setools-libs-tcl
|
||||
Obsoletes: setools-libs < 4.0.0
|
||||
Recommends: libselinux-python3
|
||||
%{?python_provide:%python_provide python2-setools}
|
||||
# Remove before F30
|
||||
@ -107,6 +107,7 @@ Python 3 modules designed to facilitate SELinux policy analysis.
|
||||
|
||||
%package gui
|
||||
Summary: Policy analysis graphical tools for SELinux
|
||||
Requires: python3-setools = %{version}-%{release}
|
||||
Requires: python3-qt5
|
||||
Requires: python3-networkx
|
||||
|
||||
@ -167,26 +168,27 @@ popd
|
||||
%{_mandir}/man1/seinfoflow*
|
||||
|
||||
%files -n python2-setools
|
||||
# %doc AUTHORS ChangeLog KNOWN-BUGS NEWS README
|
||||
%license COPYING COPYING.GPL COPYING.LGPL
|
||||
# For noarch packages: sitelib
|
||||
# %{python2_sitelib}/*
|
||||
# For arch-specific packages: sitearch
|
||||
%{python2_sitearch}/*
|
||||
|
||||
%files -n python3-setools
|
||||
%license COPYING COPYING.GPL COPYING.LGPL
|
||||
# %doc AUTHORS ChangeLog KNOWN-BUGS NEWS README
|
||||
# For noarch packages: sitelib
|
||||
# %{python3_sitelib}/*
|
||||
# For arch-specific packages: sitearch
|
||||
%{python3_sitearch}/*
|
||||
%{python3_sitearch}/setools
|
||||
%{python3_sitearch}/setools-*
|
||||
|
||||
%files gui
|
||||
%{_bindir}/apol
|
||||
%{python3_sitearch}/setoolsgui
|
||||
%{_mandir}/man1/apol*
|
||||
|
||||
%changelog
|
||||
* Wed Aug 22 2018 Petr Lautrbach <plautrba@redhat.com> - 4.1.1-12
|
||||
- Fix SCTP patch - https://github.com/SELinuxProject/setools/issues/9
|
||||
- Move gui python files to -gui subpackage
|
||||
|
||||
* Mon Jul 23 2018 Petr Lautrbach <plautrba@redhat.com> - 4.1.1-8.1
|
||||
- Rebuild for #1568333
|
||||
|
||||
* Thu Apr 26 2018 Vit Mojzis <vmojzis@redhat.com> - 4.1.1-8
|
||||
- Add support for SCTP protocol (#1568333)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user