rpms/gridengine/devel gridengine-6.2u3-openssl.patch, NONE, 1.1 gridengine.spec, 1.20, 1.21

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31707

Modified Files:
	gridengine.spec 
Added Files:
	gridengine-6.2u3-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
- rebuilt with new openssl


gridengine-6.2u3-openssl.patch:
 libs/comm/cl_ssl_framework.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE gridengine-6.2u3-openssl.patch ---
diff -up gridengine/source/libs/comm/cl_ssl_framework.c.openssl gridengine/source/libs/comm/cl_ssl_framework.c
--- gridengine/source/libs/comm/cl_ssl_framework.c.openssl	2009-08-25 17:06:53.000000000 +0200
+++ gridengine/source/libs/comm/cl_ssl_framework.c	2009-08-25 17:06:03.000000000 +0200
@@ -234,8 +234,15 @@ static const char*          (*cl_com_ssl
 static int                  (*cl_com_ssl_func__SSL_get_ex_data_X509_STORE_CTX_idx)  (void);
 static void*                (*cl_com_ssl_func__SSL_CTX_get_ex_data)                 (SSL_CTX *ssl,int idx);
 static int                  (*cl_com_ssl_func__SSL_CTX_set_ex_data)                 (SSL_CTX *ssl,int idx,void *data);
+/* ugly workaround for extremely ugly usage of OpenSSL API */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define SKVAL_RTYPE char
+#else
+#define SKVAL_RTYPE void
+#endif
 static int                  (*cl_com_ssl_func__sk_num)                              (const STACK *);
-static char*                (*cl_com_ssl_func__sk_value)                            (const STACK *, int);
+static SKVAL_RTYPE*         (*cl_com_ssl_func__sk_value)                            (const STACK *, int);
 static int                  (*cl_com_ssl_func__X509_STORE_get_by_subject)           (X509_STORE_CTX *vs,int type,X509_NAME *name, X509_OBJECT *ret);
 static void                 (*cl_com_ssl_func__EVP_PKEY_free)                       (EVP_PKEY *pkey);
 static void                 (*cl_com_ssl_func__X509_STORE_CTX_set_error)            (X509_STORE_CTX *ctx,int s);
@@ -1706,7 +1713,7 @@ static int cl_com_ssl_build_symbol_table
       }
 
       func_name = "sk_value";
-      cl_com_ssl_func__sk_value = (char* (*)(const STACK *, int))dlsym(cl_com_ssl_crypto_handle, func_name);
+      cl_com_ssl_func__sk_value = (SKVAL_RTYPE* (*)(const STACK *, int))dlsym(cl_com_ssl_crypto_handle, func_name);
       if (cl_com_ssl_func__sk_value == NULL) {
          CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
          had_errors++;
diff -up gridengine/source/security/sec/HOWTO.openssl gridengine/source/security/sec/HOWTO


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gridengine.spec	21 Aug 2009 13:46:03 -0000	1.20
+++ gridengine.spec	25 Aug 2009 15:11:03 -0000	1.21
@@ -68,6 +68,8 @@ Patch22: gridengine-6.2u2_1-rpath.patch
 Patch25: gridengine-6.2u2_1-libs.patch
 # Handle ignoring return codes
 Patch26: gridengine-6.2beta2-error.patch
+# Workaround for openssl-1.0 API change
+Patch27: gridengine-6.2u3-openssl.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
@@ -181,6 +183,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dis
 %patch22 -p1 -b .rpath
 %patch25 -p1 -b .libs
 %patch26 -p1 -b .error
+%patch27 -p1 -b .openssl
 sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
 #Don't ship rctemplates
 rm -rf source/dist/util/rctemplates
@@ -540,7 +543,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2u3-2