Changes to 'refs/tags/spacewalk-java-1.5.55-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.55-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-13 07:44 +0000
Tagging package [spacewalk-java] version [1.5.55-1] in directory [java/].
Changes since spacewalk-proxy-1.5.10-1:
Jan Pazdziora (2):
720533 - replacing rhnServerNeededView with custom subselect which is generally equivalent, in the erratamailer_get_relevant_servers context.
Automatic commit of package [spacewalk-java] release [1.5.55-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 51 +++++++++-
java/spacewalk-java.spec | 6 -
rel-eng/packages/spacewalk-java | 2
3 files changed, 56 insertions(+), 3 deletions(-)
---
12 years, 9 months
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 a8aa243b5c6c9b761dbe0b2d466e010672c5fc4b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 13 09:44:18 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.55-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e4f61b7..3e11996 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.5.54
+Version: 1.5.55
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jul 13 2011 Jan Pazdziora 1.5.55-1
+- 720533 - replacing rhnServerNeededView with custom subselect which is
+ generally equivalent, in the erratamailer_get_relevant_servers context.
+
* Tue Jul 12 2011 Jan Pazdziora 1.5.54-1
- Using http://struts.apache.org/tags-* uris, fixing build issue on Fedoras and
RHEL 6.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a1e34a1..57ed5b9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.54-1 java/
+1.5.55-1 java/
12 years, 9 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 51 +++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
New commits:
commit 438f6e1820ae9ce7fad8529c484ce4b6bebabacd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 13 09:42:51 2011 +0200
720533 - replacing rhnServerNeededView with custom subselect which is generally equivalent, in the erratamailer_get_relevant_servers context.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index e038aa1..cbb969b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -471,7 +471,56 @@ ORDER BY next_action DESC
<query params="errata_id,org_id, channel_id">
SELECT snv.server_id AS server_id, S.name, S.release, SA.name as arch,
urn.user_id
- FROM rhnServerNeededCache snv
+ FROM (
+--
+select rhnChannelErrata.errata_id, rhnChannelErrata.channel_id, rhnServerChannel.server_id, rhnErrataPackage.package_id
+from rhnChannelErrata, rhnErrataPackage, rhnChannelNewestPackage, rhnPackageEVR,
+ rhnServerChannel, rhnServerPackage, rhnPackageUpgradeArchCompat
+where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
+--
+ and rhnChannelErrata.channel_id = rhnChannelNewestPackage.channel_id
+ and rhnErrataPackage.package_id = rhnChannelNewestPackage.package_id
+--
+ and rhnChannelErrata.channel_id = rhnServerChannel.channel_id
+ and rhnChannelNewestPackage.name_id = rhnServerPackage.name_id
+ and rhnServerChannel.server_id = rhnServerPackage.server_id
+--
+ and rhnChannelNewestPackage.evr_id = rhnPackageEVR.id
+--
+ and rhnServerPackage.package_arch_id = rhnPackageUpgradeArchCompat.package_arch_id
+ and rhnPackageUpgradeArchCompat.package_upgrade_arch_id = rhnChannelNewestPackage.package_arch_id
+--
+ and not exists (
+ -- rule out records where channels with lower id exist == get min
+ select 1 from rhnChannelPackage cp, rhnServerChannel csc
+ where cp.channel_id = csc.channel_id
+ and rhnChannelNewestPackage.package_id = cp.package_id
+ and rhnServerChannel.server_id = csc.server_id
+ and cp.channel_id < rhnChannelNewestPackage.channel_id
+ )
+ and not exists (
+ -- rule out records where the server has the same package name with higher evr
+ select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac
+ where rhnServerPackage.server_id = sp.server_id
+ and rhnServerPackage.name_id = sp.name_id
+ and sp.evr_id = sevr.id
+ and rhnPackageEVR.evr <= sevr.evr
+ and rhnServerPackage.package_arch_id = puac.package_arch_id
+ and puac.package_upgrade_arch_id = sp.package_arch_id
+ )
+ and not exists (
+ -- rule out records where other channel provides the same package name with higher evr
+ select 1 from rhnServerChannel csc, rhnChannelNewestPackage ocnp, rhnPackageEVR oevr, rhnPackageUpgradeArchCompat puac
+ where rhnServerChannel.server_id = csc.server_id
+ and csc.channel_id = ocnp.channel_id
+ and rhnServerPackage.name_id = ocnp.name_id
+ and ocnp.evr_id = oevr.id
+ and rhnPackageEVR.evr < oevr.evr
+ and rhnServerPackage.package_arch_id = puac.package_arch_id
+ and puac.package_upgrade_arch_id = ocnp.package_arch_id
+ )
+--
+ ) svn
JOIN rhnUserReceiveNotifications urn
ON snv.server_id = urn.server_id
JOIN rhnServerChannel sc
12 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-1.5.10-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.5.10-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-07-12 22:59 +0000
Tagging package [spacewalk-proxy] version [1.5.10-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-1.5.39-1:
Miroslav Suchý (2):
720837 - pass /ks handler through Broker
Automatic commit of package [spacewalk-proxy] release [1.5.10-1].
---
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 9 months
2 commits - proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit a770cd60cb93a25068b38094c9452372dab52c95
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 13 00:59:52 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.10-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index db172f9..c878dac 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.9
+Version: 1.5.10
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,9 @@ fi
%changelog
+* Wed Jul 13 2011 Miroslav Suchý 1.5.10-1
+- 720837 - pass /ks handler through Broker
+
* Mon Jul 11 2011 Miroslav Suchý 1.5.9-1
- optparse is here since python 2.3 - remove optik (msuchy(a)redhat.com)
- code cleanup
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 81e589e..5c669ba 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.9-1 proxy/proxy/
+1.5.10-1 proxy/proxy/
commit ba1fb03e5ba30b60c2e5f2858f2e032bc0c1a209
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 13 00:59:09 2011 +0200
720837 - pass /ks handler through Broker
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
index 338a3ce..e81e9c5 100644
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
+++ b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
@@ -24,6 +24,8 @@ WSGIScriptAlias /CONFIG-MANAGEMENT-TOOL /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /download /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /ty /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /ty-cksm /usr/share/rhn/wsgi/xmlrpc.py
+# bare metal kickstart
+WSGIScriptAlias /ks /usr/share/rhn/wsgi/xmlrpc.py
# others
WSGIScriptAlias /SAT /usr/share/rhn/wsgi/xmlrpc.py
12 years, 9 months
Changes to 'refs/tags/spacewalk-backend-1.5.39-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.5.39-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-07-12 22:18 +0000
Tagging package [spacewalk-backend] version [1.5.39-1] in directory [backend/].
Changes since yum-rhn-plugin-1.5.8-1:
Miroslav Suchý (3):
replace tab with spaces
695282 - censor password from registration.reserve_user if it appears in TB
Automatic commit of package [spacewalk-backend] release [1.5.39-1].
---
backend/common/rhnTB.py | 5 +++++
backend/spacewalk-backend.spec | 5 ++++-
proxy/proxy/rhnShared.py | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
---
12 years, 9 months
3 commits - backend/common backend/spacewalk-backend.spec proxy/proxy rel-eng/packages
by Miroslav Suchý
backend/common/rhnTB.py | 5 +++++
backend/spacewalk-backend.spec | 5 ++++-
proxy/proxy/rhnShared.py | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 22b0956a7ac280582c3eff11e162e3482115a69e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 13 00:18:33 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.39-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ee77bfc..76aa429 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.5.38
+Version: 1.5.39
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jul 13 2011 Miroslav Suchý 1.5.39-1
+- 695282 - censor password from registration.reserve_user if it appears in TB
+
* Mon Jul 11 2011 Miroslav Suchý 1.5.38-1
- optparse is here since python 2.3 - remove optik (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 677c968..1b31fca 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.38-1 backend/
+1.5.39-1 backend/
commit 5f6ded9cbdad6a5f238a67638bf2a174a5401306
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 13 00:17:54 2011 +0200
695282 - censor password from registration.reserve_user if it appears in TB
diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py
index 853fa92..fccc86d 100644
--- a/backend/common/rhnTB.py
+++ b/backend/common/rhnTB.py
@@ -14,6 +14,7 @@
#
#
+import re
import os
import sys
import time
@@ -81,6 +82,10 @@ def print_locals(fd = sys.stderr, tb = None):
s = "<ERROR WHILE PRINTING VALUE>"
if len(s) > 100 * 1024:
s = "<ERROR WHILE PRINTING VALUE: string representation too large>"
+ if re.search(r'<methodName>registration.reserve_user</methodName>', s):
+ result = re.match(r'.*<methodName>registration.reserve_user</methodName>.*?<param>.*?<value>.*?<value><string>(.*?)</string></value>.*', s, re.DOTALL)
+ if result: # add password to censor list
+ add_to_seclist(result.group(1))
fd.write("%s %s\n" % (type(value), s))
fd.write("\n")
commit 394e5e520370d6a511825d6390ce96cc09961d2c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jul 12 23:16:04 2011 +0200
replace tab with spaces
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 4481aff..9722063 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -358,7 +358,7 @@ class SharedHandler:
# At this point everything is sent to the server
# We now wait for the response
try:
- response = http_connection.getresponse()
+ response = http_connection.getresponse()
except TimeoutException, e:
log_error("Connection timed out")
return apache.HTTP_GATEWAY_TIME_OUT, None, None
12 years, 9 months
Changes to 'refs/tags/yum-rhn-plugin-1.5.8-1'
by Jan Pazdziora
Tag 'yum-rhn-plugin-1.5.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-12 15:35 +0000
Tagging package [yum-rhn-plugin] version [1.5.8-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-java-1.5.54-1:
Jan Pazdziora (2):
Fixing sloppy coding.
Automatic commit of package [yum-rhn-plugin] release [1.5.8-1].
---
client/rhel/yum-rhn-plugin/rhnplugin.py | 2 +-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 9 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8a5d4dec422ccddd66b5c8e7e871082b9a7518b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jul 12 17:35:21 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.5.8-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 953cc57..5d23f05 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.5.7
+Version: 1.5.8
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,9 @@ fi
%doc LICENSE
%changelog
+* Tue Jul 12 2011 Jan Pazdziora 1.5.8-1
+- Fixing sloppy coding.
+
* Tue Jun 28 2011 Miroslav Suchý 1.5.7-1
- 707241 - create progressbar even during groupinstall and do not delete
rhnplugin.repos during groupinstall command (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 39f4c01..ab986c4 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.5.7-1 client/rhel/yum-rhn-plugin/
+1.5.8-1 client/rhel/yum-rhn-plugin/
12 years, 9 months
client/rhel
by Jan Pazdziora
client/rhel/yum-rhn-plugin/rhnplugin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 61548de7b576703ffea3a03998eca3a00ada0e6f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jul 12 17:33:17 2011 +0200
Fixing sloppy coding.
Addressing
File "/usr/share/yum-plugins/rhnplugin.py", line 178, in prereposetup_hook
cachefile_content += already_exists_repos.id + "\n"
<type 'exceptions.AttributeError'>: 'list' object has no attribute 'id'
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 8660cf5..66e7a0e 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -175,7 +175,7 @@ def prereposetup_hook(conduit):
if type(already_exists_repos[0]) == type(repo): # repo is type of RhnRepo
# repo has been already initialized
if create_cache_even_second_time:
- cachefile_content += already_exists_repos.id + "\n"
+ cachefile_content += already_exists_repos[0].id + "\n"
continue
else: # YumRepository from _init, made for caching
callback = already_exists_repos[0].callback
12 years, 9 months