rpms/globus-gssapi-gsi/F-11 globus-gssapi-gsi-openssl.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gssapi-gsi.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-gssapi-gsi-doxygen.patch, 1.1, NONE globus-gssapi-gsi-labels.patch, 1.1, NONE globus-gssapi-gsi-sslinit.patch, 1.1, NONE globus-gssapi-gsi-type-punned-pointer.patch, 1.1, NONE

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gssapi-gsi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9740/F-11

Modified Files:
	.cvsignore globus-gssapi-gsi.spec import.log sources 
Added Files:
	globus-gssapi-gsi-openssl.patch 
Removed Files:
	globus-gssapi-gsi-doxygen.patch globus-gssapi-gsi-labels.patch 
	globus-gssapi-gsi-sslinit.patch 
	globus-gssapi-gsi-type-punned-pointer.patch 
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.0-1
- Update to Globus Toolkit 5.0.0


globus-gssapi-gsi-openssl.patch:
 globus_i_gsi_gss_utils.c |   20 +++++++++++------
 globus_ssl_locl.h        |   54 +++++++++++++++++++++++++++++++++++++++++++++++
 import_sec_context.c     |   10 +-------
 3 files changed, 69 insertions(+), 15 deletions(-)

--- NEW FILE globus-gssapi-gsi-openssl.patch ---
diff -Nur globus_gssapi_gsi-7.0.orig/library/globus_i_gsi_gss_utils.c globus_gssapi_gsi-7.0/library/globus_i_gsi_gss_utils.c
--- globus_gssapi_gsi-7.0.orig/library/globus_i_gsi_gss_utils.c	2009-09-24 21:09:45.000000000 +0200
+++ globus_gssapi_gsi-7.0/library/globus_i_gsi_gss_utils.c	2010-01-28 17:43:49.046763807 +0100
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "ssl_locl.h"
+#include "globus_ssl_locl.h"
 
 #ifdef WIN32
 #define strcasecmp stricmp
@@ -270,7 +270,7 @@
             goto exit;
         }
         
-        memset(context, (int)NULL, sizeof(gss_ctx_id_desc));
+        memset(context, 0, sizeof(gss_ctx_id_desc));
         *context_handle_P = context;
         context->ctx_flags = 0;
     }
@@ -295,7 +295,7 @@
         goto free_context;
     }
 
-    memset(context->peer_cred_handle, (int) NULL, sizeof(gss_cred_id_desc));
+    memset(context->peer_cred_handle, 0, sizeof(gss_cred_id_desc));
     
     local_result = globus_gsi_cred_handle_init(
         &context->peer_cred_handle->cred_handle, NULL);
@@ -564,14 +564,14 @@
     {
         char buff[256];
         int i;
-        STACK *sk;
+        STACK_OF(SSL_CIPHER) *sk;
         
         GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(
             2, "Ciphers available:\n");
-        sk=(STACK *)SSL_get_ciphers(context->gss_ssl);
-        for (i=0; i<sk_num(sk); i++)
+        sk=SSL_get_ciphers(context->gss_ssl);
+        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
         {
-            SSL_CIPHER_description((SSL_CIPHER *)sk_value(sk,i),
+            SSL_CIPHER_description(sk_SSL_CIPHER_value(sk,i),
                                    buff,256);
             GLOBUS_I_GSI_GSSAPI_DEBUG_FPRINTF(
                 3, (globus_i_gsi_gssapi_debug_fstream, buff));
@@ -1961,6 +1961,9 @@
         ssl_handle->session,
         &ssl_handle->s3->tmp.new_sym_enc,
         &ssl_handle->s3->tmp.new_hash,
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+        NULL, NULL,
+#endif
         (SSL_COMP **) &ssl_handle->s3->tmp.new_compression);
     if (!ssl_result)
     {
@@ -1989,6 +1992,9 @@
         ssl_handle->session,
         &ssl_handle->s3->tmp.new_sym_enc,
         &ssl_handle->s3->tmp.new_hash,
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+        NULL, NULL,
+#endif
         (SSL_COMP **) &ssl_handle->s3->tmp.new_compression);
     if (!ssl_result)
     {
diff -Nur globus_gssapi_gsi-7.0.orig/library/globus_ssl_locl.h globus_gssapi_gsi-7.0/library/globus_ssl_locl.h
--- globus_gssapi_gsi-7.0.orig/library/globus_ssl_locl.h	1970-01-01 01:00:00.000000000 +0100
+++ globus_gssapi_gsi-7.0/library/globus_ssl_locl.h	2010-01-28 17:41:46.262764435 +0100
@@ -0,0 +1,54 @@
+#ifndef GLOBUS_SSL_LOCL_H
+#define GLOBUS_SSL_LOCL_H
+
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+#define SSL_STRONG_MASK 0x000001fcL
+#else
+#define SSL_STRONG_MASK 0x000000fcL
+#endif
+
+#define SSL_LOW 0x00000020L
+
+typedef struct ssl3_enc_method
+	{
+	int (*enc)(SSL *, int);
+	int (*mac)(SSL *, unsigned char *, int);
+	int (*setup_key_block)(SSL *);
+	int (*generate_master_secret)(SSL *, unsigned char *, unsigned char *, int);
+	int (*change_cipher_state)(SSL *, int);
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+	int (*final_finish_mac)(SSL *, EVP_MD_CTX *, EVP_MD_CTX *, const char *, int, unsigned char *);
+#else
+	int (*final_finish_mac)(SSL *, const char *, int, unsigned char *);
+#endif
+	int finish_mac_length;
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+	int (*cert_verify_mac)(SSL *, EVP_MD_CTX *, unsigned char *);
+#else
+	int (*cert_verify_mac)(SSL *, int, unsigned char *);
+#endif
+	const char *client_finished_label;
+	int client_finished_label_len;
+	const char *server_finished_label;
+	int server_finished_label_len;
+	int (*alert_value)(int);
+	} SSL3_ENC_METHOD;
+
+int ssl3_setup_buffers(SSL *s);
+
+int ssl_init_wbio_buffer(SSL *s, int push);
+void ssl_free_wbio_buffer(SSL *s);
+
+int ssl3_setup_key_block(SSL *s);
+void ssl3_cleanup_key_block(SSL *s);
+
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
+		       const EVP_MD **md, int *mac_pkey_type,
+		       int *mac_secret_size, SSL_COMP **comp);
+#else
+int ssl_cipher_get_evp(SSL_SESSION *s, const EVP_CIPHER **enc,
+		       const EVP_MD **md, SSL_COMP **comp);
+#endif
+
+#endif
diff -Nur globus_gssapi_gsi-7.0.orig/library/import_sec_context.c globus_gssapi_gsi-7.0/library/import_sec_context.c
--- globus_gssapi_gsi-7.0.orig/library/import_sec_context.c	2009-09-24 21:09:45.000000000 +0200
+++ globus_gssapi_gsi-7.0/library/import_sec_context.c	2010-01-28 17:43:46.166763360 +0100
@@ -33,16 +33,10 @@
 #include "openssl/crypto.h"
 #include "openssl/rand.h"
 #include "openssl/ssl2.h"
-#include "ssl_locl.h"
+#include "openssl/ssl3.h"
+#include "globus_ssl_locl.h"
 #include <string.h>
 
-/*
- * inorder to define a number of low level ssl routines
- * we need to include non installed header
- * #include <ssl_locl.h>
- * We will define the four routines here. 
- */
-
 /**
  * @name Import Security Context
  * @ingroup globus_gsi_gssapi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 May 2009 05:24:54 -0000	1.2
+++ .cvsignore	9 Feb 2010 08:03:35 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_gssapi_gsi-5.9.tar.gz
+globus_gssapi_gsi-7.0.tar.gz


Index: globus-gssapi-gsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-11/globus-gssapi-gsi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gssapi-gsi.spec	25 Jul 2009 07:36:21 -0000	1.3
+++ globus-gssapi-gsi.spec	9 Feb 2010 08:03:37 -0000	1.4
@@ -6,8 +6,8 @@
 
 Name:		globus-gssapi-gsi
 %global _name %(tr - _ <<< %{name})
-Version:	5.9
-Release:	4%{?dist}
+Version:	7.0
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GSSAPI library
 
 Group:		System Environment/Libraries
@@ -16,28 +16,20 @@ Group:		System Environment/Libraries
 License:	ASL 2.0 and OpenSSL
 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/gssapi/source globus_gssapi_gsi-5.9
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gssapi_gsi-5.9
-#		tar -zcf globus_gssapi_gsi-5.9.tar.gz globus_gssapi_gsi-5.9
+#		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/gssapi/source globus_gssapi_gsi-7.0
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gssapi_gsi-7.0
+#		# Remove unused headers with questionable licensing
+#		rm library/pkcs11*.h library/ssl_locl.h
+#		tar -zcf globus_gssapi_gsi-7.0.tar.gz globus_gssapi_gsi-7.0
 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
-#		Use versioned symbols for GSSAPI functions (like kerberos):
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6415
-#		http://bugzilla.nordugrid.org/show_bug.cgi?id=1106
-Patch0:		%{name}-labels.patch
-#		Fix some doxygen warnings:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6479
-Patch1:		%{name}-doxygen.patch
-#		SSL_library_init not threadsafe:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
-Patch2:		%{name}-sslinit.patch
-#		Dereferencing of type-punned pointers:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6604
-Patch3:		%{name}-type-punned-pointer.patch
+#		Fixes for openssl 1.0.0:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6956
+Patch0:		%{name}-openssl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -115,9 +107,6 @@ GSSAPI library Documentation Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -223,6 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.0-1
+- Update to Globus Toolkit 5.0.0
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.9-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 17:32:37 -0000	1.2
+++ import.log	9 Feb 2010 08:03:37 -0000	1.3
@@ -1,2 +1,3 @@
 globus-gssapi-gsi-5_9-2_fc9:F-11:globus-gssapi-gsi-5.9-2.fc9.src.rpm:1242710665
 globus-gssapi-gsi-5_9-3_fc9:F-11:globus-gssapi-gsi-5.9-3.fc9.src.rpm:1245087137
+globus-gssapi-gsi-7_0-1_fc12:F-11:globus-gssapi-gsi-7.0-1.fc12.src.rpm:1265702600


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 May 2009 05:24:54 -0000	1.2
+++ sources	9 Feb 2010 08:03:37 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-a95da38d6d1eae9caf84ffd7bd1d6a68  globus_gssapi_gsi-5.9.tar.gz
+dac97fc19fac5c18a67edebf682f3a92  globus_gssapi_gsi-7.0.tar.gz


--- globus-gssapi-gsi-doxygen.patch DELETED ---


--- globus-gssapi-gsi-labels.patch DELETED ---


--- globus-gssapi-gsi-sslinit.patch DELETED ---


--- globus-gssapi-gsi-type-punned-pointer.patch DELETED ---