2 commits - projects/oracle-server-scripts rel-eng/packages spacewalk/setup
by Michael Mraka
projects/oracle-server-scripts/create-db.sh | 3 ++-
projects/oracle-server-scripts/embedded-createdb.tmpl | 13 -------------
projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl | 1 -
projects/oracle-server-scripts/embedded-upgradedb.tmpl | 1 -
projects/oracle-server-scripts/oracle-server-scripts.spec | 5 ++++-
rel-eng/packages/oracle-server-scripts | 2 +-
spacewalk/setup/share/oracle/upgrade-db.sh | 5 +++--
7 files changed, 10 insertions(+), 20 deletions(-)
New commits:
commit 2e92bd199e8d807ee64524495a57f8f24d00796d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 30 16:11:54 2011 +0200
Automatic commit of package [oracle-server-scripts] release [10.2.0.54-1].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index a63c23d..3cdcf9a 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -8,7 +8,7 @@
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
-Version: 10.2.0.53
+Version: 10.2.0.54
Release: 1%{?dist}
Source0: oracle-home.sh
Source1: init-params.ora
@@ -100,6 +100,9 @@ exit 0
%{oracle_scripts}
%changelog
+* Wed Mar 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.54-1
+- oracle_sqlplus_t is not able to write to logs
+
* Tue Mar 22 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.53-1
- new m4 (1.4.13-5) insists on having defines before template
diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts
index 80412b1..c04f74d 100644
--- a/rel-eng/packages/oracle-server-scripts
+++ b/rel-eng/packages/oracle-server-scripts
@@ -1 +1 @@
-10.2.0.53-1 projects/oracle-server-scripts/
+10.2.0.54-1 projects/oracle-server-scripts/
commit 92688d1930b4da0dc9bf60159b7752f13b6b2e13
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 30 16:05:04 2011 +0200
oracle_sqlplus_t is not able to write to logs
fixing
type=AVC msg=audit(1301493420.034:1814): avc: denied { write } for
pid=11246 comm="sqlplus"
path="/rhnsat/admin/rhnsat/logs/create_rhnsat.log" dev=dm-0 ino=917523
scontext=unconfined_u:unconfined_r:oracle_sqlplus_t:s0-s0:c0.c1023
tcontext=unconfined_u:object_r:oracle_common_log_t:s0 tclass=file
diff --git a/projects/oracle-server-scripts/create-db.sh b/projects/oracle-server-scripts/create-db.sh
index ddebc5c..85617c6 100755
--- a/projects/oracle-server-scripts/create-db.sh
+++ b/projects/oracle-server-scripts/create-db.sh
@@ -295,7 +295,6 @@ function m4_macros() {
if [ -z "$db" ] ; then return ; fi
echo -I $Oracle/admin/$OracleVersionShort \
--define RHNORA_ADMIN_PATH=$AdminDB \
- --define RHNORA_LOG_PATH=RHNORA_ADMIN_PATH/logs \
--define RHNORA_DBNAME=$db \
--define RHNORA_DATA_PATH=$DataDB \
--define RHNORA_ORACLE_HOME=$ORACLE_HOME \
@@ -308,7 +307,9 @@ function CreateDatabase() {
db=$2
if [ -z "$db" ] ; then return ; fi
+ # sqlplus ... | cat ... is here to fool selinux, since oracle_sqlplus_t
m4 $(m4_macros $db) $template | $ORACLE_HOME/bin/sqlplus /nolog \
+ | cat >$AdminDB/logs/create_$db.log \
|| exit $?
}
diff --git a/projects/oracle-server-scripts/embedded-createdb.tmpl b/projects/oracle-server-scripts/embedded-createdb.tmpl
index f2b7df4..945f449 100644
--- a/projects/oracle-server-scripts/embedded-createdb.tmpl
+++ b/projects/oracle-server-scripts/embedded-createdb.tmpl
@@ -1,6 +1,5 @@
include(`rhnora.m4')
-spool RHNORA_CREATELOG(RHNORA_DBNAME) replace
set echo on
set term on
set pagesize 10000
@@ -86,33 +85,23 @@ set term off
whenever sqlerror continue
select 'rdbms/admin/catalog.sql' script from dual;
-spool RHNORA_CREATELOG(catalog)
@?/rdbms/admin/catalog.sql
-spool RHNORA_CREATELOG(RHNORA_DBNAME) append
select 'rdbms/admin/catblock.sql' script from dual;
-spool RHNORA_CREATELOG(catblock)
@?/rdbms/admin/catblock.sql
-spool RHNORA_CREATELOG(RHNORA_DBNAME) append
select 'rdbms/admin/catproc.sql' script from dual;
-spool RHNORA_CREATELOG(catproc)
@?/rdbms/admin/catproc.sql
-spool RHNORA_CREATELOG(RHNORA_DBNAME) append
select 'rdbms/admin/owminst.plb' script from dual;
-spool RHNORA_CREATELOG(owminst)
@?/rdbms/admin/owminst.plb
-spool RHNORA_CREATELOG(RHNORA_DBNAME) append
whenever sqlerror exit failure
connect system/RHNORA_DB_PASSWORD
whenever sqlerror continue
select 'sqlplus/admin/pupbld.sql' script from dual;
-spool RHNORA_CREATELOG(pupbld)
@?/sqlplus/admin/pupbld.sql
-spool RHNORA_CREATELOG(RHNORA_DBNAME) append
-- back to our code
set echo on
@@ -155,9 +144,7 @@ grant create trigger to RHNORA_DB_USER;
connect RHNORA_DB_USER/RHNORA_DB_PASSWORD
select 'rdbms/admin/utlxplan.sql' script from dual;
-spool RHNORA_CREATELOG(utlxplan)
@?/rdbms/admin/utlxplan.sql
-spool RHNORA_CREATELOG(RHNORA_DBNAME) append
disconnect
diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
index 609c9de..fc1754a 100644
--- a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
+++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl
@@ -5,7 +5,6 @@ include(`rhnora.m4')
--
-spool RHNORA_CREATELOG(RHNORA_DBNAME-10g-10g-upgrade) replace
set echo on
set term on
set pagesize 10000
diff --git a/projects/oracle-server-scripts/embedded-upgradedb.tmpl b/projects/oracle-server-scripts/embedded-upgradedb.tmpl
index b0c924e..89f17b4 100644
--- a/projects/oracle-server-scripts/embedded-upgradedb.tmpl
+++ b/projects/oracle-server-scripts/embedded-upgradedb.tmpl
@@ -5,7 +5,6 @@ include(`rhnora.m4')
--
-spool RHNORA_CREATELOG(RHNORA_DBNAME-9i-10g-upgrade) replace
set echo on
set term on
set pagesize 10000
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
index d7de872..3715fc1 100644
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ b/spacewalk/setup/share/oracle/upgrade-db.sh
@@ -107,11 +107,12 @@ else
UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl
fi
+# sqlplus ... | cat ... is here to fool selinux, since oracle_sqlplus_t
m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \
--define RHNORA_DBNAME=$ORACLE_SID \
- --define RHNORA_LOG_PATH=/rhnsat/admin/rhnsat/logs \
--define RHNORA_DATA_PATH=/rhnsat/data/rhnsat \
--define RHNORA_DB_USER=$DB_USER \
- | $ORACLE_HOME/bin/sqlplus /nolog
+ | $ORACLE_HOME/bin/sqlplus /nolog \
+ | cat /rhnsat/admin/rhnsat/logs/create_$ORACLE_SID.log
set +x
13 years
Changes to 'refs/tags/oracle-selinux-0.1.23.25-1'
by Michael Mraka
Tag 'oracle-selinux-0.1.23.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-30 13:12 +0000
Tagging package [oracle-selinux] version [0.1.23.25-1] in directory [selinux/oracle-selinux/].
Changes since spacewalk-java-1.4.24-1:
Michael Mraka (1):
Automatic commit of package [oracle-selinux] release [0.1.23.25-1].
---
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages selinux/oracle-selinux
by Michael Mraka
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 75b005170a26a958a0f1db3fe2d5d92018cc5637
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 30 15:12:03 2011 +0200
Automatic commit of package [oracle-selinux] release [0.1.23.25-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index 9eb17ce..7374046 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1.23.24-1 selinux/oracle-selinux/
+0.1.23.25-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 05980b9..e42d0a4 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.24
+Version: 0.1.23.25
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
+* Wed Mar 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 0.1.23.25-1
+- allow unconfined_r to run oracle_lsnrctl_t, oracle_tnslsnr_t and oracle_db_t
+
* Fri Jan 28 2011 Jan Pazdziora 0.1.23.24-1
- Move the oracle_port_t to separate SELinux policy module.
13 years
Changes to 'refs/tags/spacewalk-java-1.4.24-1'
by Michael Mraka
Tag 'spacewalk-java-1.4.24-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-30 13:10 +0000
Tagging package [spacewalk-java] version [1.4.24-1] in directory [java/].
Changes since spacewalk-backend-1.4.25-1:
Michael Mraka (3):
jakarta-commons-io is unused once jakarta-commons-fileupload is gone
oracle-selinux: allow unconfined_r to run oracle_lsnrctl_t, oracle_tnslsnr_t and oracle_db_t
Automatic commit of package [spacewalk-java] release [1.4.24-1].
---
java/buildconf/build-props.xml | 6 +++---
java/ivy.xml | 1 -
java/spacewalk-java.spec | 8 ++++----
rel-eng/packages/spacewalk-java | 2 +-
selinux/oracle-selinux/oracle.te | 3 +++
5 files changed, 11 insertions(+), 9 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 70abe77a890d357b5fe982136b64ca64f57b2399
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 30 15:10:49 2011 +0200
Automatic commit of package [spacewalk-java] release [1.4.24-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ed8f3a6..fd32ba5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.23
+Version: 1.4.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -532,6 +532,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Mar 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.24-1
+- jakarta-commons-io is unused once jakarta-commons-fileupload is gone
+
* Wed Mar 30 2011 Miroslav Suchý 1.4.23-1
- 683200 - convert IDN hostname in webUI from Pune encoding
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index aa0e5bc..262ede1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.23-1 java/
+1.4.24-1 java/
13 years
2 commits - java/buildconf java/ivy.xml java/spacewalk-java.spec selinux/oracle-selinux
by Michael Mraka
java/buildconf/build-props.xml | 6 +++---
java/ivy.xml | 1 -
java/spacewalk-java.spec | 3 ---
selinux/oracle-selinux/oracle.te | 3 +++
4 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 6327219d558b05769525184df28bbab4adfdbbc5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 30 14:12:54 2011 +0200
oracle-selinux: allow unconfined_r to run oracle_lsnrctl_t, oracle_tnslsnr_t and oracle_db_t
Needed on RHEL6 to run listener and create database as oracle user
unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
(on RHEL5 oracle user is root:system_r:unconfined_t:SystemLow-SystemHigh)
diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/oracle.te
index fe2973a..f7ecabe 100644
--- a/selinux/oracle-selinux/oracle.te
+++ b/selinux/oracle-selinux/oracle.te
@@ -199,6 +199,9 @@ tunable_policy(`oracle_11g_support',`
')
role unconfined_r types oracle_sqlplus_t;
+role unconfined_r types oracle_lsnrctl_t;
+role unconfined_r types oracle_tnslsnr_t;
+role unconfined_r types oracle_db_t;
optional_policy(`
gen_require(`
commit 6a5ddd2cee571f2292bda4ab9aca3a4452545343
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 29 13:39:29 2011 +0200
jakarta-commons-io is unused once jakarta-commons-fileupload is gone
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index f5a053e..957aff1 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -61,12 +61,12 @@
<property name="common.jar.dependencies"
value="bcel cglib commons-beanutils commons-cli commons-codec
commons-collections commons-digester commons-discovery
- commons-el commons-lang commons-logging commons-io commons-validator hibernate3
+ commons-el commons-lang commons-logging commons-validator hibernate3
mailapi smtp jdom jpam
log4j oro redstone-xmlrpc-client redstone-xmlrpc ${struts-jars} ${tomcat-jars}
bcprov bcpg jcommon stringtree-json postgresql-jdbc
${jfreechart} taglibs-core logdriver quartz dwr slf4j-api slf4j-log4j12
- commons-io concurrent velocity simple-core" />
+ concurrent velocity simple-core" />
<property name="test.jar.dependencies"
value="antlr checkstyle dom4j emma emma_ant jdom jta junit
@@ -117,7 +117,7 @@
value="antlr ${asm} bcel c3p0 cglib
commons-collections commons-beanutils commons-cli commons-codec
commons-digester commons-discovery commons-el
- commons-io commons-lang commons-logging
+ commons-lang commons-logging
commons-validator concurrent dom4j hibernate3 jta
jaf ${jasper-jars} javamail jcommon jdom ${other-jars}
${jfreechart} ${tomcat-jars} jpam log4j redstone-xmlrpc-client redstone-xmlrpc
diff --git a/java/ivy.xml b/java/ivy.xml
index c5bccd4..f9c065e 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -21,7 +21,6 @@
<dependency org="redhat" name="commons-httpclient" rev="3.0" />
<dependency org="redhat" name="commons-lang" rev="2.1" />
<dependency org="redhat" name="commons-logging" rev="1.0.4" />
- <dependency org="redhat" name="commons-io" rev="1.3.2" />
<dependency org="redhat" name="commons-validator" rev="1.1.4" />
<dependency org="redhat" name="concurrent" rev="1.3.2" />
<dependency org="redhat" name="dom4j" rev="1.6.1" />
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6b2f934..ed8f3a6 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -51,7 +51,6 @@ Requires: jakarta-commons-codec
Requires: jakarta-commons-discovery
Requires: jakarta-commons-cli
Requires: jakarta-commons-el
-Requires: jakarta-commons-io
Requires: jakarta-taglibs-standard
Requires: jcommon
Requires: jpam
@@ -118,7 +117,6 @@ BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-discovery
BuildRequires: jakarta-commons-el
-BuildRequires: jakarta-commons-io
BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-taglibs-standard
BuildRequires: jcommon
@@ -425,7 +423,6 @@ fi
%{jardir}/commons-digester.jar
%{jardir}/commons-discovery.jar
%{jardir}/commons-el.jar
-%{jardir}/commons-io.jar
%{jardir}/commons-lang.jar
%{jardir}/commons-logging.jar
%{jardir}/commons-validator.jar
13 years
Changes to 'refs/tags/spacewalk-backend-1.4.25-1'
by Michael Mraka
Tag 'spacewalk-backend-1.4.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-30 12:58 +0000
Tagging package [spacewalk-backend] version [1.4.25-1] in directory [backend/].
Changes since spacewalk-java-1.4.23-1:
Michael Mraka (3):
call transports directly
make_evr should accept source parameter
Automatic commit of package [spacewalk-backend] release [1.4.25-1].
---
backend/server/apacheRequest.py | 2 +-
backend/server/rhnLib.py | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 39c44093c72c2894da0e6862b424c7377045ad5a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 30 14:58:05 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.4.25-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e4949e3..f60a026 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.4.24
+Version: 1.4.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Mar 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.25-1
+- make_evr should accept source parameter
+- call transports directly
+
* Wed Mar 30 2011 Miroslav Suchý 1.4.24-1
- always return RPC data in plain string (utf-8 encoded) (msuchy(a)redhat.com)
- 683200 - support IDN
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0ef36ce..c5730fe 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.4.24-1 backend/
+1.4.25-1 backend/
13 years
2 commits - backend/server
by Michael Mraka
backend/server/apacheRequest.py | 2 +-
backend/server/rhnLib.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bbc017bdef195569baf3037dab739eb658c4afb7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 28 16:21:58 2011 +0200
make_evr should accept source parameter
fixing
E1123:978:list_packages_source: Passing unexpected keyword argument
'source' in function call
bug introduced in commit 694813a5ac6a9571609fc3a97a7d4895ee05c132
diff --git a/backend/server/rhnLib.py b/backend/server/rhnLib.py
index 24a6694..7539baf 100644
--- a/backend/server/rhnLib.py
+++ b/backend/server/rhnLib.py
@@ -197,7 +197,7 @@ class CallableObj:
def __call__(self, *args, **kwargs):
return apply(self.func, (self.name, ) + args, kwargs)
-def make_evr(nvre):
+def make_evr(nvre, source=False):
""" IN: 'e:name-version-release' or 'name-version-release:e'
OUT: {'name':name, 'version':version, 'release':release, 'epoch':epoch }
"""
commit 655ace88421dcfa1f0a07416e89256e9109e4d1d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 28 16:16:07 2011 +0200
call transports directly
fixing changes from commit 544e7f4d3f5afa0598fe8db72c165914e2beec1b
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index d6c461b..c9fa8a7 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -291,7 +291,7 @@ class apacheRequest:
compress_response = rhnFlags.test("compress_response")
# Init an output object; we'll use it for sending data in various
# formats
- if isinstance(response, rpclib.transports.File):
+ if isinstance(response, transports.File):
if not hasattr(response.file_obj, 'fileno') and compress_response:
# This is a StringIO that has to be compressed, so read it in
# memory; mark that we don't have to do any xmlrpc encoding
13 years