[Cluster-devel] conga ./.cvsignore ./download_files luci/conga ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-03-27 03:07:39

Modified files:
	.              : .cvsignore download_files 
	luci/conga_ssl : SSLClient.cpp conga_ssl_lib.cpp setup.py 

Log message:
	- Fix a bug that could caused blocking connections under some circumstances.
	- Include a new test script that uses the conga SSL python module.
	- Upgrade to Zope 2.8.9.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/.cvsignore.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.4.2.1&r2=1.4.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.1&r2=1.5.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/conga_ssl/SSLClient.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2&r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/conga_ssl/conga_ssl_lib.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2&r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/conga_ssl/setup.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1&r2=1.1.4.1

--- conga/.cvsignore	2007/02/07 18:30:53	1.4.2.1
+++ conga/.cvsignore	2007/03/27 02:07:39	1.4.2.2
@@ -1,4 +1,5 @@
 Plone-*.tar.gz
+Five-*.tgz
 Zope-*.tgz
 conga.spec.in
 conga.spec
--- conga/download_files	2007/02/02 18:22:41	1.5.2.1
+++ conga/download_files	2007/03/27 02:07:39	1.5.2.2
@@ -2,10 +2,10 @@
 # URLs is a space delimited list of urls to download from
 
 
-ZOPE_ARCHIVE=Zope-2.8.8-final
-ZOPE_ARCHIVE_TAR=Zope-2.8.8-final.tgz
-ZOPE_MD5SUM=6deaf23f8a77a1d6f0be43864cff9b54
-ZOPE_URLs="http://www.zope.org/Products/Zope/2.8.8/Zope-2.8.8-final.tgz"
+ZOPE_ARCHIVE=Zope-2.8.9-final
+ZOPE_ARCHIVE_TAR=Zope-2.8.9-final.tgz
+ZOPE_MD5SUM=afe67f446ed602fa7ae0137e05d095cb
+ZOPE_URLs="http://www.zope.org/Products/Zope/2.8.9/Zope-2.8.9-final.tgz"
 
 
 ZOPE_FIVE_ARCHIVE=Five
--- conga/luci/conga_ssl/SSLClient.cpp	2006/12/21 21:32:00	1.2
+++ conga/luci/conga_ssl/SSLClient.cpp	2007/03/27 02:07:39	1.2.2.1
@@ -81,14 +81,14 @@
   if (!SSL_CTX_load_verify_locations(ctx, 
 				     _trust_CAs, 
 				     NULL))
-    cout << "failed to load trusted CAs" << endl;
+    ;//cout << "failed to load trusted CAs" << endl;
   
   STACK_OF(X509_NAME) *cert_names = 
     SSL_load_client_CA_file(_trust_CAs);
   if (cert_names)
     SSL_CTX_set_client_CA_list(ctx, cert_names);
-  else
-    cout << "failed to load trusted CAs" << endl;
+//  else
+//    cout << "failed to load trusted CAs" << endl;
   
   // load saved certs
   
--- conga/luci/conga_ssl/conga_ssl_lib.cpp	2006/12/21 21:32:00	1.2
+++ conga/luci/conga_ssl/conga_ssl_lib.cpp	2007/03/27 02:07:39	1.2.2.1
@@ -133,7 +133,7 @@
     counting_auto_ptr<SSLClient> ss;
     {
       PythonThreadsAllower all;
-      ClientSocket sock(hostname, port);
+      ClientSocket sock(hostname, port, timeout * 1000);
       ss = counting_auto_ptr<SSLClient>(new SSLClient(sock));
       ss->connect(timeout * 1000);
     }
--- conga/luci/conga_ssl/setup.py	2006/12/06 22:34:09	1.1
+++ conga/luci/conga_ssl/setup.py	2007/03/27 02:07:39	1.1.4.1
@@ -13,6 +13,7 @@
                                'SSLClient.cpp', 
                                '../../ricci/common/ClientSocket.cpp', 
                                '../../ricci/common/Socket.cpp', 
+                               '../../ricci/common/Network.cpp', 
                                '../../ricci/common/Logger.cpp', 
                                '../../ricci/common/Time.cpp', 
                                '../../ricci/common/File.cpp',