RPM: update selinux support in tdebase

5 years ago · 030be2b4a8
parent d257b83fd4
commit 030be2b4a8
29 changed files with 50 additions and 5 deletions
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@ -197,6 +197,7 @@ ruby-devel
 sane-backends-devel
 scons
 SDL-devel
+selinux-policy-devel
 sip-devel
 speex-devel
 sqlite-devel
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@ -184,6 +184,7 @@ ruby-devel
 sane-backends-devel
 scons
 SDL-devel
+selinux-policy-devel
 sip-devel
 speex-devel
 sqlite-devel
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@ -177,6 +177,7 @@ ruby
 ruby-devel
 sane-backends-devel
 SDL-devel
+selinux-policy-devel
 speex-devel
 sqlite-devel
 subversion-devel
--- a/redhat/docker/f30/packages
+++ b/redhat/docker/f30/packages
@ -197,6 +197,7 @@ ruby-devel
 sane-backends-devel
 scons
 SDL-devel
+selinux-policy-devel
 sip-devel
 speex-devel
 sqlite-devel
--- a/redhat/docker/f31/packages
+++ b/redhat/docker/f31/packages
@ -201,6 +201,7 @@ ruby-devel
 sane-backends-devel
 scons
 SDL-devel
+selinux-policy-devel
 sip-devel
 speex-devel
 sqlite-devel
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@ -92,7 +92,7 @@ Source7:		xdm%{?dist}

 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
 %define with_selinux_policy 1
-Source8:	tdm%{?dist}.pp
+Source8:	tdm%{?dist}.te
 %endif

 %if 0%{?mgaversion} >= 3
@ -769,6 +769,12 @@ BuildRequires:		libnsl-devel
 # ATTR support
 BuildRequires:	libattr-devel

+# SELINUX support
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+BuildRequires:	checkpolicy
+BuildRequires:	selinux-policy-devel
+%endif
+
 # tdebase is a metapackage that installs all sub-packages
 Requires: %{name}-runtime-data-common = %{version}-%{release}
 Requires: %{name}-data = %{version}-%{release}
@ -3563,7 +3569,9 @@ fi

 # SELINUX policy for RHEL / Fedora
 %if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
+%__cp -f "%{SOURCE8}" "tdm.te"
+%__make -f "%{_datadir}/selinux/devel/Makefile"
+%__install -D -m 644 -D "tdm.pp" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
 %endif

 # Mageia icon for TDE menu
--- a/redhat/main/tdebase/tdm.el6.pp
+++ b/redhat/main/tdebase/tdm.el6.pp
--- a/redhat/main/tdebase/tdm.el6.te
+++ b/redhat/main/tdebase/tdm.el6.te
@ -1,5 +1,5 @@

-module tdm.el6 1.0;
+module tdm 1.0;

 require {
 	type fprintd_t;
--- a/redhat/main/tdebase/tdm.el7.pp
+++ b/redhat/main/tdebase/tdm.el7.pp
--- a/redhat/main/tdebase/tdm.el7.te
+++ b/redhat/main/tdebase/tdm.el7.te
@ -1,5 +1,5 @@

-module tdm.el7 1.0;
+module tdm 1.0;

 require {
        type fprintd_t;
--- a/redhat/main/tdebase/tdm.el8.pp
+++ b/redhat/main/tdebase/tdm.el8.pp
@ -1 +0,0 @@
-tdm.el7.pp
--- a/redhat/main/tdebase/tdm.el8.te
+++ b/redhat/main/tdebase/tdm.el8.te
@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+        type fprintd_t;
+        type init_t;
+        class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
--- a/redhat/main/tdebase/tdm.fc17.pp
+++ b/redhat/main/tdebase/tdm.fc17.pp
--- a/redhat/main/tdebase/tdm.fc18.pp
+++ b/redhat/main/tdebase/tdm.fc18.pp
--- a/redhat/main/tdebase/tdm.fc19.pp
+++ b/redhat/main/tdebase/tdm.fc19.pp
--- a/redhat/main/tdebase/tdm.fc20.pp
+++ b/redhat/main/tdebase/tdm.fc20.pp
--- a/redhat/main/tdebase/tdm.fc21.pp
+++ b/redhat/main/tdebase/tdm.fc21.pp
--- a/redhat/main/tdebase/tdm.fc22.pp
+++ b/redhat/main/tdebase/tdm.fc22.pp
--- a/redhat/main/tdebase/tdm.fc23.pp
+++ b/redhat/main/tdebase/tdm.fc23.pp
--- a/redhat/main/tdebase/tdm.fc24.pp
+++ b/redhat/main/tdebase/tdm.fc24.pp
--- a/redhat/main/tdebase/tdm.fc25.pp
+++ b/redhat/main/tdebase/tdm.fc25.pp
--- a/redhat/main/tdebase/tdm.fc26.pp
+++ b/redhat/main/tdebase/tdm.fc26.pp
--- a/redhat/main/tdebase/tdm.fc27.pp
+++ b/redhat/main/tdebase/tdm.fc27.pp
--- a/redhat/main/tdebase/tdm.fc28.pp
+++ b/redhat/main/tdebase/tdm.fc28.pp
--- a/redhat/main/tdebase/tdm.fc29.pp
+++ b/redhat/main/tdebase/tdm.fc29.pp
--- a/redhat/main/tdebase/tdm.fc30.pp
+++ b/redhat/main/tdebase/tdm.fc30.pp
--- a/redhat/main/tdebase/tdm.fc30.te
+++ b/redhat/main/tdebase/tdm.fc30.te
@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+	type fprintd_t;
+	type init_t;
+	class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
--- a/redhat/main/tdebase/tdm.fc31.pp
+++ b/redhat/main/tdebase/tdm.fc31.pp
--- a/redhat/main/tdebase/tdm.fc31.te
+++ b/redhat/main/tdebase/tdm.fc31.te
@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+	type fprintd_t;
+	type init_t;
+	class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;