rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 46cb0ca74c55ae7378dfef234c840edc49760b40
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 1 14:02:03 2010 +0200
Automatic commit of package [oracle-xe-selinux] minor release [10.2-18].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index 3141c7e..4d58ea4 100644
--- a/rel-eng/packages/oracle-xe-selinux
+++ b/rel-eng/packages/oracle-xe-selinux
@@ -1 +1 @@
-10.2-17 selinux/oracle-xe-selinux/
+10.2-18 selinux/oracle-xe-selinux/
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 4907264..c313d99 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -6,7 +6,7 @@
Name: oracle-xe-selinux
Version: 10.2
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: SELinux policy module supporting Oracle XE
Group: System Environment/Base
License: GPLv2+
@@ -139,6 +139,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Wed Sep 01 2010 Jan Pazdziora 10.2-18
+- 629232 - only restorecon files that exist.
+
* Mon Jul 19 2010 Jan Pazdziora 10.2-17
- 615901 - dontaudit Oracle XE's access to /dev/console.
commit d5a68d7063347838d15de66afc4f413739887a18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 1 13:56:05 2010 +0200
629232 - only restorecon files that exist.
Sadly, oracle-xe-univ does
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/admin/patch
in %post which does not make restorecon happy (not mentioning
rpm -V oracle-xe-univ).
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 9808755..4907264 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -106,7 +106,7 @@ fi
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Relabel oracle-xe-univ's files
- rpm -ql oracle-xe-univ | xargs -n 100 /sbin/restorecon -Rivv
+ rpm -ql oracle-xe-univ | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 /sbin/restorecon -Rivv
# Fix up additional directories, not owned by oracle-xe-univ
/sbin/restorecon -Rivv %extra_restorecon
fi
@@ -125,7 +125,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage port -d -t oracle_port_t -p tcp 9055 || :
# Clean up oracle-xe-univ's files
- rpm -ql oracle-xe-univ | xargs -n 100 /sbin/restorecon -Rivv
+ rpm -ql oracle-xe-univ | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 /sbin/restorecon -Rivv
# Clean up additional directories, not owned by oracle-xe-univ
/sbin/restorecon -Rivv %extra_restorecon