rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnPackageKey.sql | 31 +++++++---
schema/spacewalk/common/data/rhnPackageProvider.sql | 9 --
schema/spacewalk/spacewalk-schema.spec | 6 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/142-suse-package-keys.sql | 23 +++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/143-novell-package-keys.sql | 28 +++++++++
6 files changed, 84 insertions(+), 15 deletions(-)
New commits:
commit bf55b07dcfb8213ac507607da05ae56b2b0cbf20
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 22:12:34 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.80-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3776687..35a1e46 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.79-1 schema/spacewalk/
+1.8.80-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 0201402..29b56fe 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.79
+Version: 1.8.80
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Oct 15 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.80-1
+- added Novell gpg keys
+- added gpg keys for SUSE
+
* Mon Oct 15 2012 Jan Pazdziora 1.8.79-1
- Revert "Quote newlines to match the Oracle behaviour.", we use
standard_conforming_strings now.
commit 1472729ef4e3594279ab6b9e9b64d0619544642c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 17:22:50 2012 +0200
added upgrade script for Novell gpg keys
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/143-novell-package-keys.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/143-novell-package-keys.sql
new file mode 100644
index 0000000..cadd165
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/143-novell-package-keys.sql
@@ -0,0 +1,28 @@
+
+insert into rhnPackageProvider (id, name) values
+(sequence_nextval('rhn_package_provider_id_seq'), 'Novell Inc.' );
+
+update rhnPackageKey set provider_id = lookup_package_provider('Novell Inc.')
+ where key_id = '2afe16421d061a62';
+update rhnPackageKey set provider_id = lookup_package_provider('Novell Inc.')
+ where key_id = '14c28bc97e2e3b05';
+update rhnPackageKey set provider_id = lookup_package_provider('Novell Inc.')
+ where key_id = '478a32e8a1912208';
+update rhnPackageKey set provider_id = lookup_package_provider('Novell Inc.')
+ where key_id = '73d25d630dfb3188';
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '2afe16421d061a62', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = '2afe16421d061a62'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '14c28bc97e2e3b05', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = '14c28bc97e2e3b05'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '478a32e8a1912208', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = '478a32e8a1912208'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '73d25d630dfb3188', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = '73d25d630dfb3188'));
+
+
+commit;
commit f229c4a16ad7c0428eca3cdb6ccae6de3e446039
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 16:44:48 2012 +0200
removed outdated footer
diff --git a/schema/spacewalk/common/data/rhnPackageProvider.sql b/schema/spacewalk/common/data/rhnPackageProvider.sql
index 9d05888..db7c2ca 100644
--- a/schema/spacewalk/common/data/rhnPackageProvider.sql
+++ b/schema/spacewalk/common/data/rhnPackageProvider.sql
@@ -38,8 +38,3 @@ insert into rhnPackageProvider (id, name) values
commit;
---
--- Revision 1.1 2008/07/02 23:42:28 jsherrill
--- Sequence; data to populate stuff
---
-
commit dfbc8e2a8d08ad5444b0d65ce552f85a78f76859
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 22:09:14 2012 +0200
added Novell gpg keys
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index c28b584..dce320e 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -91,6 +91,19 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '2e2bcdbcb38a8516', lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
+-- Novell
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '2afe16421d061a62', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '14c28bc97e2e3b05', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '478a32e8a1912208', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '73d25d630dfb3188', lookup_package_key_type('gpg'), lookup_package_provider('Novell Inc.'));
+
-- SUSE
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), 'a84edae89c800aca', lookup_package_key_type('gpg'), lookup_package_provider('SUSE'));
diff --git a/schema/spacewalk/common/data/rhnPackageProvider.sql b/schema/spacewalk/common/data/rhnPackageProvider.sql
index b0e18c5..9d05888 100644
--- a/schema/spacewalk/common/data/rhnPackageProvider.sql
+++ b/schema/spacewalk/common/data/rhnPackageProvider.sql
@@ -30,6 +30,8 @@ insert into rhnPackageProvider (id, name) values
(sequence_nextval('rhn_package_provider_id_seq'), 'Spacewalk' );
insert into rhnPackageProvider (id, name) values
(sequence_nextval('rhn_package_provider_id_seq'), 'EPEL' );
+insert into rhnPackageProvider (id, name) values
+(sequence_nextval('rhn_package_provider_id_seq'), 'Novell Inc.' );
commit b5d430a50dbb29250fd31d643fe9f4af10b04295
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 17:05:46 2012 +0200
added upgrade script for SUSE keys
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/142-suse-package-keys.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/142-suse-package-keys.sql
new file mode 100644
index 0000000..a278fd3
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/142-suse-package-keys.sql
@@ -0,0 +1,23 @@
+
+update rhnPackageKey set provider_id = lookup_package_provider('Suse')
+ where key_id = 'e3a5c360307e3d54';
+update rhnPackageKey set provider_id = lookup_package_provider('Suse')
+ where key_id = '6c74ce73b37b98a9';
+update rhnPackageKey set provider_id = lookup_package_provider('Suse')
+ where key_id = '8055f0400182b964';
+
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), 'e3a5c360307e3d54', lookup_package_key_type('gpg'), lookup_package_provider('Suse') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = 'e3a5c360307e3d54'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '6c74ce73b37b98a9', lookup_package_key_type('gpg'), lookup_package_provider('Suse') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = '6c74ce73b37b98a9'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '8055f0400182b964', lookup_package_key_type('gpg'), lookup_package_provider('Suse') from dual
+ where not exists (select 1 from rhnPackageKey where key_id = '8055f0400182b964'));
+
+
+update rhnPackageProvider set name = 'SUSE' where name = 'Suse';
+
+commit;
commit 606bee041ff358ffa3f51c05d0b776fd68de3219
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 16:46:58 2012 +0200
added gpg keys for SUSE
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index 7c92618..c28b584 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -91,9 +91,18 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '2e2bcdbcb38a8516', lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
--- Suse
+-- SUSE
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), 'a84edae89c800aca', lookup_package_key_type('gpg'), lookup_package_provider('Suse'));
+(sequence_nextval('rhn_pkey_id_seq'), 'a84edae89c800aca', lookup_package_key_type('gpg'), lookup_package_provider('SUSE'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), 'e3a5c360307e3d54', lookup_package_key_type('gpg'), lookup_package_provider('SUSE'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '6c74ce73b37b98a9', lookup_package_key_type('gpg'), lookup_package_provider('SUSE'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '8055f0400182b964', lookup_package_key_type('gpg'), lookup_package_provider('SUSE'));
-- Spacewalk
diff --git a/schema/spacewalk/common/data/rhnPackageProvider.sql b/schema/spacewalk/common/data/rhnPackageProvider.sql
index f32d4e6..b0e18c5 100644
--- a/schema/spacewalk/common/data/rhnPackageProvider.sql
+++ b/schema/spacewalk/common/data/rhnPackageProvider.sql
@@ -23,7 +23,7 @@ insert into rhnPackageProvider (id, name) values
insert into rhnPackageProvider (id, name) values
(sequence_nextval('rhn_package_provider_id_seq'), 'Scientific Linux' );
insert into rhnPackageProvider (id, name) values
-(sequence_nextval('rhn_package_provider_id_seq'), 'Suse' );
+(sequence_nextval('rhn_package_provider_id_seq'), 'SUSE' );
insert into rhnPackageProvider (id, name) values
(sequence_nextval('rhn_package_provider_id_seq'), 'Oracle Inc.' );
insert into rhnPackageProvider (id, name) values
commit 9fd0f7910a9468abeec12c873140ca3ffefdeda3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 15 16:44:48 2012 +0200
removed outdated footer
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index 344de0e..7c92618 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -112,8 +112,3 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
commit;
---
--- Revision 1.1 2008/07/02 23:42:28 jsherrill
--- Sequence; data to populate stuff
---
-