rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1
rel-eng/packages/jabberd-selinux-workaround | 1
rel-eng/tito.props | 6
selinux/jabberd-selinux-workaround/jabberd-selinux-workaround-enable | 9
selinux/jabberd-selinux-workaround/jabberd-selinux-workaround.spec | 94 ----------
selinux/jabberd-selinux-workaround/jabberworkaround.if | 1
selinux/jabberd-selinux-workaround/jabberworkaround.te | 17 -
7 files changed, 3 insertions(+), 126 deletions(-)
New commits:
commit 13be4beaa7043bb77d099e4c714423f24cd19947
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jun 17 14:02:12 2011 +0200
The jabberd-selinux-workaround is no longer needed now that RHEL 6.1 has been released
(and Required).
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index d583121..bd026a3 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -22,7 +22,6 @@
<packagereq type="default">chameleon</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
- <packagereq
type="default">jabberd-selinux-workaround</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
<packagereq type="default">msv-workaround</packagereq>
diff --git a/rel-eng/packages/jabberd-selinux-workaround
b/rel-eng/packages/jabberd-selinux-workaround
deleted file mode 100644
index bc82aae..0000000
--- a/rel-eng/packages/jabberd-selinux-workaround
+++ /dev/null
@@ -1 +0,0 @@
-1.0.2-1 selinux/jabberd-selinux-workaround/
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index ca34d3a..1ddeb9e 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -10,7 +10,7 @@ autobuild_tags = dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate
dist-f14-sw-1
[dist-5E-sw-1.5-candidate]
disttag = .el5
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm
jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm python-ethtool
msv-workaround apt-spacewalk python-hwdata
[dist-6E-sw-1.5-candidate]
disttag = .el6
@@ -18,8 +18,8 @@ blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm
heirloom-p
[dist-f14-sw-1.5-candidate]
disttag = .fc14
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm
jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
heirloom-pkgtools
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm
python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools
[dist-f15-sw-1.5-candidate]
disttag = .fc15
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm
jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
heirloom-pkgtools
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm
python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools
diff --git a/selinux/jabberd-selinux-workaround/jabberd-selinux-workaround-enable
b/selinux/jabberd-selinux-workaround/jabberd-selinux-workaround-enable
deleted file mode 100644
index 6f0e3da..0000000
--- a/selinux/jabberd-selinux-workaround/jabberd-selinux-workaround-enable
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Install SELinux policy modules
-for selinuxvariant in mls strict targeted
- do
- /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
- && /usr/sbin/semodule -s ${selinuxvariant} -i \
- /usr/share/selinux/${selinuxvariant}/jabberworkaround.pp || :
- done
diff --git a/selinux/jabberd-selinux-workaround/jabberd-selinux-workaround.spec
b/selinux/jabberd-selinux-workaround/jabberd-selinux-workaround.spec
deleted file mode 100644
index 0ea6433..0000000
--- a/selinux/jabberd-selinux-workaround/jabberd-selinux-workaround.spec
+++ /dev/null
@@ -1,94 +0,0 @@
-%global selinux_variants mls strict targeted
-%global selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,'
/usr/share/selinux/devel/policyhelp 2> /dev/null)
-%global POLICYCOREUTILSVER 1.33.12-1
-
-%global moduletype apps
-%global modulename jabberworkaround
-
-Name: jabberd-selinux-workaround
-Version: 1.0.2
-Release: 1%{?dist}
-Summary: SELinux policy module supporting jabberd on RHEL-6.0
-
-Group: System Environment/Base
-License: GPLv2+
-URL:
http://fedorahosted.org/spacewalk
-Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: checkpolicy, selinux-policy-devel
-BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER}
-BuildArch: noarch
-
-%if "%{selinux_policyver}" != ""
-Requires: selinux-policy >= %{selinux_policyver}
-%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool,
/usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
-Requires: jabberd >= 2.2.8
-
-%description
-Workaround for jabberd to work with default RHEL-6.0 SELinux policy.
-
-%prep
-%setup -q
-
-%build
-# Build SELinux policy modules
-perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./,
"%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
-for selinuxvariant in %{selinux_variants}
-do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-
-%install
-rm -rf %{buildroot}
-
-# Install SELinux policy modules
-for selinuxvariant in %{selinux_variants}
- do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 %{modulename}.pp.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
- done
-
-# Install SELinux interfaces
-install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 %{modulename}.if \
- %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-
-# Install jabberd-selinux-enable which will be called in %posttrans
-install -d %{buildroot}%{_sbindir}
-install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable
-
-%clean
-rm -rf %{buildroot}
-
-%post
-if /usr/sbin/selinuxenabled ; then
- %{_sbindir}/%{name}-enable
-fi
-
-%postun
-# Clean up after package removal
-if [ $1 -eq 0 ]; then
- for selinuxvariant in %{selinux_variants}
- do
- /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
- && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
- done
-fi
-
-%files
-%defattr(-,root,root,0755)
-%doc %{modulename}.fc %{modulename}.if %{modulename}.te
-%{_datadir}/selinux/*/%{modulename}.pp
-%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-%attr(0755,root,root) %{_sbindir}/%{name}-enable
-
-%changelog
-* Mon Jan 31 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.0.2-1
-- initial packaging
-
diff --git a/selinux/jabberd-selinux-workaround/jabberworkaround.fc
b/selinux/jabberd-selinux-workaround/jabberworkaround.fc
deleted file mode 100644
index e69de29..0000000
diff --git a/selinux/jabberd-selinux-workaround/jabberworkaround.if
b/selinux/jabberd-selinux-workaround/jabberworkaround.if
deleted file mode 100644
index 3eb6a30..0000000
--- a/selinux/jabberd-selinux-workaround/jabberworkaround.if
+++ /dev/null
@@ -1 +0,0 @@
-## <summary></summary>
diff --git a/selinux/jabberd-selinux-workaround/jabberworkaround.te
b/selinux/jabberd-selinux-workaround/jabberworkaround.te
deleted file mode 100644
index 9d721e1..0000000
--- a/selinux/jabberd-selinux-workaround/jabberworkaround.te
+++ /dev/null
@@ -1,17 +0,0 @@
-
-policy_module(jabberworkaround, @@VERSION@@)
-
-require {
- type jabberd_t;
- class process setfscreate;
- class netlink_route_socket { write getattr read bind create nlmsg_read };
-}
-
-#============= jabberd_t ==============
-allow jabberd_t self:netlink_route_socket { write getattr read bind create nlmsg_read };
-allow jabberd_t self:process setfscreate;
-kerberos_use(jabberd_t)
-miscfiles_manage_cert_dirs(jabberd_t)
-miscfiles_manage_cert_files(jabberd_t)
-seutil_read_file_contexts(jabberd_t)
-seutil_search_default_contexts(jabberd_t)