client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te | 5 +++-
client/tools/osad/osad.spec | 14 ++++++-------
rel-eng/packages/osad | 2 -
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 3e3cf309f23fcf9805f7d3f676b6a7ab3858e82f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 27 15:17:06 2009 +0200
Automatic commit of package [osad] release [5.9.19-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 3912e05..16a6b60 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.18
+Version: 5.9.19
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -236,6 +236,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$
%changelog
+* Mon Jul 27 2009 Jan Pazdziora 5.9.19-1
+- 512732 - on Fedora 11, corenet_udp_bind_lo_node is no longer available
+- Build osa-dispatcher-selinux again
+
* Thu Jul 23 2009 Devan Goodwin <dgoodwin(a)redhat.com> 5.9.18-1
- Remove Requires python-optik. (dgoodwin(a)redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 7d7a99e..f7a41a1 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.9.18-1 client/tools/osad/
+5.9.19-1 client/tools/osad/
commit 5cfdfa5104c744a9ed13dfa73ca007573825797f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 27 14:59:31 2009 +0200
Revert "Disable osad selinux for Fedora 11." -- build osa-dispatcher-selinux
again.
This reverts commit 4caf9e06a6268beb6ca5bf455ca6d8d207eaa942.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 6ce5303..3912e05 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -53,14 +53,10 @@ OSA dispatcher get message from Spacewalk server that some command is
need
to execute on client. The message is transported via jabber protocol to OSAD
agent.
-%define include_selinux_package 1
-
%if 0%{?rhel} && 0%{?rhel} <= 4
%define include_selinux_package 0
-%endif
-
-%if 0%{?fedora} == 11
-%define include_selinux_package 0
+%else
+%define include_selinux_package 1
%endif
%if %{include_selinux_package}
commit f2ebf211b1c34f2456bbd38c6715c29b15e97ebc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 27 15:01:16 2009 +0200
512732 - on Fedora 11, corenet_udp_bind_lo_node is no longer available.
diff --git a/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te
b/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te
index 2454e28..573f5a9 100644
--- a/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te
+++ b/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te
@@ -53,7 +53,10 @@
read_files_pattern(osa_dispatcher_t,httpd_sys_content_t,httpd_sys_content_t)
allow osa_dispatcher_t self:fifo_file rw_fifo_file_perms;
-corenet_udp_bind_lo_node(osa_dispatcher_t)
+gen_require(`
+ type lo_node_t;
+')
+allow osa_dispatcher_t lo_node_t:udp_socket node_bind;
corenet_udp_bind_generic_node(osa_dispatcher_t)
sysnet_dns_name_resolve(osa_dispatcher_t)