Branch 'SPACEWALK-1.5' - 2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/TinyURL.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit cdb99697cc33387e74d43d67c2cd9a438be8b679
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:36:23 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.18-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index fb4f5ec..d627a92 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.17-1 web/
+1.5.18-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index d14ff08..061be2c 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.17
+Version: 1.5.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Jul 21 2011 Jan Pazdziora 1.5.18-1
+- Sysdate replaced with current_timestamp (msuchy(a)redhat.com)
+
* Wed Jul 20 2011 Jan Pazdziora 1.5.17-1
- Dropping the nightly from the Spacewalk WebUI version string.
commit 12eef78f928be9b6e88e701815d43cd8bd0c8cae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jul 19 15:41:40 2011 +0200
Sysdate replaced with current_timestamp
In situations WHERE col < sysdate we can replace this with
current_timestamp. This function exists in both Oracle and PostgreSQL
and since there is no arithmetics in this statement the comparsion (or
any other operator) works well.
Under Oracle we use DATE type and in PostgreSQL we use TIMESTAMP WITH
TIMEZONE.
(cherry picked from commit a90759c165d70ba9fe8e40347c4b872a96dc3a9d)
diff --git a/web/modules/rhn/RHN/DB/TinyURL.pm b/web/modules/rhn/RHN/DB/TinyURL.pm
index bf77071..785ae69 100644
--- a/web/modules/rhn/RHN/DB/TinyURL.pm
+++ b/web/modules/rhn/RHN/DB/TinyURL.pm
@@ -35,7 +35,7 @@ sub lookup {
my $sth = $dbh->prepare(<<EOS);
SELECT url FROM rhnTinyURL
WHERE token = :token
- AND expires > sysdate
+ AND expires > current_timestamp
AND enabled = 'Y'
EOS
$sth->execute_h(token => $token);
12 years, 9 months
Changes to 'refs/tags/spacewalk-selinux-1.6.1-1'
by Jan Pazdziora
Tag 'spacewalk-selinux-1.6.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-21 07:02 +0000
Tagging package [spacewalk-selinux] version [1.6.1-1] in directory [selinux/spacewalk-selinux/].
Changes since oracle-xe-selinux-10.2.0.22-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-selinux] release [1.6.1-1].
---
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 9 months
Changes to 'refs/tags/spacewalk-monitoring-selinux-1.6.1-1'
by Jan Pazdziora
Tag 'spacewalk-monitoring-selinux-1.6.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-21 07:02 +0000
Tagging package [spacewalk-monitoring-selinux] version [1.6.1-1] in directory [selinux/spacewalk-monitoring-selinux/].
Changes since oracle-xe-selinux-10.2.0.22-1:
Jan Pazdziora (2):
Automatic commit of package [spacewalk-selinux] release [1.6.1-1].
Automatic commit of package [spacewalk-monitoring-selinux] release [1.6.1-1].
---
rel-eng/packages/spacewalk-monitoring-selinux | 2 +-
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 5 ++++-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
4 files changed, 10 insertions(+), 4 deletions(-)
---
12 years, 9 months
2 commits - rel-eng/packages selinux/spacewalk-monitoring-selinux selinux/spacewalk-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-monitoring-selinux | 2 +-
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 5 ++++-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 4202cf728ca2c019c8e9873804444e27d7454e57
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:02:29 2011 +0200
Automatic commit of package [spacewalk-monitoring-selinux] release [1.6.1-1].
diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packages/spacewalk-monitoring-selinux
index 7ef58a2..faef1a8 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.6.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 121e3b3..df9d756 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.6.0
+Version: 1.6.1
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.6.1-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 68bcde687c2054ea214591e5679630dc103b603b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:02:17 2011 +0200
Automatic commit of package [spacewalk-selinux] release [1.6.1-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 668a810..9aa9fca 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.5.4-1 selinux/spacewalk-selinux/
+1.6.1-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index 9da3b35..1d7dc10 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.6.0
+Version: 1.6.1
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.6.1-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.
12 years, 9 months
Changes to 'refs/tags/oracle-xe-selinux-10.2.0.22-1'
by Jan Pazdziora
Tag 'oracle-xe-selinux-10.2.0.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-21 07:01 +0000
Tagging package [oracle-xe-selinux] version [10.2.0.22-1] in directory [selinux/oracle-xe-selinux/].
Changes since oracle-selinux-0.1.23.30-1:
Jan Pazdziora (1):
Automatic commit of package [oracle-xe-selinux] release [10.2.0.22-1].
---
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 9 months
rel-eng/packages selinux/oracle-xe-selinux
by Jan Pazdziora
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2ec9fd5fbd9dc41bd3eb9a6659ee4403e58605f3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:01:42 2011 +0200
Automatic commit of package [oracle-xe-selinux] release [10.2.0.22-1].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index d1e57d5..0c5c689 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.22-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..4f2594d 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.22
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.22-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.
12 years, 9 months
Changes to 'refs/tags/osad-5.10.19-1'
by Jan Pazdziora
Tag 'osad-5.10.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-21 07:01 +0000
Tagging package [osad] version [5.10.19-1] in directory [client/tools/osad/].
Changes since spacewalk-utils-1.6.1-1:
Jan Pazdziora (2):
Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
Automatic commit of package [osad] release [5.10.19-1].
---
client/tools/osad/osad.spec | 12 +++-------
rel-eng/packages/osad | 2 -
selinux/oracle-selinux/oracle-selinux.spec | 7 -----
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 7 -----
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 7 -----
selinux/spacewalk-selinux/spacewalk-selinux.spec | 7 -----
6 files changed, 5 insertions(+), 37 deletions(-)
---
12 years, 9 months
Changes to 'refs/tags/oracle-selinux-0.1.23.30-1'
by Jan Pazdziora
Tag 'oracle-selinux-0.1.23.30-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-21 07:01 +0000
Tagging package [oracle-selinux] version [0.1.23.30-1] in directory [selinux/oracle-selinux/].
Changes since spacewalk-utils-1.6.1-1:
Jan Pazdziora (3):
Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
Automatic commit of package [osad] release [5.10.19-1].
Automatic commit of package [oracle-selinux] release [0.1.23.30-1].
---
client/tools/osad/osad.spec | 12 +++-------
rel-eng/packages/oracle-selinux | 2 -
rel-eng/packages/osad | 2 -
selinux/oracle-selinux/oracle-selinux.spec | 12 +++-------
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 7 -----
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 7 -----
selinux/spacewalk-selinux/spacewalk-selinux.spec | 7 -----
7 files changed, 10 insertions(+), 39 deletions(-)
---
12 years, 9 months
2 commits - client/tools rel-eng/packages selinux/oracle-selinux
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/oracle-selinux | 2 +-
rel-eng/packages/osad | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 5116b80c15eae0ff13b2536d1d38700d4dc75cbb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:01:21 2011 +0200
Automatic commit of package [oracle-selinux] release [0.1.23.30-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index 4368cb3..4ba900f 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.30-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 19b451b..2d8a517 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.30
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.30-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 c5a8adc5456e59044d00c23d5373a4a9fa2c0a3e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 21 09:01:07 2011 +0200
Automatic commit of package [osad] release [5.10.19-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index d67f070..ab099f7 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.19
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.19-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..da95355 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.18-1 client/tools/osad/
+5.10.19-1 client/tools/osad/
12 years, 9 months
client/tools selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-selinux
by Jan Pazdziora
client/tools/osad/osad.spec | 7 -------
selinux/oracle-selinux/oracle-selinux.spec | 7 -------
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 7 -------
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 7 -------
selinux/spacewalk-selinux/spacewalk-selinux.spec | 7 -------
5 files changed, 35 deletions(-)
New commits:
commit d0b8a451ad23c5818bec078bc74895a21c4f9a44
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.
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 896b3bf..121e3b3 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 0573eef..9da3b35 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
12 years, 9 months