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

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parallel/sge/patches/patch-ad
View File

@@ -1,13 +1,13 @@
$NetBSD: patch-ad,v 1.4 2012/03/20 17:07:43 asau Exp $
$NetBSD: patch-ad,v 1.5 2014/01/14 10:21:39 markd Exp $
--- source/daemons/shepherd/Makefile.orig 2011-11-29 03:06:13.000000000 +0400
+++ source/daemons/shepherd/Makefile 2012-02-20 19:55:03.000000000 +0400
@@ -64,7 +64,7 @@
--- source/daemons/shepherd/Makefile.orig 2013-10-28 16:22:53.000000000 +0000
+++ source/daemons/shepherd/Makefile
@@ -65,7 +65,7 @@ SHEPHERD_OBJS = $(SHEPHERD_SRC:.c=.o) sg
SHEPHERD_ADD_OBJS = $(SHEPHERD_ADD_SRC:.c=.o)
-SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm_static -lcommlists -luti $(WINGRIDLIB_STATIC) $(DLLIB)
+SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB)
-SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm_static -lcommlists -luti -luti2 $(HWLOCLIB) $(WINGRIDLIB_STATIC) $(DLLIB)
+SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti -luti2 $(HWLOCLIB) $(WINGRIDLIB_STATIC) $(DLLIB)
SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP)
SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(UTI2LIB) $(WINGRIDLIB_DEP)

72
parallel/sge/patches/patch-am
View File

@@ -1,21 +1,21 @@
$NetBSD: patch-am,v 1.8 2012/04/15 04:07:21 markd Exp $
$NetBSD: patch-am,v 1.10 2014/01/14 10:21:39 markd Exp $
Pkgsrc stuff
GridEngine dev mailing list patch for "nbsd-1" issue
ArchLinux static crypto also needs libz.a
--- source/aimk.orig 2011-11-28 23:06:13.000000000 +0000
--- source/aimk.orig 2013-10-28 16:22:52.000000000 +0000
+++ source/aimk
@@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then
@@ -937,7 +937,7 @@ if ( $SYSTEM_LIBS != 1 ) then
# we generate a berkeley db shared lib, so we need bdb include and lib path
set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS"
set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS"
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}"
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib"
set LFLAGS = "-L$BERKELEYDB_HOME/lib${BDB_LIB_SUFFIX} $LFLAGS"
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib${BDB_LIB_SUFFIX}"
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib${BDB_LIB_SUFFIX} ${COMPILER_RPATH_FLAG}$BERKELEYDB_HOME/lib"
endif
set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS"
@@ -1213,9 +1213,9 @@ case DARWIN_PPC:
@@ -1185,9 +1185,9 @@ case DARWIN_PPC:
set XMTDEF = ""
set XMTINCD = "$XMTINCD -I$MOTIFHOME/include"
@@ -23,11 +23,11 @@ ArchLinux static crypto also needs libz.a
+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include"
set XCFLAGS = "-DNeedFunctionPrototypes -DNeedVarargsPrototypes -Wno-error $XMTDEF $XINCD"
- set XLIBD = "-L$MOTIFHOME/lib -L/usr/X11R6/lib"
+ set XLIBD = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib -R${X11BASE}/lib"
set XLIBS = "-lXm -lXpm -lXt -lXext -lX11 -lSM -lICE"
+ set XLIBD = "-L$MOTIFHOME/lib ${COMPILER_RPATH_FLAG}${MOTIFHOME}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
set XLIBS = "-lXm -lXt -lXext -lX11 -lSM -lICE"
if ("$ADOC" == 1) then
set CFLAGS = "$CFLAGS -Wno-error"
@@ -1263,7 +1263,7 @@ case FREEBSD_*:
@@ -1234,7 +1234,7 @@ case FREEBSD_*:
set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
@@ -36,7 +36,7 @@ ArchLinux static crypto also needs libz.a
set NOERR_CFLAG = "-Wno-error"
set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
set LIBS = "$LIBS -lkvm"
@@ -1273,9 +1273,9 @@ case FREEBSD_*:
@@ -1244,9 +1244,9 @@ case FREEBSD_*:
set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
@@ -44,58 +44,32 @@ ArchLinux static crypto also needs libz.a
+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include"
set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
- set XLIBD = "-L/usr/X11R6/lib"
+ set XLIBD = "-L${X11BASE}/lib -R${X11BASE}/lib"
+ set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
set XLFLAGS = "$XLIBD"
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f"
@@ -1294,9 +1294,9 @@ case NETBSD_*:
set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
- set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
+ set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
set NOERR_CFLAG = "-Wno-error"
- set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
+ set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
set LIBS = "$LIBS -lkvm"
set SHAREDLD = $CC
set SHARED_CFLAGS = "-fPIC"
@@ -1304,9 +1304,9 @@ case NETBSD_*:
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXt -lXext -lX11 -lSM -lICE -lXp"
set JAVA_ARCH = "linux"
@@ -1275,9 +1275,9 @@ case NETBSD_*:
set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
- set XINCD = "$XMTINCD $XINCD -I/usr/X11/include -I/usr/pkg/include"
- set XINCD = "$XMTINCD $XINCD -I/usr/X11R7/include -I/usr/pkg/include"
+ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include"
set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
- set XLIBD = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib"
+ set XLIBD = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
- set XLIBD = "-L/usr/X11R7/lib -R/usr/X11R7/lib -L/usr/pkg/lib -R /usr/pkg/lib"
+ set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"
set XLFLAGS = "$XLIBD"
set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f"
@@ -1508,6 +1508,8 @@ case LINUXSPARC64:
set XLIBS = " -lXm -lXt -lXext -lX11 -lSM -lICE -lXp"
set JAVA_ARCH = "netbsd"
@@ -1499,6 +1499,8 @@ case LINUX*:
set DEBUG_FLAG = "$DEBUG_FLAG -fprofile-arcs -ftest-coverage"
endif
+ set SECLIBS_STATIC = "$SECLIBS_STATIC /usr/lib/libz.a"
+ set SECLIBS_STATIC = "-lssl -lcrypto"
+
if ( -f /lib/libc.so.6 ) then
strings /lib/libc.so.6 | grep "GNU C Library" | grep '2.[234]' >& /dev/null
if ($status == 0) then
@@ -2103,6 +2105,13 @@ else
set LIBS_DIR = ${SDIR}
endif
+
+# we set SGE_ARCH_STRING down here because the sed command above
+# would mess up the quotes around buildarch
+set ARCH_STRING = SGE_ARCH_STRING='\"'${buildarch}'\"'
+set CFLAGS = "-D$ARCH_STRING $CFLAGS"
+set DEPEND_FLAGS = "-D$ARCH_STRING $DEPEND_FLAGS"
+
if ( $JNI == 1 ) then
if ( "${JAVA_HOME}/${JAVA_INCL}" != /usr/include ) then
@@ -2797,6 +2806,7 @@ if ( "$QMON" == 1 ) then
@@ -2627,6 +2629,7 @@ if ( "$QMON" == 1 ) then
else
set FT_INC = ""
endif

8
parallel/sge/patches/patch-at
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-at,v 1.2 2006/10/19 11:51:27 markd Exp $
$NetBSD: patch-at,v 1.3 2014/01/14 10:21:39 markd Exp $
--- source/dist/util/arch_variables.orig 2005-11-11 03:53:15.000000000 +1300
--- source/dist/util/arch_variables.orig 2013-10-28 16:22:53.000000000 +0000
+++ source/dist/util/arch_variables
@@ -197,8 +197,8 @@ case $ARCH in
@@ -191,8 +191,8 @@ case $ARCH in
AWK=/usr/bin/awk
ECHO="/bin/echo"
RC_FILE=netbsd
@@ -10,6 +10,6 @@ $NetBSD: patch-at,v 1.2 2006/10/19 11:51:27 markd Exp $
- RC_SUFFIX=.sh
+ RC_PREFIX=@rcd_dir@
+ RC_SUFFIX=
XTERM=/usr/X11R6/bin/xterm
XTERM=/usr/X11R7/bin/xterm
MAILER=/usr/bin/mail
QLOGIN_COMMAND=telnet

39
parallel/sge/patches/patch-bd
View File

@@ -1,11 +1,11 @@
$NetBSD: patch-bd,v 1.5 2012/03/20 17:07:43 asau Exp $
$NetBSD: patch-bd,v 1.6 2014/01/14 10:21:39 markd Exp $
Exclude Java files.
DESTDIR support.
--- source/scripts/distinst.orig 2011-11-28 23:06:15.000000000 +0000
--- source/scripts/distinst.orig 2013-10-28 16:22:54.000000000 +0000
+++ source/scripts/distinst
@@ -79,13 +79,13 @@ DRMAA_SHARED_LIBRARIES="libdrmaa"
@@ -85,13 +85,13 @@ DRMAA_SHARED_LIBRARIES="libdrmaa"
# The last number listed here will be the verson linked from libdrmaa.so
DRMAA_SHARED_LIB_VERSIONS="1.0"
DRMAA_HEADER_FILES="libs/japi/drmaa.h"
@@ -23,7 +23,7 @@ DESTDIR support.
JAVA_LIBRARIES="${DRMAAJ_FILES} ${JUTIJ_FILES} ${JGDIJ_FILES} ${JJSV_FILES}"
PVMSOURCES="start_pvm.c stop_pvm.c slave.c master.c spmd.c Makefile"
@@ -544,11 +544,11 @@ while [ $# -ge 1 ]; do
@@ -550,11 +550,11 @@ while [ $# -ge 1 ]; do
echo Please set variable SGE_ROOT. Installation failed.
exit 1
fi
@@ -38,7 +38,7 @@ DESTDIR support.
localinst=true
;;
-mansrc)
@@ -927,13 +927,16 @@ if [ $instcommon = true ]; then
@@ -934,7 +934,6 @@ if [ $instcommon = true ]; then
$DEST_SGE_ROOT/util/sgeCA/*.cnf \
$DEST_SGE_ROOT/util/sgeSMF/*.xml \
$DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
@@ -46,27 +46,28 @@ DESTDIR support.
$DEST_SGE_ROOT/util/resources/calendars/* \
$DEST_SGE_ROOT/util/resources/centry/* \
$DEST_SGE_ROOT/util/resources/pe/* \
$DEST_SGE_ROOT/util/resources/schemas/*/* \
$DEST_SGE_ROOT/util/resources/usersets/*
+ if test -f $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; then
+ Execute chmod 644 $DEST_SGE_ROOT/util/DetectJvmLibrary.jar;
+ fi
@@ -942,6 +941,10 @@ if [ $instcommon = true ]; then
$DEST_SGE_ROOT/util/resources/usersets/* \
$DEST_SGE_ROOT/util/resources/jsv/jsv_include*
fi
+
Execute chmod 755 $DEST_SGE_ROOT/util/resources/jsv/jsv.sh \
$DEST_SGE_ROOT/util/resources/jsv/jjsv.sh \
$DEST_SGE_ROOT/util/resources/jsv/jsv.pl \
@@ -951,8 +954,7 @@ if [ $instcommon = true ]; then
+ if test -f $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; then
+ Execute chmod 644 $DEST_SGE_ROOT/util/DetectJvmLibrary.jar;
+ fi
if [ $instexamples = true ]; then
echo Installing \"examples\"
@@ -954,8 +957,7 @@ if [ $instcommon = true ]; then
Execute cp libs/japi/example.c $DEST_SGE_ROOT/examples/drmaa
Execute cp libs/japi/howto/*.c $DEST_SGE_ROOT/examples/drmaa
MakeDir examples/drmaa/ruby
- Execute mv $DEST_SGE_ROOT/util/resources/drmaa4ruby/samples/* $DEST_SGE_ROOT/examples/drmaa/ruby
- Execute rmdir $DEST_SGE_ROOT/util/resources/drmaa4ruby/samples
+ Execute cp -r dist/util/resources/drmaa4ruby/samples/* $DEST_SGE_ROOT/examples/drmaa/ruby
Execute chmod 755 $DEST_SGE_ROOT/examples/drmaa/ruby/*.rb \
$DEST_SGE_ROOT/examples/drmaa/ruby/flow/*.rb
Cleanup examples
fi
@@ -1117,9 +1119,6 @@ if [ $instcommon = true ]; then
@@ -1123,9 +1125,6 @@ if [ $instcommon = true ]; then
if [ -f CLASSES/herd/herd.jar ]; then
Execute cp CLASSES/herd/herd.jar $DEST_SGE_ROOT/lib/herd.jar
@@ -76,7 +77,7 @@ DESTDIR support.
fi
fi
@@ -1276,7 +1275,9 @@ if [ $instguiinst = true ]; then
@@ -1318,7 +1317,9 @@ if [ $instguiinst = true ]; then
echo "Installing \"start_gui_installer\" and \"/util/gui-installer\""
Execute mkdir -p $DEST_SGE_ROOT/util/gui-installer/html/en/help
Execute mkdir -p $DEST_SGE_ROOT/util/gui-installer/templates

116
parallel/sge/patches/patch-bl
View File

@@ -1,116 +0,0 @@
$NetBSD: patch-bl,v 1.6 2012/03/20 17:07:43 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
@@ -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
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 *);
-static SSL_CTX* (*cl_com_ssl_func__SSL_CTX_new) (SSL_METHOD *meth);
-static SSL_METHOD* (*cl_com_ssl_func__SSLv23_method) (void);
+static SSL_CTX* (*cl_com_ssl_func__SSL_CTX_new) (const SSL_METHOD *meth);
+static const SSL_METHOD* (*cl_com_ssl_func__SSLv23_method) (void);
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
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);
-static int (*cl_com_ssl_func__X509_cmp_current_time) (ASN1_TIME *s);
-static int (*cl_com_ssl_func__ASN1_INTEGER_cmp) (ASN1_INTEGER *x, ASN1_INTEGER *y);
-static long (*cl_com_ssl_func__ASN1_INTEGER_get) (ASN1_INTEGER *a);
+static int (*cl_com_ssl_func__X509_cmp_current_time) (const ASN1_TIME *s);
+static int (*cl_com_ssl_func__ASN1_INTEGER_cmp) (const ASN1_INTEGER *x, const ASN1_INTEGER *y);
+static long (*cl_com_ssl_func__ASN1_INTEGER_get) (const ASN1_INTEGER *a);
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
{
char* func_name = NULL;
int had_errors = 0;
-#if defined(FREEBSD) || defined(DARWIN)
+#if defined(NETBSD) || defined(FREEBSD) || defined(DARWIN)
void* cl_com_ssl_crypto_handle_saved = NULL;
#endif
@@ -1091,7 +1094,7 @@ static int cl_com_ssl_build_symbol_table
return CL_RETVAL_SSL_DLOPEN_SSL_LIB_FAILED;
}
-#if defined(FREEBSD) || defined(DARWIN)
+#if defined(NETBSD) || defined(FREEBSD) || defined(DARWIN)
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
}
func_name = "SSL_CTX_new";
- cl_com_ssl_func__SSL_CTX_new = (SSL_CTX* (*)(SSL_METHOD *meth))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__SSL_CTX_new = (SSL_CTX* (*)(const SSL_METHOD *meth))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__SSL_CTX_new == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "SSLv23_method";
- cl_com_ssl_func__SSLv23_method = (SSL_METHOD* (*)(void))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__SSLv23_method = (const SSL_METHOD* (*)(void))dlsym(cl_com_ssl_crypto_handle, func_name);
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
}
func_name = "X509_cmp_current_time";
- cl_com_ssl_func__X509_cmp_current_time = (int (*)(ASN1_TIME *s))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__X509_cmp_current_time = (int (*)(const ASN1_TIME *s))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__X509_cmp_current_time == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "ASN1_INTEGER_cmp";
- cl_com_ssl_func__ASN1_INTEGER_cmp = (int (*)(ASN1_INTEGER *x, ASN1_INTEGER *y))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__ASN1_INTEGER_cmp = (int (*)(const ASN1_INTEGER *x, const ASN1_INTEGER *y))dlsym(cl_com_ssl_crypto_handle, func_name);
if (cl_com_ssl_func__ASN1_INTEGER_cmp == NULL) {
CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
had_errors++;
}
func_name = "ASN1_INTEGER_get";
- cl_com_ssl_func__ASN1_INTEGER_get = (long (*)(ASN1_INTEGER *a))dlsym(cl_com_ssl_crypto_handle, func_name);
+ cl_com_ssl_func__ASN1_INTEGER_get = (long (*)(const ASN1_INTEGER *a))dlsym(cl_com_ssl_crypto_handle, func_name);
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
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
@@ -1918,7 +1921,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;
- cl_com_ssl_func__sk_value = sk_value;
+ cl_com_ssl_func__sk_value = (char* (*)(const STACK *, int))sk_value;
cl_com_ssl_func__X509_STORE_get_by_subject = X509_STORE_get_by_subject;
cl_com_ssl_func__EVP_PKEY_free = EVP_PKEY_free;
cl_com_ssl_func__X509_STORE_CTX_set_error = X509_STORE_CTX_set_error;

22
parallel/sge/patches/patch-source-utilbin_Makefile
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-source-utilbin_Makefile,v 1.1 2012/04/15 04:07:21 markd Exp $
$NetBSD: patch-source-utilbin_Makefile,v 1.2 2014/01/14 10:21:39 markd Exp $
Add LDFLAGS
replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
doesnt reorder.
--- source/utilbin/Makefile.orig 2009-02-11 09:27:33.000000000 +0000
--- source/utilbin/Makefile.orig 2013-10-28 16:22:54.000000000 +0000
+++ source/utilbin/Makefile
@@ -118,14 +118,14 @@ gethostbyaddr.o: $(UTILBIN_DIR)/gethostb
@@ -59,9 +59,9 @@ doesnt reorder.
@@ -188,7 +188,7 @@ signals.o: $(UTILBIN_DIR)/signals.c
#---------------------------------------------------------------------
loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB)
- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -lcommlists $(LOADAVGLIBS) $(LIBS)
loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) binding_support.o
- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o binding_support.o $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) $(UTILIB) $(WINGRIDLIB) $(COMMLISTSLIB) $(LOADAVGLIBS) $(HWLOCLIB) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o binding_support.o $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) $(UTILIB) $(WINGRIDLIB) -lcommlists $(LOADAVGLIBS) $(HWLOCLIB) $(LIBS)
loadcheck.o: $(UTILBIN_DIR)/loadcheck.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
@@ -91,8 +91,8 @@ doesnt reorder.
$(CC) $(CFLAGS) $(MEMCFLAG) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/fstype.c
#---------------------------------------------------------------------
spooldefaults: spooldefaults.o version.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLCLIB) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB)
- $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
- $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
@@ -109,8 +109,8 @@ doesnt reorder.
#---------------------------------------------------------------------
spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB)
- $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
- $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
spooledit.o: $(UTILBIN_DIR)/spooledit.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c
@@ -118,8 +118,8 @@ doesnt reorder.
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/valid_jvmlib.c
#---------------------------------------------------------------------
-AUTHUSER_ADD_LIBS = -luti $(COMMLISTSLIB) $(DLLIB)
+AUTHUSER_ADD_LIBS = -luti -lcommlists $(DLLIB)
-AUTHUSER_ADD_LIBS = $(UTILIB) $(COMMLISTSLIB) $(DLLIB)
+AUTHUSER_ADD_LIBS = $(UTILIB) -lcommlists $(DLLIB)
authuser: authuser.o juti.o $(UTILIB) $(COMMLISTSLIB)
$(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS)

15
parallel/sge/patches/patch-source_libs_comm_cl_ssl_framework.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-source_libs_comm_cl_ssl_framework.c,v 1.1 2014/01/14 10:21:39 markd Exp $
Fix typo
--- source/libs/comm/cl_ssl_framework.c.orig 2013-10-28 16:22:53.000000000 +0000
+++ source/libs/comm/cl_ssl_framework.c
@@ -3637,7 +3637,7 @@ int cl_com_ssl_connection_request_handle
#ifndef USE_POLL
if (sockfd >= FD_SETSIZE) {
- CL_LOG_int(CL_LOG_ERROR,"number of filedescriptors exceeds FD_SETSIZE of this system: ", FD_SETSIZE);
+ CL_LOG_INT(CL_LOG_ERROR,"number of filedescriptors exceeds FD_SETSIZE of this system: ", FD_SETSIZE);
shutdown(sockfd, 2);
close(sockfd);
cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_REACHED_FILEDESCRIPTOR_LIMIT, MSG_CL_COMMLIB_COMPILE_SOURCE_WITH_LARGER_FD_SETSIZE );

8
parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.1 2013/05/23 18:41:48 joerg Exp $
$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.2 2014/01/14 10:21:39 markd Exp $
--- source/libs/uti/sge_loadmem.c.orig 2013-05-23 16:27:21.000000000 +0000
--- source/libs/uti/sge_loadmem.c.orig 2013-10-28 16:22:54.000000000 +0000
+++ source/libs/uti/sge_loadmem.c
@@ -44,6 +44,10 @@
@@ -45,6 +45,10 @@
#include "uti/sge_log.h"
#include "uti/msg_utilib.h"
@@ -10,6 +10,6 @@ $NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.1 2013/05/23 18:41:48 joerg Ex
+#include <uvm/uvm_extern.h>
+#endif
+
#if !defined(LINUX) && !defined(CRAY) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD)
#if !defined(__linux__) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD)
#include <unistd.h>