3 commits - rel-eng/packages selinux/spacewalk-monitoring-selinux selinux/spacewalk-selinux

Jan Pazdziora adelton at fedoraproject.org
Fri Jun 29 12:12:07 UTC 2012


 rel-eng/packages/spacewalk-monitoring-selinux                          |    2 +-
 rel-eng/packages/spacewalk-selinux                                     |    2 +-
 selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec |    6 +++++-
 selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te           |    9 +++++++--
 selinux/spacewalk-selinux/spacewalk-selinux.spec                       |    6 +++++-
 selinux/spacewalk-selinux/spacewalk.te                                 |    9 +++++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit d01583032bb0319fac8237c135b44b128c268b8c
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Fri Jun 29 14:11:55 2012 +0200

    Automatic commit of package [spacewalk-monitoring-selinux] release [1.8.1-1].

diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packages/spacewalk-monitoring-selinux
index 68b2486..2b4835a 100644
--- a/rel-eng/packages/spacewalk-monitoring-selinux
+++ b/rel-eng/packages/spacewalk-monitoring-selinux
@@ -1 +1 @@
-1.7.2-1 selinux/spacewalk-monitoring-selinux/
+1.8.1-1 selinux/spacewalk-monitoring-selinux/
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index f0cc6fe..563a67f 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -7,7 +7,7 @@
 %define modulename spacewalk-monitoring
 
 Name:           spacewalk-monitoring-selinux
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        SELinux policy module supporting Spacewalk monitoring
 
@@ -141,6 +141,10 @@ fi
 %attr(0755,root,root) %{_sbindir}/%{name}-enable
 
 %changelog
+* Fri Jun 29 2012 Jan Pazdziora 1.8.1-1
+- Make java_t bits optional, as Fedora 17 does not have this type.
+- %%defattr is not needed since rpm 4.4
+
 * Tue Feb 07 2012 Miroslav Suchý 1.7.2-1
 - set selinux context for /etc/NOCpulse.ini
 


commit 6e36b3b3ebe15cb314986abd78b77cdc5678f945
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Fri Jun 29 14:11:47 2012 +0200

    Automatic commit of package [spacewalk-selinux] release [1.8.2-1].

diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 58865d9..75bc371 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.8.1-1 selinux/spacewalk-selinux/
+1.8.2-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index 5861f8d..ca1311c 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -7,7 +7,7 @@
 %define modulename spacewalk
 
 Name:           spacewalk-selinux
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Summary:        SELinux policy module supporting Spacewalk Server
 
@@ -112,6 +112,10 @@ fi
 %attr(0755,root,root) %{_sbindir}/%{name}-enable
 
 %changelog
+* Fri Jun 29 2012 Jan Pazdziora 1.8.2-1
+- Make java_t bits optional, as Fedora 17 does not have this type.
+- %%defattr is not needed since rpm 4.4
+
 * Tue Apr 17 2012 Jan Pazdziora 1.8.1-1
 - No need to require httpd_cobbler_content_t that we don't use.
 


commit 4ee18f634b4a346ffb87311c45b94757948bf4ab
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Fri Jun 29 12:03:50 2012 +0200

    Make java_t bits optional, as Fedora 17 does not have this type.
    
    Addressing
    libsepol.print_missing_requirements: spacewalk's global requirements were not met: type/attribute java_t (No such file or directory).
    libsemanage.semanage_link_sandbox: Link packages failed (No such file or directory).

diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
index ff125e3..310e238 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
@@ -2,7 +2,6 @@ policy_module(spacewalk-monitoring,@@VERSION@@)
 
 require {
 	type initrc_t;
-	type java_t;
 	type devpts_t;
 	type initrc_exec_t;
 	type nscd_var_run_t;
@@ -37,7 +36,13 @@ files_tmp_file(spacewalk_monitoring_tmp_t)
 
 init_daemon_domain(spacewalk_monitoring_t, spacewalk_monitoring_exec_t)
 dontaudit spacewalk_monitoring_t self:capability sys_tty_config;
-domtrans_pattern(java_t, spacewalk_monitoring_exec_t, spacewalk_monitoring_t)
+
+optional_policy(`
+	gen_require(`
+		type java_t;
+	')
+	domtrans_pattern(java_t, spacewalk_monitoring_exec_t, spacewalk_monitoring_t)
+')
 
 files_read_etc_files(spacewalk_monitoring_t)
 allow spacewalk_monitoring_t etc_t:dir { write add_name };
diff --git a/selinux/spacewalk-selinux/spacewalk.te b/selinux/spacewalk-selinux/spacewalk.te
index c6f5995..1bfa40e 100644
--- a/selinux/spacewalk-selinux/spacewalk.te
+++ b/selinux/spacewalk-selinux/spacewalk.te
@@ -13,7 +13,6 @@ require {
 	type restorecon_t;
 	type httpd_sys_script_t;
 	type httpd_log_t;
-	type java_t;
 	type initrc_t;
 	type system_mail_t;
 	type nfs_t;
@@ -41,7 +40,13 @@ dontaudit httpd_sys_script_t httpd_log_t:file { ioctl };
 type spacewalk_initrc_exec_t;
 domain_entry_file(initrc_t, spacewalk_initrc_exec_t)
 
-domain_auto_trans(java_t, spacewalk_initrc_exec_t, initrc_t)
+optional_policy(`
+	gen_require(`
+		type java_t;
+	')
+	domain_auto_trans(java_t, spacewalk_initrc_exec_t, initrc_t)
+')
+
 allow restorecon_t spacewalk_initrc_exec_t:file { relabelto getattr };
 
 filetrans_pattern(httpd_t, spacewalk_log_t, spacewalk_httpd_log_t, file)




More information about the spacewalk-commits mailing list