client/tools/osad/osad.spec | 12 +++-------
rel-eng/packages/oracle-selinux | 2 -
rel-eng/packages/oracle-xe-selinux | 2 -
rel-eng/packages/osad | 2 -
rel-eng/packages/spacewalk-monitoring-selinux | 2 -
rel-eng/packages/spacewalk-selinux | 2 -
selinux/oracle-selinux/oracle-selinux.spec | 12 +++-------
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 12 +++-------
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 12 +++-------
selinux/spacewalk-selinux/spacewalk-selinux.spec | 12 +++-------
10 files changed, 25 insertions(+), 45 deletions(-)
New commits:
commit 9f86ec7070831faa01608e727c9f71714bd70c40
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 12:29:09 2011 +0200
Automatic commit of package [spacewalk-monitoring-selinux] release [1.5.2-1].
diff --git a/rel-eng/packages/spacewalk-monitoring-selinux
b/rel-eng/packages/spacewalk-monitoring-selinux
index 7ef58a2..e38d9a6 100644
--- a/rel-eng/packages/spacewalk-monitoring-selinux
+++ b/rel-eng/packages/spacewalk-monitoring-selinux
@@ -1 +1 @@
-1.5.1-1 selinux/spacewalk-monitoring-selinux/
+1.5.2-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 8944167..4bda892 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.5.1
+Version: 1.5.2
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk monitoring
@@ -142,6 +142,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 1.5.2-1
+- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
+
* Mon Jul 18 2011 Jan Pazdziora 1.5.1-1
- Fedora 15 uses oracledb_port_t instead of oracle_port_t.
commit 4bf32ff9ad723a89df6a688995d3d0b419013758
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 12:28:56 2011 +0200
Automatic commit of package [spacewalk-selinux] release [1.5.5-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 668a810..f61a2be 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.5.4-1 selinux/spacewalk-selinux/
+1.5.5-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec
b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index f0d0ca4..9d76ef2 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.5.4
+Version: 1.5.5
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
@@ -113,6 +113,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 1.5.5-1
+- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
+
* Mon Jul 18 2011 Jan Pazdziora 1.5.4-1
- Fedora 15 uses oracledb_port_t instead of oracle_port_t.
commit 40049689a1d7e8a637bb30a4ddc8047dd59847bb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 12:28:42 2011 +0200
Automatic commit of package [oracle-xe-selinux] release [10.2.0.21.1-1].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index d1e57d5..6e45f7b 100644
--- a/rel-eng/packages/oracle-xe-selinux
+++ b/rel-eng/packages/oracle-xe-selinux
@@ -1 +1 @@
-10.2.0.21-1 selinux/oracle-xe-selinux/
+10.2.0.21.1-1 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 bc26e10..6b2c4d1 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-xe
Name: oracle-xe-selinux
-Version: 10.2.0.21
+Version: 10.2.0.21.1
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle XE
Group: System Environment/Base
@@ -139,6 +139,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 10.2.0.21.1-1
+- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
+
* Mon Jul 18 2011 Jan Pazdziora 10.2.0.21-1
- Fedora 15 uses oracledb_port_t instead of oracle_port_t.
commit eb08819ae482debf6e4b684588b5ba129d0c1749
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 12:28:17 2011 +0200
Automatic commit of package [oracle-selinux] release [0.1.23.29.1-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index 4368cb3..5294088 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1.23.29-1 selinux/oracle-selinux/
+0.1.23.29.1-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec
b/selinux/oracle-selinux/oracle-selinux.spec
index 19b451b..6da045f 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -19,7 +19,7 @@
%endif
Name: oracle-selinux
-Version: 0.1.23.29
+Version: 0.1.23.29.1
Release: 1%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -225,6 +225,9 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 0.1.23.29.1-1
+- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
+
* Wed Jul 20 2011 Jan Pazdziora 0.1.23.29-1
- Allow sqlplus to read /sys/.../meminfo.
commit 0b3078de57b5ab2e1d10929c49126f4e202c3f22
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 12:27:48 2011 +0200
Automatic commit of package [osad] release [5.10.18.1-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index d67f070..08eb3ed 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,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.10.18
+Version: 5.10.18.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 5.10.18.1-1
+- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
+
* Mon Jul 18 2011 Jan Pazdziora 5.10.18-1
- Fedora 15 uses oracledb_port_t instead of oracle_port_t.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 07349cf..015b636 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.18-1 client/tools/osad/
+5.10.18.1-1 client/tools/osad/
commit 4d06ca8371dc734529dcd99488e73eb74ea44907
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 08:59:51 2011 +0200
Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
With bug 723439 addressed, we can go back to using oracle_port_t.
This reverts commit 27f5a276dcaa30d4841f7d0642817a5a46b215c7.
(cherry picked from commit d0b8a451ad23c5818bec078bc74895a21c4f9a44)
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 522580d..d67f070 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -114,13 +114,6 @@ SELinux policy module supporting osa-dispatcher.
cp prog.init.SUSE prog.init
%endif
-# Fedora 15 uses oracledb_port_t instead of oracle_port_t
-%if 0%{?fedora} >= 15
-for i in osa-dispatcher-selinux/* ; do
- sed -i 's/\boracle_port_t\b/oracledb_port_t/' $i
-done
-%endif
-
%build
make -f Makefile.osad all
diff --git a/selinux/oracle-selinux/oracle-selinux.spec
b/selinux/oracle-selinux/oracle-selinux.spec
index bbb8d80..19b451b 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -72,13 +72,6 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
# Make file contexts relative to oracle_base
perl -pi -e 's#%{default_oracle_base}#%{oracle_base}#g' SELinux/%{modulename}.fc
-# Fedora 15 uses oracledb_port_t instead of oracle_port_t
-%if 0%{?fedora} >= 15
-for i in SELinux/* ; do
- sed -i 's/\boracle_port_t\b/oracledb_port_t/' $i
-done
-%endif
-
# Create oracle-nofcontext source files
cp SELinux/%{modulename}.if SELinux/%{modulename}-nofcontext.if
cp SELinux/%{modulename}.te SELinux/%{modulename}-nofcontext.te
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 0806979..bc26e10 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -41,13 +41,6 @@ rm -rf %{name}-%{version}
mkdir -p %{name}-%{version}
cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{name}-%{version}
-# Fedora 15 uses oracledb_port_t instead of oracle_port_t
-%if 0%{?fedora} >= 15
-for i in %{name}-%{version}/* ; do
- sed -i 's/\boracle_port_t\b/oracledb_port_t/' $i
-done
-%endif
-
%build
# Build SELinux policy modules
cd %{name}-%{version}
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index 21ca1da..8944167 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -73,13 +73,6 @@ SELinux policy module supporting Spacewalk monitoring.
%prep
%setup -q
-# Fedora 15 uses oracledb_port_t instead of oracle_port_t
-%if 0%{?fedora} >= 15
-for i in * ; do
- sed -i 's/\boracle_port_t\b/oracledb_port_t/' $i
-done
-%endif
-
%build
# Build SELinux policy modules
perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./,
"%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec
b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index a47b748..f0d0ca4 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -44,13 +44,6 @@ SELinux policy module supporting Spacewalk Server.
%prep
%setup -q
-# Fedora 15 uses oracledb_port_t instead of oracle_port_t
-%if 0%{?fedora} >= 15
-for i in * ; do
- sed -i 's/\boracle_port_t\b/oracledb_port_t/' $i
-done
-%endif
-
%build
# Build SELinux policy modules
perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./,
"%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te