rpms/tomcat-native/devel tomcat-native-1.1.16-openssl.patch, 1.1, 1.2

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20249

Modified Files:
	tomcat-native-1.1.16-openssl.patch 
Log Message:
- more fixes needed for the rebuild


tomcat-native-1.1.16-openssl.patch:
 sslcontext.c |    4 ++--
 sslutils.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: tomcat-native-1.1.16-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native-1.1.16-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tomcat-native-1.1.16-openssl.patch	26 Aug 2009 12:52:37 -0000	1.1
+++ tomcat-native-1.1.16-openssl.patch	26 Aug 2009 14:25:52 -0000	1.2
@@ -1,3 +1,19 @@
+diff -up tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslcontext.c
+--- tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl	2008-01-01 18:33:12.000000000 +0100
++++ tomcat-native-1.1.16-src/jni/native/src/sslcontext.c	2009-08-26 16:24:44.000000000 +0200
+@@ -366,10 +366,10 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
+         if (ca_certs == NULL) {
+             SSL_load_client_CA_file(J2S(file));
+             if (ca_certs != NULL)
+-                SSL_CTX_set_client_CA_list(c->ctx, (STACK *)ca_certs);
++                SSL_CTX_set_client_CA_list(c->ctx, ca_certs);
+         }
+         else {
+-            if (!SSL_add_file_cert_subjects_to_stack((STACK *)ca_certs, J2S(file)))
++            if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
+                 ca_certs = NULL;
+         }
+         if (ca_certs == NULL && c->verify_mode == SSL_CVERIFY_REQUIRE) {
 diff -up tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslutils.c
 --- tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl	2006-11-25 11:22:33.000000000 +0100
 +++ tomcat-native-1.1.16-src/jni/native/src/sslutils.c	2009-08-26 14:50:58.000000000 +0200