Changes to 'refs/tags/spacewalk-backend-0.8.40-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.40-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-29 20:02 +0000
Tagging package [spacewalk-backend] version [0.8.40-1] in directory [backend/].
Changes since rhncfg-5.9.17-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [0.8.40-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit fc4a2a8c7ddb5c1e1016c38bf5b36c5dada172d9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 21:02:20 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.40-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7340ff1..76488ad 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.39
+Version: 0.8.40
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -625,6 +625,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jan 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.40-1
+- fixed the sha module is deprecated
+- fixed maximum recursion depth exceeded
+
* Fri Jan 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.39-1
- fixed ISE on F12 mod_wsgi
- 545389 - initial satellite-sync performance issue -- force use of index.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2475609..1b8947a 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.39-1 backend/
+0.8.40-1 backend/
14 years, 2 months
Changes to 'refs/tags/rhncfg-5.9.17-1'
by Michael Mraka
Tag 'rhncfg-5.9.17-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-29 19:58 +0000
Tagging package [rhncfg] version [5.9.17-1] in directory [client/tools/rhncfg/].
Changes since osad-5.9.27-1:
Michael Mraka (1):
Automatic commit of package [rhncfg] release [5.9.17-1].
---
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 2 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1ee7941ef6c7a356cdea6af289243750042fadc3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 20:58:12 2010 +0100
Automatic commit of package [rhncfg] release [5.9.17-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 2e4090f..a6aac64 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.16
+Version: 5.9.17
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jan 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 5.9.17-1
+- fixed the sha module is deprecated
+
* Wed Jan 27 2010 Miroslav Suchy <msuchy(a)redhat.com> 5.9.16-1
- replaced popen2 with subprocess in client (michael.mraka(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index ec4235a..0a28eef 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.16-1 client/tools/rhncfg/
+5.9.17-1 client/tools/rhncfg/
14 years, 2 months
Changes to 'refs/tags/osad-5.9.27-1'
by Michael Mraka
Tag 'osad-5.9.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-29 19:57 +0000
Tagging package [osad] version [5.9.27-1] in directory [client/tools/osad/].
Changes since spacewalk-java-0.8.9-1:
Michael Mraka (5):
having __getattr__ defined by getattr causes recursion
fixed DeprecationWarning: the sha module is deprecated; use the hashlib module instead
fixed DeprecationWarning: the sha module is deprecated; use the hashlib module instead
fixed DeprecationWarning: the sha module is deprecated; use the hashlib module instead
Automatic commit of package [osad] release [5.9.27-1].
---
backend/server/rhnActivationKey.py | 4 ++--
backend/spacewalk/common/rhn_rpm.py | 7 +++----
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/jabber_lib.py | 14 +++++++-------
client/tools/rhncfg/config_common/utils.py | 14 ++++++++++++--
rel-eng/packages/osad | 2 +-
6 files changed, 29 insertions(+), 17 deletions(-)
---
14 years, 2 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8303ecd6bad837cb2c1f9abde0d8355eec6f05ed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 20:57:36 2010 +0100
Automatic commit of package [osad] release [5.9.27-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index ecfa67b..08aba72 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.26
+Version: 5.9.27
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -240,6 +240,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$
%changelog
+* Fri Jan 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 5.9.27-1
+- fixed the sha module is deprecated
+
* Fri Jan 29 2010 Jan Pazdziora 5.9.26-1
- 559230 - address errors during package removal.
- Do not hide any error messages produced by semanage port -a.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index f282b12..ba75528 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.9.26-1 client/tools/osad/
+5.9.27-1 client/tools/osad/
14 years, 2 months
4 commits - backend/server backend/spacewalk client/tools
by Michael Mraka
backend/server/rhnActivationKey.py | 4 ++--
backend/spacewalk/common/rhn_rpm.py | 7 +++----
client/tools/osad/src/jabber_lib.py | 14 +++++++-------
client/tools/rhncfg/config_common/utils.py | 14 ++++++++++++--
4 files changed, 24 insertions(+), 15 deletions(-)
New commits:
commit 6c9624ab7ec3a9962030a755c86e0d1f3617d40b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 20:53:42 2010 +0100
fixed DeprecationWarning: the sha module is deprecated; use the hashlib module instead
diff --git a/client/tools/rhncfg/config_common/utils.py b/client/tools/rhncfg/config_common/utils.py
index 9e7b763..6f89326 100644
--- a/client/tools/rhncfg/config_common/utils.py
+++ b/client/tools/rhncfg/config_common/utils.py
@@ -14,7 +14,17 @@
#
import os
-import sha
+try:
+ import hashlib
+except ImportError:
+ import sha
+ class hashlib:
+ @staticmethod
+ def new(checksum):
+ if checksum == 'sha1':
+ return sha.new()
+ else:
+ raise ValueError, "Incompatible checksum type"
import re
import string
import shutil
@@ -146,7 +156,7 @@ def rm_trailing_slash(slashstring):
def sha1_file(file):
- engine = sha.new()
+ engine = hashlib.new('sha1')
fh = open(file, "r")
while 1:
commit feae47010f2db21c8c32558c71326bf47b00e48c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 20:48:04 2010 +0100
fixed DeprecationWarning: the sha module is deprecated; use the hashlib module instead
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index bbe2b4b..403b5b7 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -14,7 +14,7 @@
#
import os
-import sha
+import hashlib
import sys
import time
import types
@@ -332,9 +332,9 @@ def check_cert(cert_path):
raise InvalidCertError("Expired certificate", cert_path)
def sign(secret_key, *values):
- h = sha.new(secret_key).hexdigest()
+ h = hashlib.new('sha1', secret_key).hexdigest()
for v in values:
- h = sha.new(h + str(v)).hexdigest()
+ h = hashlib.new('sha1', h + str(v)).hexdigest()
return h
class JabberCallback:
@@ -870,13 +870,13 @@ class JabberClient(jabber.Client):
token = auth_ret_query.getTag('token').getData()
seq = auth_ret_query.getTag('sequence').getData()
- h = sha.new(sha.new(password).hexdigest() + token).hexdigest()
+ h = hashlib.new('sha1', hashlib.new('sha1', password).hexdigest() + token).hexdigest()
for i in range(int(seq)):
- h = sha.new(h).hexdigest()
+ h = hashlib.new('sha1', h).hexdigest()
q.insertTag('hash').insertData(h)
elif auth_ret_query.getTag('digest'):
digest = q.insertTag('digest')
- digest.insertData(sha.new(
+ digest.insertData(hashlib.new('sha1',
self.getIncomingID() + password).hexdigest() )
else:
q.insertTag('password').insertData(password)
@@ -1332,7 +1332,7 @@ def generate_random_string(length=20):
return ''
random_bytes = 16
length = int(length)
- s = sha.new()
+ s = hashlib.new('sha1')
s.update("%.8f" % time.time())
s.update(str(os.getpid()))
devrandom = open('/dev/urandom')
commit 7e2fb653142df7675b49a80eedb4d79976bbc0b1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 20:39:40 2010 +0100
fixed DeprecationWarning: the sha module is deprecated; use the hashlib module instead
diff --git a/backend/server/rhnActivationKey.py b/backend/server/rhnActivationKey.py
index fe7930b..4a63613 100644
--- a/backend/server/rhnActivationKey.py
+++ b/backend/server/rhnActivationKey.py
@@ -17,7 +17,7 @@
# $Id$
import os
-import sha
+import hashlib
import time
import types
@@ -184,7 +184,7 @@ class ActivationKey:
def generate_token(self):
- s = sha.new()
+ s = hashlib.new('sha1')
s.update(str(os.getpid()))
for field in ['org_id', 'user_id', 'server_id']:
if self._row_reg_token.has_key(field):
commit b1b0e8025d31c0112dbf5b75d49155826052e8e0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 29 20:07:39 2010 +0100
having __getattr__ defined by getattr causes recursion
but removing __getattr__ made hdrFromFdno() unknown so defined it explicitely
adressed
Exception RuntimeError: 'maximum recursion depth exceeded while calling
a Python object' in <type 'exceptions.AttributeError'> ignored
in if not hasattr(self, 'ts'):
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 2c6cbe4..c2555f5 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -65,9 +65,6 @@ class RPMTransaction:
self.ts = rpm.TransactionSet()
self.tsflags = []
- def __getattr__(self, attr):
- return getattr(self.ts, attr)
-
def getMethod(self, method):
# in theory, we can override this with
# profile/etc info
@@ -109,6 +106,8 @@ class RPMTransaction:
def run(self, callback, user_data):
return self.ts.run(callback, user_data)
+ def hdrFromFdno(self, fd):
+ return self.ts.hdrFromFdno(fd)
@@ -274,7 +273,7 @@ def get_package_header(filename=None, file=None, fd=None):
# RHEL-4 and older, do the old way
ts = RPMReadOnlyTransaction()
ts.pushVSFlags(~(rpm.RPMVSF_NOMD5 | rpm.RPMVSF_NEEDPAYLOAD))
- hdr = RPMReadOnlyTransaction().hdrFromFdno(file_desc)
+ hdr = ts.hdrFromFdno(file_desc)
ts.popVSFlags()
if hdr is None:
raise InvalidPackageError
14 years, 2 months
Changes to 'refs/tags/spacewalk-java-0.8.9-1'
by Miroslav Suchý
Tag 'spacewalk-java-0.8.9-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-01-29 16:44 +0000
Tagging package [spacewalk-java] version [0.8.9-1] in directory [java/].
Changes since rhnclient-0.8-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-java] release [0.8.9-1].
---
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
---
14 years, 2 months
Changes to 'refs/tags/rhnclient-0.8-1'
by Miroslav Suchý
Tag 'rhnclient-0.8-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-01-29 16:43 +0000
Tagging package [rhnclient] version [0.8-1] in directory [client/solaris/rhnclient/].
Changes since smartpm-0.4-1:
Miroslav Suchý (1):
Automatic commit of package [rhnclient] release [0.8-1].
---
client/solaris/rhnclient/rhnclient.spec | 5 ++++-
rel-eng/packages/rhnclient | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 2 months
2 commits - client/solaris java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
client/solaris/rhnclient/rhnclient.spec | 5 ++++-
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/rhnclient | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 272751fd5dbb3031704d953bd8f03690b4d9bd21
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 29 17:44:44 2010 +0100
Automatic commit of package [spacewalk-java] release [0.8.9-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9c4b9d5..640a172 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.8
+Version: 0.8.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -283,6 +283,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 29 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.8.9-1
+- 539159 - offering only ssm systems with appropriate permissions for config channel unsubscription (tlestach(a)redhat.com)
+- 539159 - offering only ssm systems with appropriate permissions for config channel subscription (tlestach(a)redhat.com)
+- 538435 - fixing issue where cloning a channel wouldnt properly clone the activation keys, and wouldnt update the default session key properly (jsherril(a)redhat.com)
+- 506950 - fixing issue where RedHat channels tab would show up for spacewalk users (jsherril(a)redhat.com)
+fixing issue that kept spacewalk from working with the newest cobbler (jsherril(a)redhat.com)
+- 559284 - fixing issue where _ & - characters were being removed from cobbler names (jsherril(a)redhat.com)
+
* Wed Jan 27 2010 Justin Sherrill <jsherril(a)redhat.com> 0.8.8-1
- fixing api doc (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dcd1af4..0374ca5 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.8.8-1 java/
+0.8.9-1 java/
commit 08425db3f1b24cad41bb783b4628dd16c18b9a07
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 29 17:43:08 2010 +0100
Automatic commit of package [rhnclient] release [0.8-1].
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index 5e59c31..06cd5d1 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -5,7 +5,7 @@
Summary: Red Hat Network Client Utilities and Libraries
Name: rhnclient
Source0: %{name}-%{version}.tar.gz
-Version: 0.7
+Version: 0.8
Release: 1
License: GPLv2
Group: Development/Libraries
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
#%doc ChangeLog COPYING README TODO
%changelog
+* Fri Jan 29 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.8-1
+- replaced popen2 with subprocess in client (michael.mraka(a)redhat.com)
+
* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7-1
- Reverting the client/solaris/rhnclient/rhnclient.spec part of the patch. (jpazdziora(a)redhat.com)
- Log files should be ghosted rather than belonging to a package (m.d.chappell(a)bath.ac.uk)
diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient
index 599133a..2c53826 100644
--- a/rel-eng/packages/rhnclient
+++ b/rel-eng/packages/rhnclient
@@ -1 +1 @@
-0.7-1 client/solaris/rhnclient/
+0.8-1 client/solaris/rhnclient/
14 years, 2 months