rpms/virtuoso-opensource/devel virtuoso-opensource-5.0.11-openssl.patch, 1.1, 1.2

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21628

Modified Files:
	virtuoso-opensource-5.0.11-openssl.patch 
Log Message:
- more fixes needed for the rebuild


virtuoso-opensource-5.0.11-openssl.patch:
 Dk/Dkernel.c |   24 ++++++++++++++----------
 Wi/http.c    |   12 ++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

Index: virtuoso-opensource-5.0.11-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource-5.0.11-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource-5.0.11-openssl.patch	26 Aug 2009 14:06:35 -0000	1.1
+++ virtuoso-opensource-5.0.11-openssl.patch	26 Aug 2009 14:28:46 -0000	1.2
@@ -75,3 +75,40 @@ diff -up virtuoso-opensource-5.0.11/libs
    return 1;
  }
  
+diff -up virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl virtuoso-opensource-5.0.11/libsrc/Wi/http.c
+--- virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl	2009-04-19 23:48:56.000000000 +0200
++++ virtuoso-opensource-5.0.11/libsrc/Wi/http.c	2009-08-26 16:28:03.000000000 +0200
+@@ -7601,13 +7601,13 @@ http_set_ssl_listen (dk_session_t * list
+       SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
+       skCAList = SSL_CTX_get_client_CA_list(ssl_ctx);
+ 
+-      if (sk_num((STACK *) skCAList) == 0)
++      if (sk_X509_NAME_num(skCAList) == 0)
+ 	log_warning ("HTTPS Client authentication requested but no CA known for verification");
+ 
+-      for (i = 0; i < sk_num((STACK *) skCAList); i++)
++      for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
+ 	{
+ 	  char ca_buf[1024];
+-	  X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
++	  X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
+ 	  if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
+ 	    log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
+ 	}
+@@ -9697,13 +9697,13 @@ http_init_part_two ()
+ 
+ 	  SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
+ 	  skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
+-	  if (sk_num((STACK *) skCAList) == 0)
++	  if (sk_X509_NAME_num(skCAList) == 0)
+ 	    log_warning ("HTTPS Client authentication requested but no CA known for verification");
+ 
+-	  for (i = 0; i < sk_num((STACK *) skCAList); i++)
++	  for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
+ 	    {
+ 	      char ca_buf[1024];
+-	      X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
++	      X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
+               if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
+ 		log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
+ 	    }