Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
parallel/gridscheduler/patches/patch-bl
View File

@@ -1,18 +1,8 @@
$NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
$NetBSD: patch-bl,v 1.2 2015/12/13 00:50:39 asau Exp $
--- source/libs/comm/cl_ssl_framework.c.orig 2009-02-16 08:50:41.000000000 +0000
--- source/libs/comm/cl_ssl_framework.c.orig 2012-05-23 19:04:40.000000000 +0000
+++ source/libs/comm/cl_ssl_framework.c
@@ -104,6 +104,9 @@
#define OPENSSL_CONST const
#endif
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+typedef _STACK STACK;
+#endif
#define cl_com_ssl_func__SSL_CTX_set_mode(ctx,op) \
cl_com_ssl_func__SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
@@ -161,8 +164,8 @@ static int (*cl_com_ssl
@@ -168,8 +168,8 @@ static int (*cl_com_ssl
static void (*cl_com_ssl_func__SSL_set_bio) (SSL *s, BIO *rbio,BIO *wbio);
static int (*cl_com_ssl_func__SSL_accept) (SSL *ssl);
static void (*cl_com_ssl_func__SSL_CTX_free) (SSL_CTX *);
@@ -23,7 +13,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
static int (*cl_com_ssl_func__SSL_CTX_use_certificate_chain_file) (SSL_CTX *ctx, const char *file);
static int (*cl_com_ssl_func__SSL_CTX_use_certificate) (SSL_CTX *ctx, X509 *cert);
static int (*cl_com_ssl_func__SSL_CTX_use_PrivateKey_file) (SSL_CTX *ctx, const char *file, int type);
@@ -243,9 +246,9 @@ static void (*cl_com_ssl
@@ -250,9 +250,9 @@ static void (*cl_com_ssl
static void (*cl_com_ssl_func__X509_STORE_CTX_set_error) (X509_STORE_CTX *ctx,int s);
static void (*cl_com_ssl_func__X509_OBJECT_free_contents) (X509_OBJECT *a);
static ASN1_INTEGER* (*cl_com_ssl_func__X509_get_serialNumber) (X509 *x);
@@ -36,7 +26,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
static int (*cl_com_ssl_func__X509_CRL_verify) (X509_CRL *a, EVP_PKEY *r);
static EVP_PKEY* (*cl_com_ssl_func__X509_get_pubkey) (X509 *x);
static int (*cl_com_ssl_func__X509_STORE_set_default_paths) (X509_STORE *ctx);
@@ -1040,7 +1043,7 @@ static int cl_com_ssl_build_symbol_table
@@ -1047,7 +1047,7 @@ static int cl_com_ssl_build_symbol_table
{
char* func_name = NULL;
int had_errors = 0;
@@ -45,7 +35,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
void* cl_com_ssl_crypto_handle_saved = NULL;
#endif
@@ -1062,7 +1065,7 @@ static int cl_com_ssl_build_symbol_table
@@ -1069,7 +1069,7 @@ static int cl_com_ssl_build_symbol_table
cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL );
#endif /* RTLD_NODELETE */
@@ -54,7 +44,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
#ifdef RTLD_NODELETE
cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
#else
@@ -1091,7 +1094,7 @@ static int cl_com_ssl_build_symbol_table
@@ -1098,7 +1098,7 @@ static int cl_com_ssl_build_symbol_table
return CL_RETVAL_SSL_DLOPEN_SSL_LIB_FAILED;
}
@@ -63,7 +53,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
cl_com_ssl_crypto_handle_saved = cl_com_ssl_crypto_handle;
cl_com_ssl_crypto_handle = RTLD_DEFAULT;
#endif
@@ -1204,14 +1207,14 @@ static int cl_com_ssl_build_symbol_table
@@ -1211,14 +1211,14 @@ static int cl_com_ssl_build_symbol_table
}
func_name = "SSL_CTX_new";
@@ -80,7 +70,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
if (cl_com_ssl_func__SSLv23_method == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
@@ -1750,21 +1753,21 @@ static int cl_com_ssl_build_symbol_table
@@ -1757,21 +1757,21 @@ static int cl_com_ssl_build_symbol_table
}
func_name = "X509_cmp_current_time";
@@ -105,7 +95,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
if (cl_com_ssl_func__ASN1_INTEGER_get == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
@@ -1813,7 +1816,7 @@ static int cl_com_ssl_build_symbol_table
@@ -1820,7 +1820,7 @@ static int cl_com_ssl_build_symbol_table
return CL_RETVAL_SSL_CANT_LOAD_ALL_FUNCTIONS;
}
@@ -114,7 +104,7 @@ $NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
cl_com_ssl_crypto_handle = cl_com_ssl_crypto_handle_saved;
#endif
@@ -1918,7 +1921,7 @@ static int cl_com_ssl_build_symbol_table
@@ -1925,7 +1925,7 @@ static int cl_com_ssl_build_symbol_table
cl_com_ssl_func__SSL_CTX_get_ex_data = (void* (*)(SSL_CTX *ssl,int idx))SSL_CTX_get_ex_data;
cl_com_ssl_func__SSL_CTX_set_ex_data = SSL_CTX_set_ex_data;
cl_com_ssl_func__sk_num = sk_num;