rpms/rhnlib/devel rhnlib-ssl.patch,NONE,1.1 rhnlib.spec,1.15,1.16

[fedora-cvs-commits at redhat.com]

Author: misa

Update of /cvs/dist/rpms/rhnlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23560

Modified Files:
	rhnlib.spec 
Added Files:
	rhnlib-ssl.patch 
Log Message:
bugzilla: 165481  Rebuilding in HEAD

rhnlib-ssl.patch:
 SSL.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rhnlib-ssl.patch ---
Index: rhn/SSL.py
===================================================================
RCS file: /cvs/rhn/rhn/modules/rhnlib/rhn/SSL.py,v
retrieving revision 1.17
diff -u -r1.17 SSL.py
--- rhn/SSL.py	4 Jul 2004 02:35:01 -0000	1.17
+++ rhn/SSL.py	9 Aug 2005 20:26:18 -0000
@@ -2,11 +2,11 @@
 #
 # Higher-level SSL objects used by rpclib
 #
-# Copyright (c) 2002 Red Hat, Inc.
+# Copyright (c) 2002-2005 Red Hat, Inc.
 #
 # Author: Mihai Ibanescu <misa at redhat.com>
 
-# $Id: SSL.py,v 1.17 2004/07/04 02:35:01 misa Exp $
+# $Id: SSL.py,v 1.18 2005/07/05 22:05:02 wregglej Exp $
 
 """
 rhn.SSL builds an abstraction on top of the objects provided by pyOpenSSL


Index: rhnlib.spec
===================================================================
RCS file: /cvs/dist/rpms/rhnlib/devel/rhnlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rhnlib.spec	17 Mar 2005 19:26:08 -0000	1.15
+++ rhnlib.spec	10 Aug 2005 02:42:03 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Python libraries for the RHN project
 Name: rhnlib
 Version: 1.8
-Release: 6.p24.1
+Release: 6.p24.10
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
@@ -11,6 +11,7 @@
 Requires: pyOpenSSL python
 BuildRequires: python-devel
 Url: http://rhn.redhat.com
+Patch0: rhnlib-ssl.patch
 
 %description
 rhnlib is a collection of python modules used by the 
@@ -18,6 +19,7 @@
 
 %prep
 %setup
+%patch0 -p0 -b .timeout-ssl
 
 %build
 %{__python} setup.py build
@@ -36,6 +38,9 @@
 %doc ChangeLog COPYING README TODO
 
 %changelog
+* Tue Aug  9 2005 Mihai Ibanescu <misa at redhat.com> 1.8-6.p23.10
+- Fixed #165481 (setting socket timeouts causes uncaught SSL exceptions)
+
 * Thu Mar 17 2005 Mihai Ibanescu <misa at redhat.com> 1.8-6.p24.1
 - rebuild