spacewalk/setup
by Michael Mraka
spacewalk/setup/lib/Spacewalk/Setup.pm | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
New commits:
commit d08ad13d1e746aa5b40b9c64755030254665cc68
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 25 10:53:57 2011 +0100
636458 - reuse db version check via dbms_utility.db_version()
v$instance in not granted by default (on external dbs)
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 596637e..bfa14a9 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1164,15 +1164,7 @@ sub oracle_setup_db_connection {
my $dbh;
eval {
- $dbh = get_dbh($answers);
- my ($version) = $dbh->selectrow_array(q! select version from v$instance !);
- if (not defined $version) {
- die "Failed to verify database version (in v\$instance)\n";
- }
- if (not $version =~ /^10\.|^11\./) {
- die "Version [$version] is not supported (does not match 10 or 11).\n";
- }
- $dbh->disconnect();
+ oracle_check_db_version($answers);
};
if ($@) {
print loc("Could not connect to the database. Your connection information may be incorrect. Error: %s\n", $@);
@@ -1211,12 +1203,12 @@ EOQ
$sth->finish();
$dbh->disconnect();
- my $version = join('', (split(/\./, $v))[0 .. 2]);
- my @allowed_db_versions = qw/1120 1110 1020 920/;
+ my $version = join('.', (split(/\./, $v))[0 .. 2]);
+ my @allowed_db_versions = qw/11.2.0 11.1.0 10.2.0/;
- unless (grep { $version == $_ } @allowed_db_versions) {
- print loc("Invalid db version: (%s, %s)\n", $v, $c);
- exit 20;
+ unless (grep { $version eq $_ } @allowed_db_versions) {
+ die "Version [$version] is not supported (does not match "
+ . join(', ', @allowed_db_versions) . ").\n";
}
return 1;
@@ -1228,7 +1220,6 @@ sub oracle_test_db_settings {
print loc("** Database: Testing database connection.\n");
- oracle_check_db_version($answers);
oracle_check_db_privs($answers);
oracle_check_db_tablespace_settings($answers);
oracle_check_db_charsets($answers);
13 years, 3 months
Changes to 'refs/tags/spacewalk-backend-1.3.48-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.3.48-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-24 20:02 +0000
Tagging package [spacewalk-backend] version [1.3.48-1] in directory [backend/].
Changes since spacewalk-selinux-1.3.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.3.48-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 3 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c921318a74e71724cb03ce3bcaa13603049a3237
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 24 21:02:37 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.48-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 500f8c5..d2cef22 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.3.47
+Version: 1.3.48
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
+* Mon Jan 24 2011 Jan Pazdziora 1.3.48-1
+- do not print TB if we get unknown type (msuchy(a)redhat.com)
+- Make rhn-schema-version work on PostgreSQL.
+
* Fri Jan 21 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.47-1
- 657091 - honor http proxy setting for spacewalk-repo-sync
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 05dab99..46bfda2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.47-1 backend/
+1.3.48-1 backend/
13 years, 3 months
Changes to 'refs/tags/spacewalk-selinux-1.3.2-1'
by Jan Pazdziora
Tag 'spacewalk-selinux-1.3.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-24 20:01 +0000
Tagging package [spacewalk-selinux] version [1.3.2-1] in directory [selinux/spacewalk-selinux/].
Changes since spacewalk-backend-1.3.47-1:
Jan Pazdziora (3):
Make rhn-schema-version work on PostgreSQL.
Adding explicit append allow for sqlplus.
Automatic commit of package [spacewalk-selinux] release [1.3.2-1].
Michael Mraka (1):
493028 - simplified email check regexp
Milan Zazrivec (1):
596108 - firstboot: don't allow multiple system registrations
Miroslav Suchý (2):
do not print TB if we get unknown type
606222 - label could not have focus
---
backend/satellite_tools/reposync.py | 3 +++
backend/satellite_tools/rhn-schema-version | 4 ++--
client/rhel/rhn-client-tools/data/rh_register.glade | 1 -
client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py | 3 +++
client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py | 8 ++++++--
monitoring/NPalert/Acknowledgement.pm | 2 +-
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
selinux/spacewalk-selinux/spacewalk.te | 1 +
9 files changed, 21 insertions(+), 8 deletions(-)
---
13 years, 3 months
rel-eng/packages selinux/spacewalk-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ddf24f07bcbe3e351cc0a3b45d8b61266fdd4299
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 24 21:01:40 2011 +0100
Automatic commit of package [spacewalk-selinux] release [1.3.2-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 8abd265..b125c71 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.3.1-1 selinux/spacewalk-selinux/
+1.3.2-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index 2087071..a796332 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.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
@@ -113,6 +113,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Mon Jan 24 2011 Jan Pazdziora 1.3.2-1
+- Adding explicit append allow for sqlplus.
+
* Wed Dec 29 2010 Jan Pazdziora 1.3.1-1
- Create sqlplus spool files with different type than the directories, to allow
write.
13 years, 3 months
selinux/spacewalk-selinux
by Jan Pazdziora
selinux/spacewalk-selinux/spacewalk.te | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 4cb9591e373ebe9e1f72f598f654163eb67de73c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 24 20:59:17 2011 +0100
Adding explicit append allow for sqlplus.
Now that spacewalk-schema-upgrade opens the logfile and then passes
it to spacewalk-sql (and thus to sqlplus), sqlplus is appending to
spacewalk_db_install_log_t, it's no longer
spacewalk_sqlplus_spool_log_t in this situation.
Addressing
avc: denied { append } for pid=31334 comm="sqlplus" path="/var/log/spacewalk/schema-upgrade/20110124-143949-to-spacewalk-schema-1.3.log" dev=dm-0 ino=104955979 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=root:object_r:spacewalk_db_install_log_t:s0 tclass=file
diff --git a/selinux/spacewalk-selinux/spacewalk.te b/selinux/spacewalk-selinux/spacewalk.te
index 5ef5605..8f56c6c 100644
--- a/selinux/spacewalk-selinux/spacewalk.te
+++ b/selinux/spacewalk-selinux/spacewalk.te
@@ -77,4 +77,5 @@ optional_policy(`
read_files_pattern(oracle_sqlplus_t, spacewalk_db_install_log_t, spacewalk_db_install_log_t);
create_files_pattern(oracle_sqlplus_t, spacewalk_db_install_log_t, spacewalk_sqlplus_spool_log_t);
filetrans_pattern(oracle_sqlplus_t, spacewalk_db_install_log_t, spacewalk_sqlplus_spool_log_t, file)
+ allow oracle_sqlplus_t spacewalk_db_install_log_t:file append;
')
13 years, 3 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py | 3 +++
client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 9d68037cb12da93a660265e26b4d213d9e307ea2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jan 24 17:26:15 2011 +0100
596108 - firstboot: don't allow multiple system registrations
The fix has two parts:
1. From 'Review Subscription' page, 'Back' button will skip to the 'Set
Up Software Updates' page
2. 'Set Up Software Updates' page will render correctly depending on
whether or not is the system registered.
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
index eb12ae2..5dd3b42 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
@@ -33,6 +33,7 @@ gtk.glade.bindtextdomain("rhn-client-tools")
from firstboot.module import Module
from firstboot.constants import *
+from firstboot.config import config
class moduleClass(Module):
def __init__(self):
@@ -57,6 +58,8 @@ class moduleClass(Module):
def initializeUI(self):
self.reviewSubscriptionPage.reviewSubscriptionPagePrepare()
+ while len(config.interface._control.history) > 1:
+ config.interface._control.history.pop()
def shouldAppear(self):
if rhnreg.registered():
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
index 5ebb0c2..46901db 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
@@ -43,6 +43,7 @@ class moduleClass(Module):
self.sidebarTitle = _("Set Up Software Updates")
self.title = _("Set Up Software Updates")
self.skip_registration = False
+ self.start_page_vbox = None
def apply(self, interface, testing=False):
if testing:
@@ -63,10 +64,13 @@ class moduleClass(Module):
def createScreen(self):
self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self._getVbox(), True, True)
def initializeUI(self):
- pass
+ if self.start_page_vbox:
+ self.start_page_vbox.destroy()
+
+ self.start_page_vbox = self._getVbox()
+ self.vbox.pack_start(self.start_page_vbox, True, True)
def _system_is_registered(self):
if rhnreg.registered():
13 years, 3 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/data/rh_register.glade | 1 -
1 file changed, 1 deletion(-)
New commits:
commit a41d045c01633559be99350fd0b8bcfe99d093a0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 24 17:24:30 2011 +0100
606222 - label could not have focus
if you get focus on label using Tab or Shift+Tab you can not continue and cycle in window
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index 72a1a83..33273f9 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -176,7 +176,6 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="chooseServerLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="label" translatable="yes" context="yes">You may connect your system to <b>Red Hat Network</b> (https://rhn.redhat.com/) or to a <b>Red Hat Network Satellite</b> or <b>Red Hat Network Proxy</b> in order to receive software updates.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
13 years, 3 months
backend/satellite_tools
by Miroslav Suchý
backend/satellite_tools/reposync.py | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 62f4d5ef491fc0b47e6ab7e4974b6ab7c7e962c2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 24 14:37:26 2011 +0100
do not print TB if we get unknown type
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 15ffa62..f8182b3 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -53,6 +53,9 @@ class RepoSync:
#os.fchown isn't in 2.4 :/
os.system("chgrp apache " + default_log_location + log_filename)
+ if options.type not in ["yum"]:
+ print "Error: Unknown type %s" % options.type
+ sys.exit(2)
quit = False
if not options.url:
13 years, 3 months
monitoring/NPalert
by Michael Mraka
monitoring/NPalert/Acknowledgement.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a1416bfc15c1165c3f8a072402647aa102be8bd8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 11 16:08:32 2011 +0100
493028 - simplified email check regexp
original one tried to be so smart that didn't even allow root@localhost :-/
diff --git a/monitoring/NPalert/Acknowledgement.pm b/monitoring/NPalert/Acknowledgement.pm
index 41202d3..bbcb09e 100644
--- a/monitoring/NPalert/Acknowledgement.pm
+++ b/monitoring/NPalert/Acknowledgement.pm
@@ -439,7 +439,7 @@ sub not_valid_redirect {
return "Invalid duration" unless $self->duration =~ /^\d+[mhd]$/;
if ($self->redirect_type =~ /(metoo|redir)/) {
- return "Invalid email destination" unless $self->destination =~ /^([a-zA-Z0-9_\-\.]+)(a)((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/; #email address validation from http://www.regexlib.com/REDetails.aspx?regexp_id=26
+ return "Invalid email destination" unless $self->destination =~ /^([a-zA-Z0-9_\-\.\+]+)(a)(\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.\]|[a-zA-Z0-9\-\.]+)$/;
}
return 0
13 years, 3 months