3 commits - rel-eng/packages schema/spacewalk
by Tomas Lestach
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/oracle/packages/rhn_org.pkb | 1
schema/spacewalk/postgres/packages/rhn_org.pkb | 3
schema/spacewalk/spacewalk-schema.spec | 8
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.oracle | 235 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.postgresql | 98 ++++
6 files changed, 344 insertions(+), 3 deletions(-)
New commits:
commit ede0e5f9b745bdd776b02033127c05e48e63ee0e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 27 12:08:12 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.22-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index db2b839..56437dc 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.21-1 schema/spacewalk/
+1.8.22-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index d8774cb..6490f60 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.21
+Version: 1.8.22
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Apr 27 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.22-1
+- 807283 - fixing postgresql schema and adding appropriate schema upgrade
+ scripts
+- 807283 - remove rhnContentSource row when delete row in oracle pkg
+- add unique constraint on rhnChannelArch.name
+
* Fri Apr 27 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.21-1
- 630953 - make sure that rows are unique before creating unique index
commit 2a4dccd5d80203c3af914d9adc89bb4109267708
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 27 12:04:33 2012 +0200
807283 - fixing postgresql schema and adding appropriate schema upgrade scripts
diff --git a/schema/spacewalk/postgres/packages/rhn_org.pkb b/schema/spacewalk/postgres/packages/rhn_org.pkb
index 17e998a..31a7d96 100644
--- a/schema/spacewalk/postgres/packages/rhn_org.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_org.pkb
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 e8e55338cd17ae9a27047273569e9aa4ab86e4a0
+-- oracle equivalent source sha1 48f766d7e2ec61890c48645c66978f81eab2cdbe
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
@@ -103,6 +103,7 @@ create or replace function delete_org (
delete from rhn_redirects where customer_id = org_id_in;
delete from rhn_sat_cluster where customer_id = org_id_in;
delete from rhn_schedules where customer_id = org_id_in;
+ delete from rhnContentSource where org_id = org_id_in;
-- Delete the org.
delete from web_customer where id = org_id_in;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.oracle
new file mode 100644
index 0000000..46f98f5
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.oracle
@@ -0,0 +1,235 @@
+--
+-- Copyright (c) 2008--2012 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.
+--
+--
+--
+--
+
+CREATE OR REPLACE
+PACKAGE BODY rhn_org
+IS
+ procedure delete_org (
+ org_id_in in number
+ )
+ is
+ cursor users is
+ select id
+ from web_contact
+ where org_id = org_id_in;
+
+ cursor servers(org_id_in in number) is
+ select id
+ from rhnServer
+ where org_id = org_id_in;
+
+ cursor config_channels is
+ select id
+ from rhnConfigChannel
+ where org_id = org_id_in;
+
+ cursor custom_channels is
+ select id
+ from rhnChannel
+ where org_id = org_id_in;
+
+ cursor errata is
+ select id
+ from rhnErrata
+ where org_id = org_id_in;
+
+ begin
+
+ if org_id_in = 1 then
+ rhn_exception.raise_exception('cannot_delete_base_org');
+ end if;
+
+ -- Delete all users.
+ for u in users loop
+ rhn_org.delete_user(u.id, 1);
+ end loop;
+
+ -- Delete all servers.
+ for s in servers(org_id_in) loop
+ delete_server(s.id);
+ end loop;
+
+ -- Delete all config channels.
+ for c in config_channels loop
+ rhn_config.delete_channel(c.id);
+ end loop;
+
+ -- Delete all custom channels.
+ for cc in custom_channels loop
+ delete from rhnServerChannel where channel_id = cc.id;
+ delete from rhnServerProfilePackage where server_profile_id in (
+ select id from rhnServerProfile where base_channel = cc.id
+ );
+ delete from rhnServerProfile where base_channel = cc.id;
+ end loop;
+
+ -- Delete all errata packages
+ for e in errata loop
+ delete from rhnErrataPackage where errata_id = e.id;
+ end loop;
+
+ -- Give the org's entitlements back to the main org.
+ rhn_entitlements.remove_org_entitlements(org_id_in);
+
+ -- Clean up tables where we don't have a cascading delete.
+ delete from rhnChannel where org_id = org_id_in;
+ delete from rhnDailySummaryQueue where org_id = org_id_in;
+ delete from rhnOrgQuota where org_id = org_id_in;
+ delete from rhnFileList where org_id = org_id_in;
+ delete from rhnServerGroup where org_id = org_id_in;
+ delete from rhn_check_suites where customer_id = org_id_in;
+ delete from rhn_command_target where customer_id = org_id_in;
+ delete from rhn_contact_groups where customer_id = org_id_in;
+ delete from rhn_notification_formats where customer_id = org_id_in;
+ delete from rhn_probe where customer_id = org_id_in;
+ delete from rhn_redirects where customer_id = org_id_in;
+ delete from rhn_sat_cluster where customer_id = org_id_in;
+ delete from rhn_schedules where customer_id = org_id_in;
+ delete from rhnContentSource where org_id = org_id_in;
+
+ -- Delete the org.
+ delete from web_customer where id = org_id_in;
+
+ end delete_org;
+
+ procedure delete_user(user_id_in in number, deleting_org in number := 0) is
+ cursor servergroups_needing_admins is
+ select usgp.server_group_id server_group_id
+ from rhnUserServerGroupPerms usgp
+ where 1=1
+ and usgp.user_id = user_id_in
+ and not exists (
+ select 1
+ from rhnUserServerGroupPerms sq_usgp
+ where 1=1
+ and sq_usgp.server_group_id = usgp.server_group_id
+ and sq_usgp.user_id != user_id_in
+ );
+ users number;
+ our_org_id number;
+ other_users number;
+ other_org_admin number;
+ other_user_id number;
+ is_admin number;
+ begin
+ select wc.org_id
+ into our_org_id
+ from web_contact wc
+ where id = user_id_in;
+
+ -- find any other users
+ begin
+ select id, 1
+ into other_user_id, other_users
+ from web_contact
+ where 1=1
+ and org_id = our_org_id
+ and id != user_id_in
+ and rownum = 1;
+ exception
+ when no_data_found then
+ other_users := 0;
+ end;
+
+ -- now do org admin stuff
+ if other_users != 0 then
+ -- is user admin?
+ select count(1)
+ into is_admin
+ from rhnUserGroupType ugt,
+ rhnUserGroup ug,
+ rhnUserGroupMembers ugm
+ where ugm.user_id = user_id_in
+ and ugm.user_group_id = ug.id
+ and ug.group_type = ugt.id
+ and ugt.label = 'org_admin';
+ if is_admin > 0 then
+ begin
+ select new_ugm.user_id
+ into other_org_admin
+ from rhnUserGroupMembers new_ugm,
+ rhnUserGroupType ugt,
+ rhnUserGroup ug,
+ rhnUserGroupMembers ugm
+ where ugm.user_id = user_id_in
+ and ugm.user_group_id = ug.id
+ and ug.group_type = ugt.id
+ and ugt.label = 'org_admin'
+ and ug.id = new_ugm.user_group_id
+ and new_ugm.user_id != user_id_in
+ and rownum = 1;
+ exception
+ when no_data_found then
+ -- If we're deleting the org, we don't want to raise
+ -- the exception.
+ if deleting_org = 0 then
+ rhn_exception.raise_exception('cannot_delete_user');
+ end if;
+ end;
+
+ for sg in servergroups_needing_admins loop
+ rhn_user.add_servergroup_perm(other_org_admin,
+ sg.server_group_id);
+ end loop;
+ end if;
+ end if;
+
+ -- and now things for every user
+ delete from rhn_command_queue_sessions where contact_id = user_id_in;
+ delete from rhn_contact_groups
+ where recid in (
+ select contact_group_id
+ from rhn_contact_group_members
+ where member_contact_method_id in (
+ select recid from rhn_contact_methods
+ where contact_id = user_id_in
+ )
+ )
+ and not exists (
+ select 1
+ from rhn_contact_group_members, rhn_contact_methods
+ where rhn_contact_groups.recid = rhn_contact_group_members.contact_group_id
+ and rhn_contact_group_members.member_contact_method_id = rhn_contact_methods.recid
+ and rhn_contact_methods.contact_id <> user_id_in
+ );
+ delete from rhn_contact_methods where contact_id = user_id_in;
+ delete from rhn_redirects where contact_id = user_id_in;
+ delete from rhnUserServerPerms where user_id = user_id_in;
+ update rhnConfigRevision
+ set changed_by_id = NULL
+ where changed_by_id = user_id_in;
+ if other_users != 0 then
+ update rhnRegToken
+ set user_id = nvl(other_org_admin, other_user_id)
+ where org_id = our_org_id
+ and user_id = user_id_in;
+ end if;
+
+ begin
+ delete from web_contact where id = user_id_in;
+ exception
+ when others then
+ rhn_exception.raise_exception('cannot_delete_user');
+ end;
+ return;
+ end delete_user;
+
+END rhn_org;
+/
+SHOW ERRORS
+
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.postgresql
new file mode 100644
index 0000000..bc3c148
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-rhn_org.pkb.sql.postgresql
@@ -0,0 +1,98 @@
+-- oracle equivalent source sha1 48f766d7e2ec61890c48645c66978f81eab2cdbe
+
+--update pg_setting
+update pg_settings set setting = 'rhn_org,' || setting where name = 'search_path';
+
+
+create or replace
+ procedure delete_org (
+ org_id_in in number
+ )
+ is
+ cursor users is
+ select id
+ from web_contact
+ where org_id = org_id_in;
+
+ cursor servers(org_id_in in number) is
+ select id
+ from rhnServer
+ where org_id = org_id_in;
+
+ cursor config_channels is
+ select id
+ from rhnConfigChannel
+ where org_id = org_id_in;
+
+ cursor custom_channels is
+ select id
+ from rhnChannel
+ where org_id = org_id_in;
+
+ cursor errata is
+ select id
+ from rhnErrata
+ where org_id = org_id_in;
+
+ begin
+
+ if org_id_in = 1 then
+ rhn_exception.raise_exception('cannot_delete_base_org');
+ end if;
+
+ -- Delete all users.
+ for u in users loop
+ rhn_org.delete_user(u.id, 1);
+ end loop;
+
+ -- Delete all servers.
+ for s in servers(org_id_in) loop
+ delete_server(s.id);
+ end loop;
+
+ -- Delete all config channels.
+ for c in config_channels loop
+ rhn_config.delete_channel(c.id);
+ end loop;
+
+ -- Delete all custom channels.
+ for cc in custom_channels loop
+ delete from rhnServerChannel where channel_id = cc.id;
+ delete from rhnServerProfilePackage where server_profile_id in (
+ select id from rhnServerProfile where base_channel = cc.id
+ );
+ delete from rhnServerProfile where base_channel = cc.id;
+ end loop;
+
+ -- Delete all errata packages
+ for e in errata loop
+ delete from rhnErrataPackage where errata_id = e.id;
+ end loop;
+
+ -- Give the org's entitlements back to the main org.
+ rhn_entitlements.remove_org_entitlements(org_id_in);
+
+ -- Clean up tables where we don't have a cascading delete.
+ delete from rhnChannel where org_id = org_id_in;
+ delete from rhnDailySummaryQueue where org_id = org_id_in;
+ delete from rhnOrgQuota where org_id = org_id_in;
+ delete from rhnFileList where org_id = org_id_in;
+ delete from rhnServerGroup where org_id = org_id_in;
+ delete from rhn_check_suites where customer_id = org_id_in;
+ delete from rhn_command_target where customer_id = org_id_in;
+ delete from rhn_contact_groups where customer_id = org_id_in;
+ delete from rhn_notification_formats where customer_id = org_id_in;
+ delete from rhn_probe where customer_id = org_id_in;
+ delete from rhn_redirects where customer_id = org_id_in;
+ delete from rhn_sat_cluster where customer_id = org_id_in;
+ delete from rhn_schedules where customer_id = org_id_in;
+ delete from rhnContentSource where org_id = org_id_in;
+
+ -- Delete the org.
+ delete from web_customer where id = org_id_in;
+
+ end delete_org;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_channel')+1) ) where name = 'search_path';
+
commit 7fa3c2c04cd6d09bcf1682797638ed26fe5fc73c
Author: root <root(a)sat541-rhel5.shughes.sat>
Date: Wed Apr 25 12:53:04 2012 -0400
807283 - remove rhnContentSource row when delete row in oracle pkg
diff --git a/schema/spacewalk/oracle/packages/rhn_org.pkb b/schema/spacewalk/oracle/packages/rhn_org.pkb
index d0dda5c..46f98f5 100644
--- a/schema/spacewalk/oracle/packages/rhn_org.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_org.pkb
@@ -100,6 +100,7 @@ IS
delete from rhn_redirects where customer_id = org_id_in;
delete from rhn_sat_cluster where customer_id = org_id_in;
delete from rhn_schedules where customer_id = org_id_in;
+ delete from rhnContentSource where org_id = org_id_in;
-- Delete the org.
delete from web_customer where id = org_id_in;
11 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.8.56-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.56-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-27 09:31 +0000
Tagging package [spacewalk-java] version [1.8.56-1] in directory [java/].
Changes since spacewalk-schema-1.8.21-1:
Tomas Lestach (3):
add unique constraint on rhnChannelArch.name
use arch label in distchannel.setDefaultMap API as stated in the API doc
Automatic commit of package [spacewalk-java] release [1.8.56-1].
---
java/code/src/com/redhat/rhn/domain/channel/ChannelArch.hbm.xml | 3 ++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 12 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java | 2 -
java/spacewalk-java.spec | 5 +++-
rel-eng/packages/spacewalk-java | 2 -
schema/spacewalk/common/tables/rhnChannelArch.sql | 3 ++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/034-rhnChannelArch.sql | 3 ++
7 files changed, 27 insertions(+), 3 deletions(-)
---
11 years, 12 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b8ec88dc5ead18388cbfee4092901f453a8a01ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 27 11:31:41 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.56-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7d65812..aacb4d8 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.55
+Version: 1.8.56
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Apr 27 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.56-1
+- use arch label in distchannel.setDefaultMap API as stated in the API doc
+
* Thu Apr 26 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.55-1
- 806815 - add missing acl to SSM
- 806815 - add missing links about Solaris Patches to SSM
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2462a86..cd17448 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.55-1 java/
+1.8.56-1 java/
11 years, 12 months
2 commits - java/code schema/spacewalk
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/ChannelArch.hbm.xml | 3 ++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 12 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java | 2 -
schema/spacewalk/common/tables/rhnChannelArch.sql | 3 ++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/034-rhnChannelArch.sql | 3 ++
5 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit b7783bb27ab216c20cc9a7086862b7dbc387bfb4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 27 11:16:36 2012 +0200
use arch label in distchannel.setDefaultMap API as stated in the API doc
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelArch.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ChannelArch.hbm.xml
index 411e6b4..5cc2537 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelArch.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelArch.hbm.xml
@@ -47,4 +47,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<query name="ChannelArch.findByName">
<![CDATA[from com.redhat.rhn.domain.channel.ChannelArch as c where c.name = :name]]>
</query>
+ <query name="ChannelArch.findByLabel">
+ <![CDATA[from com.redhat.rhn.domain.channel.ChannelArch as c where c.label = :label]]>
+ </query>
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 6eb274e..9e8d93b 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -697,6 +697,18 @@ public class ChannelFactory extends HibernateFactory {
}
/**
+ * Lookup a ChannelArch based on its label
+ * @param label arch label
+ * @return ChannelArch if found, otherwise null
+ */
+ public static ChannelArch lookupArchByLabel(String label) {
+ Map params = new HashMap();
+ params.put("label", label);
+ return (ChannelArch)
+ singleton.lookupObjectByNamedQuery("ChannelArch.findByLabel", params);
+ }
+
+ /**
* Get package ids for a channel
* @param cid the channel id
* @return List of package ids
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
index c75b2f3..c8553eb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java
@@ -74,7 +74,7 @@ public class DistChannelHandler extends BaseHandler {
throw new PermissionException(RoleFactory.SAT_ADMIN);
}
- ChannelArch channelArch = ChannelFactory.lookupArchByName(archLabel);
+ ChannelArch channelArch = ChannelFactory.lookupArchByLabel(archLabel);
if (channelArch == null) {
throw new InvalidChannelArchException(archLabel);
}
commit 75b95280e2b7b405fb49be3e3514f0973587baa8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 27 11:11:21 2012 +0200
add unique constraint on rhnChannelArch.name
diff --git a/schema/spacewalk/common/tables/rhnChannelArch.sql b/schema/spacewalk/common/tables/rhnChannelArch.sql
index 018b878..9464610 100644
--- a/schema/spacewalk/common/tables/rhnChannelArch.sql
+++ b/schema/spacewalk/common/tables/rhnChannelArch.sql
@@ -39,3 +39,6 @@ ALTER TABLE rhnChannelArch
ADD CONSTRAINT rhn_carch_label_uq UNIQUE (label)
USING INDEX TABLESPACE [[2m_tbs]];
+ALTER TABLE rhnChannelArch
+ ADD CONSTRAINT rhn_carch_name_uq UNIQUE (name)
+ USING INDEX TABLESPACE [[2m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/034-rhnChannelArch.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/034-rhnChannelArch.sql
new file mode 100644
index 0000000..08a314a
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/034-rhnChannelArch.sql
@@ -0,0 +1,3 @@
+ALTER TABLE rhnChannelArch
+ ADD CONSTRAINT rhn_carch_name_uq UNIQUE (name)
+ USING INDEX TABLESPACE [[2m_tbs]];
11 years, 12 months
Changes to 'refs/tags/spacewalk-schema-1.8.21-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.21-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-27 07:11 +0000
Tagging package [spacewalk-schema] version [1.8.21-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.8.20-1:
Miroslav Suchý (3):
630953 - make sure that rows are unique before creating unique index
use lib '/var/www/lib' is not needed anymore for gen-oss-sat-cert.pl
Automatic commit of package [spacewalk-schema] release [1.8.21-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.oracle | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/125-alter-index-rhnRam.sql.postgresql | 6 +++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.oracle | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/126-alter-index-rhnCpu.sql.postgresql | 6 +++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.oracle | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/127-alter-index-rhnServerDmi.sql.postgresql | 6 +++++-
scripts/gen-oss-sat-cert.pl | 1 -
9 files changed, 32 insertions(+), 6 deletions(-)
---
11 years, 12 months
rel-eng/packages schema/spacewalk
by Miroslav Suchý
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 16a5f894906b8cf1d0b0c573eef131467f71e202
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 27 09:11:02 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.21-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3802f9b..db2b839 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.20-1 schema/spacewalk/
+1.8.21-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index f76a58e..d8774cb 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.20
+Version: 1.8.21
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Apr 27 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.21-1
+- 630953 - make sure that rows are unique before creating unique index
+
* Thu Apr 26 2012 Jan Pazdziora 1.8.20-1
- We need to use to_timestamp, so that we do not miss the hour-to-second part
on PostgreSQL.
11 years, 12 months
Changes to 'refs/tags/spacewalk-schema-1.8.20-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.20-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-26 14:37 +0000
Tagging package [spacewalk-schema] version [1.8.20-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.8.13-1:
Jan Pazdziora (3):
Quote newlines to match the Oracle behaviour.
We need to use to_timestamp, so that we do not miss the hour-to-second part on PostgreSQL.
Automatic commit of package [spacewalk-schema] release [1.8.20-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhn_schedule_days.sql | 35 ++---
schema/spacewalk/postgres/data/Makefile | 2
schema/spacewalk/spacewalk-schema.spec | 7 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/023-rhn_schedule_days-to_timestamp.sql | 66 ++++++++++
5 files changed, 89 insertions(+), 23 deletions(-)
---
11 years, 12 months
scripts/gen-oss-sat-cert.pl
by Miroslav Suchý
scripts/gen-oss-sat-cert.pl | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 001db6033fb0f9504b82cea57f72192b04d2c0a7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 27 08:59:22 2012 +0200
use lib '/var/www/lib' is not needed anymore for gen-oss-sat-cert.pl
diff --git a/scripts/gen-oss-sat-cert.pl b/scripts/gen-oss-sat-cert.pl
index 8aac952..18a76ed 100755
--- a/scripts/gen-oss-sat-cert.pl
+++ b/scripts/gen-oss-sat-cert.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
use strict;
-use lib '/var/www/lib';
use Getopt::Long;
11 years, 12 months
2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
java/spacewalk-java.spec | 26 +++++++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
4 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit db063c96dda4a418bcad968ce5ff535dd31cfef4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 26 14:20:51 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 881ce8a..a1dbff9 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.12-1 web/
+1.8.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2f62926..62f582e 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.12
+Version: 1.8.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Apr 26 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.13-1
+- add AS syntax for PostgreSQL
+
* Mon Apr 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.12-1
- Fix errata clone name generation in perl code
commit 516d0a5f99fab248ddd93ca5d58ec02662a94272
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 26 14:20:38 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.55-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9aeea9c..7d65812 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.54
+Version: 1.8.55
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,30 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 26 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.55-1
+- 806815 - add missing acl to SSM
+- 806815 - add missing links about Solaris Patches to SSM
+- 816445 - fixed error in redhat_register snippet
+- 816299 - Updating default config files with additional options for heapdump
+ directory
+- Ensure that given system has OpenSCAP capability.
+- Ensure that given systems is available to user.
+- Repack and throw MissingEntitlementException when occurs.
+- Sort imports alphabetically.
+- API: SCAP scan schedule for multiple systems
+- changed kernel-params field to 1024 chars in size (bnc#698166)
+- removing unused lookup
+- Capitalize title to be consistent
+- Put the reboot notification at the end. Make it not mutually exclusive with
+ other notifications.
+- API: SCAP scan schedule should accept the date of earliest occurence
+- Promote read only DatePicker to fragment.
+- Refactor parentUrl to ListTagHelper.PARENT_URL
+- Hide the 'Schedule' tab for systems without management ent.
+- 815804 - force repo regeneration, when removing package using
+ packages.removePackage API
+- 815804 - make the cleanupFileEntries simplier
+
* Tue Apr 24 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.54-1
- Promote Audit to separate tab within SSM. (slukasik(a)redhat.com)
- Show targeted systems when scheduling SCAP scan through SSM.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6b20cfc..2462a86 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.54-1 java/
+1.8.55-1 java/
12 years
java/conf
by Jan Pazdziora
java/conf/cobbler/snippets/redhat_register | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1e417be3c38abb1f9d5768b5124079a44402e2f1
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Thu Apr 26 02:24:05 2012 -0300
816445 - fixed error in redhat_register snippet
diff --git a/java/conf/cobbler/snippets/redhat_register b/java/conf/cobbler/snippets/redhat_register
index bcd4e1f..e3e4c17 100644
--- a/java/conf/cobbler/snippets/redhat_register
+++ b/java/conf/cobbler/snippets/redhat_register
@@ -6,7 +6,7 @@ mkdir -p /usr/share/rhn/
#set $mycert = "/usr/share/rhn/" + $mycert_file
wget http://$redhat_management_server/pub/RHN-ORG-TRUSTED-SSL-CERT -O $mycert
perl -npe 's/RHNS-CA-CERT/$mycert_file/g' -i /etc/sysconfig/rhn/*
-if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]
+if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
fi
#end if
12 years