rpms/globus-gsi-credential/devel globus_gsi_credential-2.2-openssl.patch, NONE, 1.1 globus-gsi-credential.spec, 1.4, 1.5

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-credential/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18292

Modified Files:
	globus-gsi-credential.spec 
Added Files:
	globus_gsi_credential-2.2-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
- rebuilt with new openssl


globus_gsi_credential-2.2-openssl.patch:
 globus_gsi_cred_handle.c |   12 ++++++++++++
 globus_gsi_credential.h  |    4 ++++
 2 files changed, 16 insertions(+)

--- NEW FILE globus_gsi_credential-2.2-openssl.patch ---
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;
     


Index: globus-gsi-credential.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/devel/globus-gsi-credential.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-credential.spec	21 Aug 2009 13:34:36 -0000	1.4
+++ globus-gsi-credential.spec	22 Aug 2009 15:57:04 -0000	1.5
@@ -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 Documentat
 
 %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 at redhat.com> - 2.2-4
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
 - rebuilt with new openssl
 
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-3