From 86983338ce67612f790a499b30c75f31c2802210 Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Aug 22 2009 15:57:04 +0000
Subject: - rebuilt with new openssl


---

diff --git a/globus-gsi-credential.spec b/globus-gsi-credential.spec
index a0a3d8d..8225cda 100644
--- a/globus-gsi-credential.spec
+++ b/globus-gsi-credential.spec
@@ -23,6 +23,7 @@ Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
+Patch1:		globus_gsi_credential-2.2-openssl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -97,6 +98,7 @@ Globus GSI Credential Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch1 -p1 -b .openssl
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -198,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.2-4
+* Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> - 2.2-4
 - rebuilt with new openssl
 
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.2-3
diff --git a/globus_gsi_credential-2.2-openssl.patch b/globus_gsi_credential-2.2-openssl.patch
new file mode 100644
index 0000000..076103a
--- /dev/null
+++ b/globus_gsi_credential-2.2-openssl.patch
@@ -0,0 +1,53 @@
+diff -up globus_gsi_credential-2.2/library/globus_gsi_credential.h.openssl globus_gsi_credential-2.2/library/globus_gsi_credential.h
+--- globus_gsi_credential-2.2/library/globus_gsi_credential.h.openssl	2007-08-06 22:49:25.000000000 +0200
++++ globus_gsi_credential-2.2/library/globus_gsi_credential.h	2009-08-22 10:17:05.000000000 +0200
+@@ -158,6 +158,10 @@ typedef struct globus_l_gsi_cred_handle_
+  *
+  * @see globus_gsi_cred_handle_init
+  */
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define STACK STACK_OF(OPENSSL_STRING)
++#endif
++
+ typedef struct globus_l_gsi_cred_handle_attrs_s *
+                                         globus_gsi_cred_handle_attrs_t;
+ 
+diff -up globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c.openssl globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c
+--- globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c.openssl	2008-09-11 14:52:50.000000000 +0200
++++ globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c	2009-08-22 11:13:04.000000000 +0200
+@@ -1279,7 +1279,11 @@ globus_gsi_cred_get_policies(
+         goto exit;
+     }
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10000000L 
+     if((*policies = sk_new_null()) == NULL)
++#else
++    if((*policies = sk_OPENSSL_STRING_new_null()) == NULL)
++#endif
+     {
+         GLOBUS_GSI_CRED_OPENSSL_ERROR_RESULT(
+             result,
+@@ -1358,7 +1362,11 @@ globus_gsi_cred_get_policies(
+             goto error_exit;
+         }
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10000000L 
+         if(sk_push(*policies, final_policy_string) == 0)
++#else
++        if(sk_OPENSSL_STRING_push(*policies, (OPENSSL_STRING)final_policy_string) == 0)
++#endif
+         {
+             GLOBUS_GSI_CRED_OPENSSL_ERROR_RESULT(
+                 result,
+@@ -1390,7 +1398,11 @@ globus_gsi_cred_get_policies(
+ 
+     if(*policies != NULL)
+     {
++#if OPENSSL_VERSION_NUMBER < 0x10000000L 
+         sk_pop_free(*policies, free);
++#else
++        sk_OPENSSL_STRING_pop_free(*policies, free);
++#endif
+     }
+     *policies = NULL;
+