schema/spacewalk
by Michael Mraka
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.py | 133 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.sql | 69 +++++
2 files changed, 69 insertions(+), 133 deletions(-)
New commits:
commit c3d8460c67974b988ff25b30521dbc35ba7ea2ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 26 15:05:08 2010 +0200
593896 - schema upgrade script rewritten to pl/sql
therefore we can use standard spacewalk-schema-upgrade process for it
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.py b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.py
deleted file mode 100755
index 5e0c10c..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-#
-# Test for blob updates
-#
-# $Id$
-
-"""
-This script is meant to be used by spacewalk users upgrading from Satellite 530 to 540
-or spacewalk 1.1 to 1.2.
-The schema storing the Kickstart Partition informatino was updated between spacewalk 1.1 to 1.2
-from a bunch of commands holding the partition info to one blob holding the partition info in rhnKsData
-
-This script extracts partitioning specific commands and arguments from kickstart commands and merges them onto one blob
-for the kickstart data.
-
-It acquires the database information from rhn.conf
-
-"""
-
-import sys
-sys.path.insert(0, "/usr/share/rhn")
-from common.rhnConfig import CFG, initCFG
-from server import rhnSQL
-from server.importlib.backendLib import Table, DBblob, DBint, TableUpdate, \
- TableInsert
-from pprint import pprint
-from os.path import isabs
-import sys
-
-def gen_part_line(cname, arg):
- tokens = list(arg.split())
- if not tokens:
- return ""
- if tokens[0][:4] == "swap":
- tokens[0] = "swap"
- cmds = dict ( partitions = "part",
- raids = "raid",
- volgroups = "volgroup",
- logvols = "logvol",
- include = "%include",
- custom_partition = "")
- return ("%s %s" % (cmds[cname], " ".join(tokens))).strip()
-
-def generate_partition_snippet(kickstart):
- lines = [gen_part_line(row['name'], row['arguments']) for row in kickstart["commands"]]
- return "\n".join(lines)
-
-def setup_db():
- initCFG('server.satellite')
- db_backend = CFG.DB_BACKEND
- db_host = CFG.DB_HOST
- db_port = CFG.DB_PORT
- db_user = CFG.DB_user
- db_password = CFG.DB_PASSWORD
- database = CFG.DB_NAME
- rhnSQL.initDB(backend=db_backend, host=db_host, port=db_port,
- username=db_user, password=db_password, database=database)
-
-def main():
- setup_db()
- print "================="
- print "Updating Kickstart Commands"
- q = """select distinct ks.id, ks.org_id
- from rhnksData ks
- inner join rhnKickstartCommand kc on kc.KICKSTART_ID = ks.id
- inner join rhnKickstartCommandName kcn on kcn.id = kc.KS_COMMAND_NAME_ID
- where
- kcn.name in ('partitions','raids',
- 'volgroups','logvols','include','custom_partition')
- order by ks.org_id
- """
- h = rhnSQL.prepare(q)
- h.execute()
- results = h.fetchall_dict()
- if results:
- kickstarts = []
-
- for row in results:
- kickstart = dict(id = row["id"])
- kickstarts.append(kickstart)
-
-
- q_commands = rhnSQL.prepare("""
- select kcn.name, kc.arguments
- from rhnKickstartCommand kc
- inner join rhnKickstartCommandName kcn on kcn.id = kc.KS_COMMAND_NAME_ID
- where
- kcn.name in ('partitions','raids', 'volgroups','logvols','include','custom_partition')
- and kc.kickstart_id=:id
- order by kcn.sort_order""")
-
- for kickstart in kickstarts:
- q_commands.execute(**kickstart)
- kickstart ['commands'] = q_commands.fetchall_dict()
- kickstart ['partition'] = generate_partition_snippet(kickstart)
-
- q_add_empty_blob = rhnSQL.prepare ("""update rhnKSData set partition_data = empty_blob() where id = :id """)
- q_update_ksdata = rhnSQL.prepare ("""select partition_data from rhnKsData where id = :id for update """)
- for kickstart in kickstarts:
- q_add_empty_blob.execute(id = kickstart['id'])
- q_update_ksdata.execute(id = kickstart['id'])
- data = q_update_ksdata.fetchone_dict()['partition_data']
- data.write(kickstart ['partition'])
-
- q_delete_old_commands = rhnSQL.prepare("""delete from rhnKickstartCommand
- where KS_COMMAND_NAME_ID in
- (select id from rhnKickstartCommandName where name in ('partitions','raids', 'volgroups','logvols','include','custom_partition'))""")
- q_delete_old_commands.execute()
-
- q_delete_old_command_names = rhnSQL.prepare("""delete from rhnKickstartCommandName where name in ('partitions','raids', 'volgroups','logvols','include','custom_partition')""")
- q_delete_old_command_names.execute()
-
- rhnSQL.commit()
- rhnSQL.closeDB()
- print "Update completed."
- print "================="
-
-if __name__ == '__main__':
- sys.exit(main() or 0)
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.sql
new file mode 100644
index 0000000..a79600b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.sql
@@ -0,0 +1,69 @@
+declare
+ lob_data blob;
+
+ function gen_part_line(cname in varchar2, arg in varchar2)
+ return varchar2
+ is
+ ret varchar2(4000);
+ begin
+ ret := case cname
+ when 'partitions' then 'part'
+ when 'raids' then 'raid'
+ when 'volgroups' then 'volgroup'
+ when 'logvols' then 'logvol'
+ when 'include' then '%include'
+ when 'custom_partition' then NULL
+ end;
+ if arg like 'swap%'
+ and arg not like 'swap %'
+ and arg not like 'swap.%' then
+ ret := ret || ' swap' || substr(arg, instr(arg,' '));
+ else
+ ret := ret || ' ' || arg;
+ end if;
+ return trim(ret);
+ end gen_part_line;
+
+begin
+ for kickstart in (
+ select distinct kc.kickstart_id
+ from rhnKickstartCommand kc
+ inner join rhnKickstartCommandName kcn
+ on kcn.id = kc.ks_command_name_id
+ where kcn.name in ('partitions', 'raids', 'volgroups', 'logvols', 'include', 'custom_partition')
+ order by kc.kickstart_id
+ ) loop
+
+ update rhnKSData
+ set partition_data = empty_blob()
+ where id = kickstart.kickstart_id
+ returning partition_data into lob_data;
+
+ for command in (
+ select kcn.name, kc.arguments
+ from rhnKickstartCommand kc
+ inner join rhnKickstartCommandName kcn
+ on kcn.id = kc.ks_command_name_id
+ where kcn.name in ('partitions', 'raids', 'volgroups', 'logvols', 'include', 'custom_partition')
+ and kc.kickstart_id = kickstart.kickstart_id
+ order by kcn.sort_order
+ ) loop
+ if length(lob_data) > 0 then
+ dbms_lob.append(lob_data, utl_raw.cast_to_raw(chr(10)));
+ end if;
+ dbms_lob.append(lob_data, utl_raw.cast_to_raw(gen_part_line(command.name, command.arguments)));
+ end loop;
+
+ end loop;
+
+ delete from rhnKickstartCommand
+ where ks_command_name_id in (
+ select id
+ from rhnKickstartCommandName
+ where name in ('partitions','raids', 'volgroups','logvols','include','custom_partition'));
+
+ delete from rhnKickstartCommandName
+ where name in ('partitions', 'raids', 'volgroups', 'logvols', 'include', 'custom_partition');
+
+end;
+/
13 years, 8 months
schema/spacewalk
by Tomas Lestach
schema/spacewalk/common/views/rhnChannelNewestPackageView.sql | 14 +++++-----
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql | 10 ++++---
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit 3ee019bf93bdd80315ab3f165f729272e284cde7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 26 15:05:16 2010 +0200
fixed definition of rhnChannelNewestPackageView
when fixing 591291 (commit e1569a9a6a3e27c99f1125b6f5c12c47836947fd) we found out, rhnChannelNewestPackageView doesn't take architecture into account
diff --git a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
index 8ae309d..0e2326e 100644
--- a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
+++ b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
@@ -7,10 +7,10 @@
-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-- along with this software; if not, see
-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
+--
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
+-- in this software or its documentation.
--
--
--
@@ -22,23 +22,25 @@ rhnChannelNewestPackageView
as
SELECT m.channel_id as channel_id,
p.name_id as name_id,
- pe.id as evr_id,
- p.package_arch_id as package_arch_id,
+ p.evr_id as evr_id,
+ m.package_arch_id as package_arch_id,
p.id as package_id
FROM
(select max(pe.evr) AS max_evr,
cp.channel_id,
- p.name_id
+ p.name_id,
+ p.package_arch_id
from rhnPackageEVR pe,
rhnPackage p,
rhnChannelPackage cp
where p.evr_id = pe.id
and cp.package_id = p.id
- group by cp.channel_id, p.name_id) m,
+ group by cp.channel_id, p.name_id, p.package_arch_id) m,
rhnPackageEVR pe,
rhnPackage p
WHERE m.max_evr = pe.evr
AND m.name_id = p.name_id
+AND m.package_arch_id = p.package_arch_id
AND p.evr_id = pe.id
;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql
index d6b2292..f852ea8 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql
@@ -3,22 +3,24 @@ rhnChannelNewestPackageView
as
SELECT m.channel_id as channel_id,
p.name_id as name_id,
- pe.id as evr_id,
- p.package_arch_id as package_arch_id,
+ p.evr_id as evr_id,
+ m.package_arch_id as package_arch_id,
p.id as package_id
FROM
(select max(pe.evr) AS max_evr,
cp.channel_id,
- p.name_id
+ p.name_id,
+ p.package_arch_id
from rhnPackageEVR pe,
rhnPackage p,
rhnChannelPackage cp
where p.evr_id = pe.id
and cp.package_id = p.id
- group by cp.channel_id, p.name_id) m,
+ group by cp.channel_id, p.name_id, p.package_arch_id) m,
rhnPackageEVR pe,
rhnPackage p
WHERE m.max_evr = pe.evr
AND m.name_id = p.name_id
+AND m.package_arch_id = p.package_arch_id
AND p.evr_id = pe.id
;
13 years, 8 months
spacewalk/admin
by Jan Pazdziora
spacewalk/admin/rhn-populate-database.pl | 1 +
1 file changed, 1 insertion(+)
New commits:
commit ec440206d21021c2ba8fdedf3dc9e2b6f1f31386
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 14:50:51 2010 +0200
626420 - chdir to root to stop sqlplus from searching the mounted devices.
Addressing:
type=AVC msg=audit(1282053398.115:107): avc: denied { search } for pid=31426 comm="sqlplus" name="/" dev=loop0 ino=1792 scontext=root:system_r:oracle_sqlplus_t:s0 tcontext=system_u:object_r:iso9660_t:s0 tclass=dir
and
type=AVC msg=audit(1282825371.899:619): avc: denied { search } for pid=4145 comm="sqlplus" name="mnt" dev=dm-0 ino=4812193 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=system_u:object_r:mnt_t:s0 tclass=dir
diff --git a/spacewalk/admin/rhn-populate-database.pl b/spacewalk/admin/rhn-populate-database.pl
index fd2d830..d24b9c4 100755
--- a/spacewalk/admin/rhn-populate-database.pl
+++ b/spacewalk/admin/rhn-populate-database.pl
@@ -105,6 +105,7 @@ if ($postgresql) {
$ENV{PGPASSWORD} = $password;
} else {
print "*** Installing Oracle schema from [$schema_deploy_file].\n";
+ chdir('/');
@command = ( 'sqlplus', "$user/$password\@$database", "\@$schema_deploy_file" );
}
13 years, 8 months
3 commits - spacewalk/admin spacewalk/setup
by Jan Pazdziora
spacewalk/admin/rhn-populate-database.pl | 24 ++++--------------------
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 --
2 files changed, 4 insertions(+), 22 deletions(-)
New commits:
commit e22f751025e770e425321a5517accf1bf3acd48d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 14:50:51 2010 +0200
As we never fork now, the --nofork is obsolete, removing.
diff --git a/spacewalk/admin/rhn-populate-database.pl b/spacewalk/admin/rhn-populate-database.pl
index dea334a..fd2d830 100755
--- a/spacewalk/admin/rhn-populate-database.pl
+++ b/spacewalk/admin/rhn-populate-database.pl
@@ -31,7 +31,7 @@ use Symbol qw(gensym);
my $usage = "usage: $0 [ --host=<databaseHost> [ --port=<port> ] ] --database=<databaseName> \\\n"
. " --user=<username> --password=<password> --schema-deploy-file=<filename> \\\n"
- . " [ --log=<logfile> ] [ --clear-db ] [ --nofork ] [ --postgresql ] [ --help ]\n";
+ . " [ --log=<logfile> ] [ --clear-db ] [ --postgresql ] [ --help ]\n";
my $user = '';
my $password = '';
@@ -42,7 +42,6 @@ my $port = '';
my $schema_deploy_file = '';
my $log_file;
my $clear_db = 0;
-my $nofork = 0;
my $postgresql = 0;
my $help = '';
@@ -50,7 +49,7 @@ GetOptions("host=s" => \$host, "port=s" => \$port,
"user=s" => \$user, "password=s" => \$password,
"database=s" => \$database, "schema-deploy-file=s" => \$schema_deploy_file,
"log=s" => \$log_file, "help" => \$help, "clear-db" => \$clear_db,
- "postgresql" => \$postgresql, nofork => \$nofork);
+ "postgresql" => \$postgresql);
if ($help
or not ($user and $password and $database and $schema_deploy_file)) {
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 636938e..3896789 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -824,7 +824,6 @@ sub postgresql_populate_db {
sprintf('--host=%s', @{$answers}{'db-host'}),
sprintf('--port=%s', @{$answers}{'db-port'}),
sprintf("--schema-deploy-file=$sat_schema_deploy"),
- sprintf('--nofork'),
sprintf('--postgresql'),
);
@@ -1309,7 +1308,6 @@ sub oracle_populate_db {
sprintf('--database=%s', @{$answers}{'db-name'}),
sprintf('--host=%s', @{$answers}{'db-host'}),
sprintf("--schema-deploy-file=$sat_schema_deploy"),
- sprintf('--nofork'),
);
commit c40d2388ef55418ce4acbfd173890efd1d945f9b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 14:49:39 2010 +0200
We do not call the schema population from WebUI, no forking.
diff --git a/spacewalk/admin/rhn-populate-database.pl b/spacewalk/admin/rhn-populate-database.pl
index 28332f8..dea334a 100755
--- a/spacewalk/admin/rhn-populate-database.pl
+++ b/spacewalk/admin/rhn-populate-database.pl
@@ -87,18 +87,6 @@ if (defined $log_file and -e $log_file) {
}
}
-my $pid;
-
-unless ($nofork) {
- $pid = fork();
-}
-
-# The parent process will exit so the child can do the work without
-# blocking the web UI.
-if ($pid) {
- exit 0;
-}
-
if ($clear_db) {
RHN::SatInstall->clear_db();
}
@@ -121,6 +109,8 @@ if ($postgresql) {
@command = ( 'sqlplus', "$user/$password\@$database", "\@$schema_deploy_file" );
}
+my $pid;
+
if (defined $log_file) {
local *LOGFILE;
open(LOGFILE, ">", $log_file) or die "Error writing log file '$log_file': $OS_ERROR";
commit cc7ac454d6f9636652e97df238b753ff03373e83
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 14:46:45 2010 +0200
The dbhome is not needed as we are using the InstantClient sqlplus.
diff --git a/spacewalk/admin/rhn-populate-database.pl b/spacewalk/admin/rhn-populate-database.pl
index 7e98d11..28332f8 100755
--- a/spacewalk/admin/rhn-populate-database.pl
+++ b/spacewalk/admin/rhn-populate-database.pl
@@ -57,11 +57,6 @@ if ($help
die $usage;
}
-if (not $postgresql) {
- my $ORACLE_HOME = qx{dbhome '*'};
- $ENV{PATH} .= ":$ORACLE_HOME/bin";
-}
-
our $lockfile = '/var/lock/subsys/rhn-satellite-db-population';
if (-e $lockfile) {
warn "lock file $lockfile present...database population already in progress\n";
13 years, 8 months
web/html
by Colin Coe
web/html/nav/duplicate_systems_tabs.xml | 14 ++++++++++++++
web/html/nav/sitenav-authenticated.xml | 7 +++++++
2 files changed, 21 insertions(+)
New commits:
commit 80b30f51cca67b74172b9fac93de53204293b29d
Author: Colin Coe <coec(a)war.coesta.com>
Date: Thu Aug 26 20:42:08 2010 +0800
621479 - Fix missing duplicates menu
diff --git a/web/html/nav/duplicate_systems_tabs.xml b/web/html/nav/duplicate_systems_tabs.xml
new file mode 100644
index 0000000..8d710d6
--- /dev/null
+++ b/web/html/nav/duplicate_systems_tabs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="duplicate_tabs" invisible="1" title-depth="1"
+formvar="inactive_count"
+ acl_mixins="RHN::Access::Action">
+ <rhn-tab name="duplicate.systems.nav.ips">
+ <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.hostname">
+ <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.mac_address">
+ <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index 74cb5af..8d49375 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -30,6 +30,13 @@
<rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/>
<rhn-tab name="Recently Registered" url="/rhn/systems/Registered.do"/>
<rhn-tab name="Proxy" url="/rhn/systems/ProxyList.do" acl="org_channel_family(rhn-proxy); user_role(org_admin)"/>
+ <rhn-tab name="Duplicate Systems" url="/rhn/systems/DuplicateIPList.do">
+ <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateSystemsCompare.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Currency" url="/rhn/systems/SystemCurrency.do"/>
</rhn-tab>
<rhn-tab name="System Groups" acl="org_entitlement(sw_mgr_enterprise)">
<rhn-tab-directory>/rhn/systems/groups</rhn-tab-directory>
13 years, 8 months
Changes to 'refs/tags/oracle-selinux-0.1-23.18'
by Jan Pazdziora
Tag 'oracle-selinux-0.1-23.18' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-08-26 12:19 +0000
Tagging package [oracle-selinux] version [0.1-23.18] in directory [selinux/oracle-selinux/].
Changes since spacewalk-java-1.2.16-1:
Jan Pazdziora (3):
Sort the available channels so that the listing is not random.
Require newer selinux-policy-base to get configfile.
Automatic commit of package [oracle-selinux] minor release [0.1-23.18].
Tomas Lestach (1):
upgrade script for rhnChannelNewestPackageView
---
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 2
rel-eng/packages/oracle-selinux | 2
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql | 24 ++++++++++
selinux/oracle-selinux/oracle-selinux.spec | 7 ++
4 files changed, 31 insertions(+), 4 deletions(-)
---
13 years, 8 months
2 commits - rel-eng/packages selinux/oracle-selinux
by Jan Pazdziora
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 0d17fd8e873c8fc576fdfdc1d763c68b85c1a7e6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 14:19:49 2010 +0200
Automatic commit of package [oracle-selinux] minor release [0.1-23.18].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index 5aa29a1..cf1888a 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1-23.17 selinux/oracle-selinux/
+0.1-23.18 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 7dbc233..ef73c4f 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -20,7 +20,7 @@
Name: oracle-selinux
Version: 0.1
-Release: 23.17%{?obtag}%{?dist}%{?repo}
+Release: 23.18%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
License: GPLv2+
@@ -208,6 +208,9 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Thu Aug 26 2010 Jan Pazdziora 0.1-23.18
+- Require newer selinux-policy-base to get configfile.
+
* Mon Aug 09 2010 Jan Pazdziora 0.1-23.17
- 621912 - Requires of -base is better than -targeted.
commit 770000997879d536939fddd45bd30f39550076e2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 14:17:52 2010 +0200
Require newer selinux-policy-base to get configfile.
Addressing
libsepol.print_missing_requirements: oracle-nofcontext's global requirements were not met: type/attribute configfile
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 0c0f22e..7dbc233 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -50,7 +50,7 @@ Group: System Environment/Base
Requires: selinux-policy >= %{selinux_policyver}
%endif
%if 0%{?rhel} == 5
-Requires: selinux-policy-base >= 2.4.6-80
+Requires: selinux-policy-base >= 2.4.6-267
%endif
Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
13 years, 8 months
schema/spacewalk
by Tomas Lestach
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql | 24 ++++++++++
1 file changed, 24 insertions(+)
New commits:
commit 3b139b94d788e579d4822ca1203c8a4a1c844102
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 26 13:50:49 2010 +0200
upgrade script for rhnChannelNewestPackageView
belongs to commit e1569a9a6a3e27c99f1125b6f5c12c47836947fd
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql
new file mode 100644
index 0000000..d6b2292
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql
@@ -0,0 +1,24 @@
+create or replace view
+rhnChannelNewestPackageView
+as
+SELECT m.channel_id as channel_id,
+ p.name_id as name_id,
+ pe.id as evr_id,
+ p.package_arch_id as package_arch_id,
+ p.id as package_id
+FROM
+ (select max(pe.evr) AS max_evr,
+ cp.channel_id,
+ p.name_id
+ from rhnPackageEVR pe,
+ rhnPackage p,
+ rhnChannelPackage cp
+ where p.evr_id = pe.id
+ and cp.package_id = p.id
+ group by cp.channel_id, p.name_id) m,
+ rhnPackageEVR pe,
+ rhnPackage p
+WHERE m.max_evr = pe.evr
+AND m.name_id = p.name_id
+AND p.evr_id = pe.id
+;
13 years, 8 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 072420f94fedbe44744380cf8c043baef6340ef2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 13:48:09 2010 +0200
Sort the available channels so that the listing is not random.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 4aa213b..42a6f95 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -454,7 +454,7 @@ class OSReleaseWindow:
width = self.size[0]-10)
toplevel.add(self.channelList, 0, 3)
- for key, value in self.available_channels['channels'].items():
+ for key, value in sorted(self.available_channels['channels'].items(), key=lambda a:a[0]):
if key in self.available_channels['receiving_updates']:
value = value + "*"
self.channelList.append(" " + value, key)
13 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.2.16-1'
by Tomas Lestach
Tag 'spacewalk-java-1.2.16-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-08-26 11:40 +0000
Tagging package [spacewalk-java] version [1.2.16-1] in directory [java/].
Changes since yum-rhn-plugin-1.2.3-1:
Justin Sherrill (9):
619337 - making it so that if a packages checksum changes, the channel it is will have its repodata regenerated
a bunch of unit test fixes
reverting "619337 - making it so that repodata will be scheduled for regeneration on all channels that a package is in." since this logic was moved to a trigger
making taskoamtic api handler be ignored by the api doc generation
619337 - making trigger also delete the repodata for a package if the md5sum changes
updating upgrade script for previous commit
unit test fix
580939 - fixing invalid html with alter channels page
579588 - adding a more stern warning message to activating a ceertificate of a different version
Milan Zazrivec (1):
location of schema overrides (for oracle) has changed
Partha Aji (4):
Fixed struts form bloopered entry
Fixed build.xml to not include config.xml in the build
Update the database manager to include connection configs
Updated rhn-search to include config.xml on the filesystem
Tomas Lestach (4):
fix ErrataQueueTest unit test
591291 - faster handling of mergeErrata API call
591291 - rewrite rhnChannelNewestPackageView
Automatic commit of package [spacewalk-java] release [1.2.16-1].
---
backend/satellite_tools/rhn_satellite_activate.py | 5
backend/server/importlib/backend.py | 24 --
backend/server/importlib/packageImport.py | 12 -
backend/server/taskomatic.py | 13 -
java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java | 13 +
java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java | 12 +
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 9
java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 3
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 1
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 93 +++++++++
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | 25 ++
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java | 10 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/CreateProfileWizardTest.java | 19 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 95 ++++------
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 10 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/taskomatic/TaskomaticHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/taskomatic/TaskomaticOrgHandler.java | 1
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 10 -
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 38 ++++
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 50 +++++
java/code/src/com/redhat/rhn/taskomatic/task/test/ErrataQueueTest.java | 25 ++
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 2
java/spacewalk-java.spec | 12 +
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/views/rhnChannelNewestPackageView.sql | 41 ++--
schema/spacewalk/oracle/triggers/rhnPackage.sql | 6
schema/spacewalk/spacewalk-schema-upgrade | 2
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/003-rhnPackage_triggers.sql | 12 -
search-server/spacewalk-search/build.xml | 2
search-server/spacewalk-search/src/config/rhn-search | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 20 +-
36 files changed, 404 insertions(+), 178 deletions(-)
---
13 years, 8 months