[Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-08-27 14:59:18

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 
	ricci/ricci    : SSLInstance.cpp 

Log message:
	Update the changelog and bump the version

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.100&r2=1.45.2.101
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.44&r2=1.21.2.45
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/SSLInstance.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.5&r2=1.5.2.6

--- conga/conga.spec.in.in	2008/08/07 18:07:36	1.45.2.100
+++ conga/conga.spec.in.in	2008/08/27 14:59:17	1.45.2.101
@@ -312,6 +312,10 @@
 
 ###  changelog ###
 %changelog
+* Wed Aug 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-4
+- Fix bz459562 (charset configuration fix for luci)
+- Fix bz459469 (An unknown device type was given: "gnbd.")
+
 * Thu Aug 07 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-3
 - More fixes for bz429350
 
--- conga/make/version.in	2008/08/07 18:08:24	1.21.2.44
+++ conga/make/version.in	2008/08/27 14:59:18	1.21.2.45
@@ -1,2 +1,2 @@
 VERSION=0.12.1
-RELEASE=3
+RELEASE=4
--- conga/ricci/ricci/SSLInstance.cpp	2008/08/20 05:01:37	1.5.2.5
+++ conga/ricci/ricci/SSLInstance.cpp	2008/08/27 14:59:18	1.5.2.6
@@ -498,7 +498,7 @@
 			e = "SSL_ERROR_WANT_X509_LOOKUP";
 			break;
 		case SSL_ERROR_SYSCALL:
-			if (errno == EAGAIN || errno == EINTR)
+			if (err == EAGAIN || err == EINTR)
 				return;
 			e = "SSL_ERROR_SYSCALL";
 			break;