java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3b83dfdf061c4c4845e15cb33a0051e1e7775e51
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 16:13:48 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.79-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 48420fd..65e9be7 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.6.78
+Version: 1.6.79
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 1.6.79-1
+- No scrubbing of key description and custom key value, also escape the value
+ which can now contain full range of characters.
+
* Mon Nov 21 2011 Jan Pazdziora 1.6.78-1
- Remove markup from another error message (jrenner(a)suse.de)
- Remove markup from error message in all translation files (jrenner(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0ea0d7e..605142b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.78-1 java/
+1.6.79-1 java/
12 years, 5 months
java/code
by Jan Pazdziora
java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 2 +-
java/code/webapp/WEB-INF/struts-config.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit be6ff15f34dd384f0b41f6d37c10f506b62463f5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 22 16:00:45 2011 +0100
No scrubbing of key description and custom key value, also escape the value which can now contain full range of characters.
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
index 4189ced..058d1d5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
@@ -34,7 +34,7 @@
<tr>
<th>${current.label}</th>
<td width="50%">
- <pre>${current.value}</pre>
+ <pre><c:out value="${current.value}" /></pre>
<a href="/rhn/systems/details/UpdateCustomData.do?sid=${system.id}&cikid=${current.cikid}">
<bean:message key="sdc.details.customdata.editvalue"/>
</a>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 97ddfc0..ddb46f9 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1128,6 +1128,7 @@
<form-property name="label" type="java.lang.String" />
<form-property name="description" type="java.lang.String" />
<form-property name="submitted" type="java.lang.Boolean" />
+ <form-property name="no_scrub" type="java.lang.String" initial="description"/>
</form-bean>
<form-bean name="updateCustomDataForm"
@@ -1136,6 +1137,7 @@
<form-property name="label" type="java.lang.String" />
<form-property name="value" type="java.lang.String" />
<form-property name="submitted" type="java.lang.Boolean" />
+ <form-property name="no_scrub" type="java.lang.String" initial="value"/>
</form-bean>
<form-bean name="updateTaskSchedule"
12 years, 5 months
Changes to 'refs/tags/spacewalk-schema-1.6.29-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.6.29-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-23 15:08 +0000
Tagging package [spacewalk-schema] version [1.6.29-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.6.41-1:
Jan Pazdziora (2):
Fixing wrong plpgsql code.
Automatic commit of package [spacewalk-schema] release [1.6.29-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/postgres/procs/set_ks_session_history_message.sql | 9 -
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.postgresql | 68 ++++++++++
5 files changed, 77 insertions(+), 8 deletions(-)
---
12 years, 5 months
2 commits - rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/postgres/procs/set_ks_session_history_message.sql | 9 -
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.postgresql | 68 ++++++++++
5 files changed, 77 insertions(+), 8 deletions(-)
New commits:
commit 4ad55ae20d5ea7e9661a2c057c48ed37e37a1593
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 16:08:33 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.29-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index d40031e..aa6502d 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.28-1 schema/spacewalk/
+1.6.29-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index d8bf4e7..0db1edd 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.6.28
+Version: 1.6.29
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 1.6.29-1
+- Fixing wrong plpgsql code.
+
* Wed Nov 16 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.28-1
- pgsql: varchar2 -> varchar
commit b820564137fb6db3cf65f96eed9d91bde6798c25
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 26 13:46:12 2011 +0200
Fixing wrong plpgsql code.
Addressing
org.postgresql.util.PSQLException: ERROR: invalid input syntax for type numeric: "(13)"
at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:1525)
at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1309)
at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:188)
at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:452)
at org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:354)
at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:347)
at com.mchange.v2.c3p0.impl.NewProxyCallableStatement.execute(NewProxyCallableStatement.java:2706)
at com.redhat.rhn.common.db.NamedPreparedStatement.execute(NamedPreparedStatement.java:115)
at com.redhat.rhn.common.db.datasource.CachedStatement.executeCallable(CachedStatement.java:511)
at com.redhat.rhn.common.db.datasource.CallableMode.execute(CallableMode.java:34)
at com.redhat.rhn.manager.action.ActionManager.removeSystemFromAction(ActionManager.java:1660)
diff --git a/schema/spacewalk/postgres/procs/set_ks_session_history_message.sql b/schema/spacewalk/postgres/procs/set_ks_session_history_message.sql
index 16c8e60..8fef192 100644
--- a/schema/spacewalk/postgres/procs/set_ks_session_history_message.sql
+++ b/schema/spacewalk/postgres/procs/set_ks_session_history_message.sql
@@ -1,7 +1,7 @@
-- oracle equivalent source sha1 fc3564b64fb4d252e69da8f47d36806490cf381a
-- retrieved from ./1241128047/984a347f2afbd47756e90584364799dd670b62db/schema/spacewalk/oracle/procs/set_ks_session_history_message.sql
--
--- Copyright (c) 2008--2010 Red Hat, Inc.
+-- Copyright (c) 2008--2011 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
@@ -14,9 +14,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
-- this seems like maybe it should have action_id as well?
-- maybe optional?
@@ -48,11 +45,11 @@ declare
begin
for id_states_curs in states
loop
- for id_history_items_curs in history_items(id_states_curs)
+ for id_history_items_curs in history_items(id_states_curs.id)
loop
update rhnKickstartSessionHistory
set message = message_in
- where id = id_history_items;
+ where id = id_history_items_curs.id;
return;
end loop;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.postgresql
new file mode 100644
index 0000000..ff66d16
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/102-set_ks_session_history_message.sql.postgresql
@@ -0,0 +1,68 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+--
+-- Copyright (c) 2008--2011 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.
+--
+
+-- this seems like maybe it should have action_id as well?
+-- maybe optional?
+
+create or replace function
+set_ks_session_history_message (
+ kickstart_session_id_in in numeric,
+ state_label_in in varchar,
+ message_in in varchar
+) returns void as
+$$
+declare
+ states cursor is
+ select id
+ from rhnKickstartSessionState
+ where label = state_label_in;
+
+
+ history_items cursor (state_id_in numeric) is
+ select id
+ from rhnKickstartSessionHistory
+ where kickstart_session_id = kickstart_session_id_in
+ and state_id = state_id_in
+ order by time desc;
+
+ id_states_curs numeric;
+ id_history_items_curs numeric;
+
+begin
+ for id_states_curs in states
+ loop
+ for id_history_items_curs in history_items(id_states_curs.id)
+ loop
+ update rhnKickstartSessionHistory
+ set message = message_in
+ where id = id_history_items_curs.id;
+ return;
+ end loop;
+
+ insert into rhnKickstartSessionHistory (
+ id, kickstart_session_id, state_id, message
+ ) values (
+ nextval('rhn_ks_sessionhist_id_seq'),
+ kickstart_session_id_in,
+ id_states_cursor,
+ message_in
+ );
+ return;
+ end loop;
+end;
+$$
+language plpgsql;
+
12 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.6.41-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.6.41-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-23 15:07 +0000
Tagging package [spacewalk-backend] version [1.6.41-1] in directory [backend/].
Changes since spacewalk-utils-1.6.4-1:
Jan Pazdziora (2):
Need to name a subselect.
Automatic commit of package [spacewalk-backend] release [1.6.41-1].
---
backend/server/rhnServer/server_kickstart.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 5 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cfa8876382d9740264fb3005a7f91ac9c806cf36
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 16:07:54 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.6.41-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c3c6d89..a63e8d2 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,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.6.40
+Version: 1.6.41
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 1.6.41-1
+- Need to name a subselect.
+
* Tue Nov 15 2011 Miroslav Suchý 1.6.40-1
- move common code to common function
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index cbb6179..d0b230f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.40-1 backend/
+1.6.41-1 backend/
12 years, 5 months
backend/server
by Jan Pazdziora
backend/server/rhnServer/server_kickstart.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec1322e6435db2798775316fa21064c773e03379
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 26 14:47:43 2011 +0200
Need to name a subselect.
Addressing
SQLStatementPrepareError: ('subquery in FROM must have an alias at character 210\nHINT: For example, FROM (SELECT ...) [AS] foo.\n', 0, "\n insert into rhnActionConfigRevision \n (id, action_id, server_id, config_revision_id)\n select sequence_nextval('rhn_actioncr_id_seq'), %(action_id)s, \n server_id,
diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/rhnServer/server_kickstart.py
index b878032..a33389f 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -325,7 +325,7 @@ _query_schedule_config_files = rhnSQL.Statement("""
and cf.latest_config_revision_id is not null
and cf.state_id = cfs.id
and cfs.label = 'alive'
- )
+ ) X
""")
def schedule_config_deploy(server_id, action_id, kickstart_session_id,
server_profile):
12 years, 5 months
Changes to 'refs/tags/spacewalk-utils-1.6.4-1'
by Jan Pazdziora
Tag 'spacewalk-utils-1.6.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-23 14:26 +0000
Tagging package [spacewalk-utils] version [1.6.4-1] in directory [utils/].
Changes since spacewalk-web-1.6.29-1:
Jan Pazdziora (2):
Prevent Malformed UTF-8 character error upon dump.
Automatic commit of package [spacewalk-utils] release [1.6.4-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-dump-schema | 3 ++-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 5 months
2 commits - rel-eng/packages utils/spacewalk-dump-schema utils/spacewalk-utils.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-dump-schema | 3 ++-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 0527e6c8160ada0e00263db937026f1b078d7ce4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 15:26:51 2011 +0100
Automatic commit of package [spacewalk-utils] release [1.6.4-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 64687b0..df9c8fa 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.6.3-1 utils/
+1.6.4-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 1ac1fb4..d27c0c5 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 1.6.4-1
+- Prevent Malformed UTF-8 character error upon dump.
+
* Fri Sep 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.3-1
- updated spacewalk repos
- added scientific linux 6 repo
commit 429c0a117be9c093700a8e3f5bb88e05fc3c9498
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 22 13:28:53 2011 +0100
Prevent Malformed UTF-8 character error upon dump.
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index 0068ed4..b40593b 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -118,8 +118,9 @@ sub process_table {
} elsif ($types[$i] eq 'unknown' or $types[$i] eq 'BLOB') { # blobs
$row->[$i] =~ s!(.)! sprintf "\\\\%03o", ord($1) !seg;
} else {
+ utf8::encode($row->[$i]);
$row->[$i] =~ s!([\x00-\x1f\x5c])! sprintf "\\x%02x", ord($1) !seg;
- utf8::encode($row->[$i]); utf8::decode($row->[$i]);
+ utf8::decode($row->[$i]);
}
print $row->[$i];
} else {
12 years, 5 months
Changes to 'refs/tags/spacewalk-web-1.6.29-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.6.29-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-23 14:26 +0000
Tagging package [spacewalk-web] version [1.6.29-1] in directory [web/].
Changes since oracle-selinux-0.1.23.32-1:
Jan Pazdziora (5):
The Satellite is RHEL-only product, blacklist oracle-rhnsat-selinux on Fedoras.
Prepare the Fedora 16 tito target.
Enable also building on Fedora 16.
Fixing cancel a scheduled action on a server.
Automatic commit of package [spacewalk-web] release [1.6.29-1].
---
rel-eng/build-missing-builds-in-koji.sh | 2 -
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 1
rel-eng/comps/comps-spacewalk-server-fedora15.xml | 1
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1
rel-eng/koji-missing-builds.py | 3 +
rel-eng/packages/spacewalk-web | 2 -
rel-eng/releasers.conf | 2 -
rel-eng/tito.props | 10 +++--
web/modules/rhn/RHN/DB/Action.pm | 44 ++++++----------------
web/spacewalk-web.spec | 5 ++
10 files changed, 29 insertions(+), 42 deletions(-)
---
12 years, 5 months