rpms/globus-gsi-credential/EL-4 globus-gsi-credential-openssl.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gsi-credential.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3

[Mattias Ellert]

Author: ellert

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

Modified Files:
	.cvsignore globus-gsi-credential.spec import.log sources 
Added Files:
	globus-gsi-credential-openssl.patch 
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-1
- Upate to Globus Toolkit 5.0.0


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

--- NEW FILE globus-gsi-credential-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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 May 2009 07:30:59 -0000	1.2
+++ .cvsignore	9 Feb 2010 07:54:07 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_gsi_credential-2.2.tar.gz
+globus_gsi_credential-3.2.tar.gz


Index: globus-gsi-credential.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/EL-4/globus-gsi-credential.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-credential.spec	25 Jul 2009 07:32:29 -0000	1.3
+++ globus-gsi-credential.spec	9 Feb 2010 07:54:07 -0000	1.4
@@ -6,23 +6,26 @@
 
 Name:		globus-gsi-credential
 %global _name %(tr - _ <<< %{name})
-Version:	2.2
-Release:	3%{?dist}
+Version:	3.2
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Credential Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
 #		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/gsi/credential/source globus_gsi_credential-2.2
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_credential-2.2
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.0-all-source-installer.tar.bz2
+#		mv gt5.0.0-all-source-installer/source-trees/gsi/credential/source globus_gsi_credential-2.2
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_credential-2.2
 #		tar -zcf globus_gsi_credential-2.2.tar.gz globus_gsi_credential-2.2
 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
+#		Porting to compile with openssl 1.0.0:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6841
+Patch0:		%{name}-openssl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -97,6 +100,7 @@ Globus GSI Credential Library Documentat
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -198,6 +202,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-1
+- Upate to Globus Toolkit 5.0.0
+
+* 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
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	16 Jun 2009 02:03:45 -0000	1.2
+++ import.log	9 Feb 2010 07:54:07 -0000	1.3
@@ -1,2 +1,3 @@
 globus-gsi-credential-2_2-1_fc9:EL-4:globus-gsi-credential-2.2-1.fc9.src.rpm:1241681387
 globus-gsi-credential-2_2-2_fc9:EL-4:globus-gsi-credential-2.2-2.fc9.src.rpm:1245117806
+globus-gsi-credential-3_2-1_fc12:EL-4:globus-gsi-credential-3.2-1.fc12.src.rpm:1265702033


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 May 2009 07:31:00 -0000	1.2
+++ sources	9 Feb 2010 07:54:07 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-e08ef3c1efd5ba9337173c714c187072  globus_gsi_credential-2.2.tar.gz
+6b7bd28275ce14dc5e18c0c8b285da48  globus_gsi_credential-3.2.tar.gz