backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 696e6cb3a4a18b4035b652c956736bfb4aaa844a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 16 14:52:01 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.9-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index eba92ff..af617b0 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.6.8
+Version: 1.6.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -672,6 +672,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Aug 16 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.9-1
+- 730452 - fixed table aliasses
+
* Mon Aug 15 2011 Miroslav Suchý 1.6.8-1
- make satCerts.py work on PostgreSQL
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 4894661..a6e8ac4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.8-1 backend/
+1.6.9-1 backend/
12 years, 8 months
backend/server
by Michael Mraka
backend/server/rhnChannel.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 3cf5d524129038e68cf4daf4d6191e6e7ddcfff4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 16 14:48:37 2011 +0200
730452 - fixed table aliasses
fixing
SQL Error generated: ('ORA-00904: "PR"."SENSE": invalid identifier\n', 904,
"select pp.package_id, 'provides', pp.capability_id, pp.sense, pc.name,
pc.version from rhnPackageProvides pp, rhnPackageCapability pc where
pp.package_id = :package_id and pp.capability_id = pc.id union all select
...
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index d3bb81f..c8af77d 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -1123,10 +1123,10 @@ def list_all_packages_complete_sql(channel_id):
and pr.capability_id = pc.id
union all
select
- pr.package_id,
+ prec.package_id,
'recommends',
- pr.capability_id,
- pr.sense,
+ prec.capability_id,
+ prec.sense,
pc.name,
pc.version
from
@@ -1137,10 +1137,10 @@ def list_all_packages_complete_sql(channel_id):
and prec.capability_id = pc.id
union all
select
- pr.package_id,
+ sugg.package_id,
'suggests',
- pr.capability_id,
- pr.sense,
+ sugg.capability_id,
+ sugg.sense,
pc.name,
pc.version
from
@@ -1151,10 +1151,10 @@ def list_all_packages_complete_sql(channel_id):
and sugg.capability_id = pc.id
union all
select
- pr.package_id,
+ supp.package_id,
'supplements',
- pr.capability_id,
- pr.sense,
+ supp.capability_id,
+ supp.sense,
pc.name,
pc.version
from
12 years, 8 months
client/rhel
by Milan Zazrivec
client/rhel/rhnlib/rhn/connections.py | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
New commits:
commit 1f67aa02da52c26d4954df3740227fcfe5d5949c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Aug 16 10:34:20 2011 +0200
730744 - support IPv6 connections
diff --git a/client/rhel/rhnlib/rhn/connections.py b/client/rhel/rhnlib/rhn/connections.py
index a33ce15..2403bf8 100644
--- a/client/rhel/rhnlib/rhn/connections.py
+++ b/client/rhel/rhnlib/rhn/connections.py
@@ -157,9 +157,31 @@ class HTTPSConnection(HTTPConnection):
def connect(self):
"Connect to a host on a given (SSL) port"
import socket
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.settimeout(SSL.DEFAULT_TIMEOUT)
- sock.connect((self.host, self.port))
+
+ results = socket.getaddrinfo(self.host, self.port,
+ socket.AF_UNSPEC, socket.SOCK_STREAM)
+
+ for r in results:
+ af, socktype, proto, canonname, sa = r
+ try:
+ sock = socket.socket(af, socktype, proto)
+ except socket.error, msg:
+ sock = None
+ continue
+
+ sock.settimeout(SSL.DEFAULT_TIMEOUT)
+
+ try:
+ sock.connect((self.host, self.port))
+ except socket.error, e:
+ sock.close()
+ sock = None
+ continue
+ break
+
+ if sock is None:
+ raise socket.error("Unable to connect to the host and port specified")
+
self.sock = SSL.SSLSocket(sock, self.trusted_certs)
self.sock.init_ssl()
12 years, 8 months
Changes to 'refs/tags/spacewalk-schema-1.6.7-1'
by Šimon Lukašík
Tag 'spacewalk-schema-1.6.7-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-08-16 09:04 +0000
Tagging package [spacewalk-schema] version [1.6.7-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.6.21-1:
Simon Lukasik (2):
Drop the old function, when creating a new one with different argumeters
Automatic commit of package [spacewalk-schema] release [1.6.7-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/003-assign_channel_entitlement.sql.postgresql | 7 +++++++
3 files changed, 13 insertions(+), 2 deletions(-)
---
12 years, 8 months
rel-eng/packages schema/spacewalk
by Šimon Lukašík
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 687c02da95102ff060fd300ab9de407e3816c0db
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 16 11:04:19 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.6.7-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index ae6970d..e2e3ede 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.6-1 schema/spacewalk/
+1.6.7-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index a61f9ed..b02d72b 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.6
+Version: 1.6.7
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Aug 16 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.7-1
+- Drop the old function, when creating a new one with different argumeters
+ (slukasik(a)redhat.com)
+
* Mon Aug 15 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.6-1
- 700385 - schema upgrade scripts
- 700385 - replaced synonym with original table_name
12 years, 8 months
schema/spacewalk
by Šimon Lukašík
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/003-assign_channel_entitlement.sql.postgresql | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 6f4fed1e542f8a794e6bff4b29a9d684f988b5bb
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 16 11:03:02 2011 +0200
Drop the old function, when creating a new one with different argumeters
Function gets not replaced by previous command, only overload.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/003-assign_channel_entitlement.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/003-assign_channel_entitlement.sql.postgresql
index 66a5f1b..d7839d3 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/003-assign_channel_entitlement.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/003-assign_channel_entitlement.sql.postgresql
@@ -119,5 +119,12 @@ as $$
end$$
language plpgsql;
+drop function assign_channel_entitlement(
+ channel_family_label_in varchar,
+ from_org_id_in numeric,
+ to_org_id_in numeric,
+ quantity_in numeric
+ );
+
-- restore the original setting
update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_entitlements')+1) ) where name = 'search_path';
12 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.6.21-1'
by Šimon Lukašík
Tag 'spacewalk-java-1.6.21-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-08-16 08:23 +0000
Tagging package [spacewalk-java] version [1.6.21-1] in directory [java/].
Changes since NPalert-1.126.25-1:
Simon Lukasik (2):
570925 - provide only a day for the subject of daily summary mail
Automatic commit of package [spacewalk-java] release [1.6.21-1].
Tomas Lestach (2):
729975 - do not allow to edit Red Hat errata
Revert "do not reuse system CLASSPATH variable"
---
java/build.xml | 6 ---
java/code/src/com/redhat/rhn/common/security/acl/Access.java | 18 ++++++++++
java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java | 2 -
java/code/webapp/WEB-INF/struts-config.xml | 2 -
java/spacewalk-java.spec | 9 ++++-
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 29 insertions(+), 10 deletions(-)
---
12 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 88016135e9cdf80df9686f687581741041ae7f52
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 16 10:23:24 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.21-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8102912..090b503 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.20
+Version: 1.6.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Aug 16 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.21-1
+- 570925 - provide only a day for the subject of daily summary mail
+ (slukasik(a)redhat.com)
+- Revert "do not reuse system CLASSPATH variable" (tlestach(a)redhat.com)
+- 729975 - do not allow to edit Red Hat errata (tlestach(a)redhat.com)
+- do not reuse system CLASSPATH variable (msuchy(a)redhat.com)
+
* Thu Aug 11 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.20-1
- 724918 - added missing acl checks (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b2930d9..c437850 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.20-1 java/
+1.6.21-1 java/
12 years, 8 months
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 19b29f1e22c892d87b553d3ed2c0eef98ccf52ab
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Aug 11 19:07:24 2011 +0200
570925 - provide only a day for the subject of daily summary mail
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java
index bcd2788..6479c0a 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java
@@ -161,7 +161,7 @@ public class DailySummary extends RhnJavaJob {
LocalizationService ls = LocalizationService.getInstance();
mail.setSubject(ls.getMessage(
- "dailysummary.email.subject", ls.formatDate(new Date())));
+ "dailysummary.email.subject", ls.formatShortDate(new Date())));
mail.setRecipient(ru.getAddress());
if (log.isDebugEnabled()) {
12 years, 8 months
java/build.xml
by Tomas Lestach
java/build.xml | 6 ------
1 file changed, 6 deletions(-)
New commits:
commit 354826fc2a9373903a0d9e962db91226c7f194ea
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 15 13:59:16 2011 +0200
Revert "do not reuse system CLASSPATH variable"
This reverts commit e3671b287b059783fdd7ffc784fae691276ac833.
Reverting because it breaks spacewalk-java build with:
[javac] /usr/src/redhat/BUILD/spacewalk-java-git-2.dd05ab2/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java:17: package com.sun.javadoc does not exist
[javac] import com.sun.javadoc.MethodDoc;
[javac] ^
[javac] /usr/src/redhat/BUILD/spacewalk-java-git-2.dd05ab2/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java:37: cannot find symbol
[javac] symbol : class MethodDoc
[javac] location: class com.redhat.rhn.internal.doclet.ApiCall
[javac] private MethodDoc method;
[javac] ^
diff --git a/java/build.xml b/java/build.xml
index 6ec0792..008223c 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -418,7 +418,6 @@
debug="on"
source="1.5"
target="1.5"
- includeantruntime="false"
nowarn="on">
<classpath>
<path refid="buildjars" />
@@ -447,7 +446,6 @@
srcdir="code/internal/src"
source="1.5"
target="1.5"
- includeantruntime="false"
classpathref="buildjars" >
</javac>
</target>
@@ -467,7 +465,6 @@
encoding="utf-8"
fork="yes"
memoryMaximumSize="512m"
- includeantruntime="false"
classpathref="buildjars" >
<src>
<path location="${build.dir}/src" />
@@ -512,7 +509,6 @@
encoding="utf-8"
fork="yes"
memoryMaximumSize="256m"
- includeantruntime="false"
classpathref="alljars" >
<src>
<path location="${build.dir}/src" />
@@ -640,7 +636,6 @@ delete from rhnChannel where label like 'ChannelLabel%';
deprecation="${deprecation}"
fork="yes"
memoryMaximumSize="512m"
- includeantruntime="false"
classpathref="alljars">
<src path="${build.dir}/jsp-temp"/>
</javac>
@@ -755,7 +750,6 @@ delete from rhnChannel where label like 'ChannelLabel%';
nowarn="on"
source="1.5"
target="1.5"
- includeantruntime="false"
classpathref="playpen.tests.buildpath" >
<src>
<path location="code/playpen/src" />
12 years, 8 months