diff options
Diffstat (limited to 'parallel/sge/patches/patch-bl')
| -rw-r--r-- | parallel/sge/patches/patch-bl | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/parallel/sge/patches/patch-bl b/parallel/sge/patches/patch-bl index ec318498a9a..402226f479b 100644 --- a/parallel/sge/patches/patch-bl +++ b/parallel/sge/patches/patch-bl @@ -1,55 +1,47 @@ -$NetBSD: patch-bl,v 1.1 2006/10/19 11:51:27 markd Exp $ +$NetBSD: patch-bl,v 1.2 2007/08/15 02:03:09 markd Exp $ ---- source/libs/comm/cl_ssl_framework.c.orig 2006-10-08 23:52:33.000000000 +1300 +--- source/libs/comm/cl_ssl_framework.c.orig 2006-07-17 20:25:05.000000000 +1200 +++ source/libs/comm/cl_ssl_framework.c -@@ -988,6 +988,9 @@ static int cl_com_ssl_build_symbol_table +@@ -988,7 +988,7 @@ static int cl_com_ssl_build_symbol_table { char* func_name = NULL; int had_errors = 0; +-#if defined(FREEBSD) +#if defined(FREEBSD) || defined(NETBSD) -+ void* cl_com_ssl_crypto_handle_saved = NULL; -+#endif + void* cl_com_ssl_crypto_handle_saved = NULL; + #endif - - CL_LOG(CL_LOG_INFO,"loading ssl library functions with dlopen() ..."); -@@ -1002,9 +1005,16 @@ static int cl_com_ssl_build_symbol_table +@@ -1004,12 +1004,12 @@ static int cl_com_ssl_build_symbol_table #if defined(DARWIN) #ifdef RTLD_NODELETE - cl_com_ssl_crypto_handle = dlopen ("libssl.bundle", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); + cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); -+#else -+ cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL ); -+#endif /* RTLD_NODELETE */ -+ -+#elif defined(FREEBSD) || defined(NETBSD) -+#ifdef RTLD_NODELETE -+ cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE); #else - cl_com_ssl_crypto_handle = dlopen ("libssl.bundle", RTLD_NOW | RTLD_GLOBAL ); -+ cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL); ++ cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL ); #endif /* RTLD_NODELETE */ - #elif defined(HP11) -@@ -1029,6 +1039,10 @@ static int cl_com_ssl_build_symbol_table +-#elif defined(FREEBSD) ++#elif defined(FREEBSD) || defined(NETBSD) + #ifdef RTLD_NODELETE + cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE); + #else +@@ -1038,7 +1038,7 @@ static int cl_com_ssl_build_symbol_table return CL_RETVAL_SSL_DLOPEN_SSL_LIB_FAILED; } +-#if defined(FREEBSD) +#if defined(FREEBSD) || defined(NETBSD) -+ cl_com_ssl_crypto_handle_saved = cl_com_ssl_crypto_handle; -+ cl_com_ssl_crypto_handle = RTLD_DEFAULT; -+#endif - - - /* setting up crypto function pointers */ -@@ -1649,6 +1663,10 @@ static int cl_com_ssl_build_symbol_table + cl_com_ssl_crypto_handle_saved = cl_com_ssl_crypto_handle; + cl_com_ssl_crypto_handle = RTLD_DEFAULT; + #endif +@@ -1661,7 +1661,7 @@ static int cl_com_ssl_build_symbol_table return CL_RETVAL_SSL_CANT_LOAD_ALL_FUNCTIONS; } +-#if defined(FREEBSD) +#if defined(FREEBSD) || defined(NETBSD) -+ cl_com_ssl_crypto_handle = cl_com_ssl_crypto_handle_saved; -+#endif -+ - pthread_mutex_unlock(&cl_com_ssl_crypto_handle_mutex); - CL_LOG(CL_LOG_INFO,"loading ssl library functions with dlopen() done"); + cl_com_ssl_crypto_handle = cl_com_ssl_crypto_handle_saved; + #endif |