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

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
parallel/sge/patches/patch-ad Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.4 2012/03/20 17:07:43 asau 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 @@
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_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP)

13
parallel/sge/patches/patch-ag Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.5 2012/03/20 17:07:43 asau Exp $
--- source/libs/spool/Makefile.orig 2011-11-29 03:06:15.000000000 +0400
+++ source/libs/spool/Makefile 2012-02-20 19:58:29.000000000 +0400
@@ -117,7 +117,7 @@
$(CC) $(CFLAGS) -c $(SPOOLLIB_DIR)/test_sge_spooling.c
test_sge_spooling_utilities: test_sge_spooling_utilities.o $(SPOOLING_DEPS) $(SGEOBJLIB) $(SGEOBJDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SCHEDLIB) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(UTILIB) $(WINGRIDLIB_DEP)
- $(LD_WRAPPER) $(CC) $(CFLAGS) -o test_sge_spooling_utilities $(LFLAGS) test_sge_spooling_utilities.o $(SPOOLING_LIBS) $(SCHEDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(UTILIB) $(WINGRIDLIB) $(SECLIB) $(SLIBS) $(LIBS) $(DLLIB)
+ $(LD_WRAPPER) $(CC) $(CFLAGS) -o test_sge_spooling_utilities $(LFLAGS) test_sge_spooling_utilities.o $(SPOOLING_LIBS) $(SPOOLLIB) $(SCHEDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(UTILIB) $(RMONLIB) $(WINGRIDLIB) $(SECLIB) $(SLIBS) $(LIBS) $(DLLIB)
test_sge_spooling_utilities.o: $(SPOOLLIB_DIR)/test_sge_spooling_utilities.c
$(CC) $(CFLAGS) -c $(SPOOLLIB_DIR)/test_sge_spooling_utilities.c

105
parallel/sge/patches/patch-am Normal file
View File

@@ -0,0 +1,105 @@
$NetBSD: patch-am,v 1.8 2012/04/15 04:07:21 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
@@ -961,7 +961,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"
endif
set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS"
@@ -1213,9 +1213,9 @@ case DARWIN_PPC:
set XMTDEF = ""
set XMTINCD = "$XMTINCD -I$MOTIFHOME/include"
- set XINCD = "$XMTINCD $XINCD -I/usr/X11R6/include"
+ 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"
if ("$ADOC" == 1) then
set CFLAGS = "$CFLAGS -Wno-error"
@@ -1263,7 +1263,7 @@ case FREEBSD_*:
set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
- set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
+ set CFLAGS = "$OFLAG -Wall -DFREEBSD -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 LIBS = "$LIBS -lkvm"
@@ -1273,9 +1273,9 @@ case FREEBSD_*:
set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
- set XINCD = "$XMTINCD $XINCD -I/usr/X11/include"
+ 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 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 AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
- set XINCD = "$XMTINCD $XINCD -I/usr/X11/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 XLFLAGS = "$XLIBD"
set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f"
@@ -1508,6 +1508,8 @@ case LINUXSPARC64:
set DEBUG_FLAG = "$DEBUG_FLAG -fprofile-arcs -ftest-coverage"
endif
+ set SECLIBS_STATIC = "$SECLIBS_STATIC /usr/lib/libz.a"
+
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
else
set FT_INC = ""
endif
+ set FT_INC = "-I${LOCALBASE}/include/freetype2"
cd $COMPILE_ARCH

15
parallel/sge/patches/patch-at Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-at,v 1.2 2006/10/19 11:51:27 markd Exp $
--- source/dist/util/arch_variables.orig 2005-11-11 03:53:15.000000000 +1300
+++ source/dist/util/arch_variables
@@ -197,8 +197,8 @@ case $ARCH in
AWK=/usr/bin/awk
ECHO="/bin/echo"
RC_FILE=netbsd
- RC_PREFIX=/etc/rc.d
- RC_SUFFIX=.sh
+ RC_PREFIX=@rcd_dir@
+ RC_SUFFIX=
XTERM=/usr/X11R6/bin/xterm
MAILER=/usr/bin/mail
QLOGIN_COMMAND=telnet

88
parallel/sge/patches/patch-bd Normal file
View File

@@ -0,0 +1,88 @@
$NetBSD: patch-bd,v 1.5 2012/03/20 17:07:43 asau Exp $
Exclude Java files.
DESTDIR support.
--- source/scripts/distinst.orig 2011-11-28 23:06:15.000000000 +0000
+++ source/scripts/distinst
@@ -79,13 +79,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"
-DRMAAJ_FILES="CLASSES/jdrmaa/drmaa"
+#DRMAAJ_FILES="CLASSES/jdrmaa/drmaa"
JNI_SHARED_LIBRARIES="libdrmaa libjuti libjgdi"
-JUTIJ_FILES="CLASSES/juti/juti"
-JGDIJ_FILES="libs/jgdi/build/jgdi"
-JJSV_FILES="CLASSES/jjsv/JSV"
+#JUTIJ_FILES="CLASSES/juti/juti"
+#JGDIJ_FILES="libs/jgdi/build/jgdi"
+#JJSV_FILES="CLASSES/jjsv/JSV"
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
echo Please set variable SGE_ROOT. Installation failed.
exit 1
fi
- if [ ! -d $SGE_ROOT ]; then
- echo Please create directory \"$SGE_ROOT\" first. Installation failed.
+ if [ ! -d "$DESTDIR$SGE_ROOT" ]; then
+ echo Please create directory \"$DESTDIR$SGE_ROOT\" first. Installation failed.
exit 1
fi
- DEST_SGE_ROOT=$SGE_ROOT
+ DEST_SGE_ROOT=$DESTDIR$SGE_ROOT
localinst=true
;;
-mansrc)
@@ -927,13 +927,16 @@ 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 \
- $DEST_SGE_ROOT/util/DetectJvmLibrary.jar \
$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
+
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
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
Cleanup examples
fi
@@ -1117,9 +1119,6 @@ if [ $instcommon = true ]; then
if [ -f CLASSES/herd/herd.jar ]; then
Execute cp CLASSES/herd/herd.jar $DEST_SGE_ROOT/lib/herd.jar
- elif [ $exit_on_error = true ]; then
- echo "\"CLASSES/herd/herd.jar\" not found. Installation failed."
- exit 1
fi
fi
@@ -1276,7 +1275,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
+ if [ -f "$GUI_DIR/dist/installer.jar" ]; then
Execute cp $GUI_DIR/dist/installer.jar $DEST_SGE_ROOT/util/gui-installer
+ fi
Execute cp $GUI_DIR/templates/start_gui_installer.sh $DEST_SGE_ROOT/start_gui_installer
Execute cp -r $GUI_DIR/html $DEST_SGE_ROOT/util/gui-installer
Execute cp $GUI_DIR/templates/install_component $GUI_DIR/templates/gui_inst_template.conf $GUI_DIR/templates/readme_template.html $GUI_DIR/templates/check_host $DEST_SGE_ROOT/util/gui-installer/templates

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

@@ -0,0 +1,116 @@
$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;

73
parallel/sge/patches/patch-bm Normal file
View File

@@ -0,0 +1,73 @@
$NetBSD: patch-bm,v 1.2 2009/05/13 21:00:25 markd Exp $
DESTDIR support.
--- source/dist/util/setfileperm.sh.orig 2008-10-18 03:48:04.000000000 +1300
+++ source/dist/util/setfileperm.sh
@@ -81,7 +81,7 @@ SetFilePerm()
instauto=false
-if [ -z "$SGE_ROOT" -o ! -d "$SGE_ROOT" ]; then
+if [ -z "$SGE_ROOT" -o ! -d "$DESTDIR$SGE_ROOT" ]; then
echo
echo ERROR: Please set your \$SGE_ROOT environment variable
echo and start this script again. Exit.
@@ -89,7 +89,7 @@ if [ -z "$SGE_ROOT" -o ! -d "$SGE_ROOT"
exit 1
fi
-if [ ! -f "$SGE_ROOT/util/arch" ]; then
+if [ ! -f "$DESTDIR$SGE_ROOT/util/arch" ]; then
echo
echo ERROR: The shell script \"$SGE_ROOT/util/arch\" does not exist.
echo Please verify your distribution and restart this script. Exit.
@@ -97,7 +97,7 @@ if [ ! -f "$SGE_ROOT/util/arch" ]; then
exit 1
fi
-if [ ! -f $SGE_ROOT/util/arch_variables ]; then
+if [ ! -f "$DESTDIR$SGE_ROOT"/util/arch_variables ]; then
echo
echo ERROR: Missing shell script \"$SGE_ROOT/util/arch_variables\".
echo Please verify your distribution and restart this script. Exit.
@@ -105,7 +105,7 @@ if [ ! -f $SGE_ROOT/util/arch_variables
exit 1
fi
-. $SGE_ROOT/util/arch_variables
+. "$DESTDIR$SGE_ROOT"/util/arch_variables
if [ $ARCH = "win32-x86" ]; then
echo
@@ -183,7 +183,7 @@ else
done
fi
-cd $1
+cd $DESTDIR$1
if [ $? != 0 ]; then
$ECHO "ERROR: can't change to directory \"$1\". Exiting."
exit 1
@@ -204,17 +204,17 @@ for f in $FILELIST; do
done
for f in $FILELIST $OPTFILES; do
- if [ -d $f -o -f $f ]; then
- SetFilePerm $f
+ if [ -d $DESTDIR$f -o -f $DESTDIR$f ]; then
+ SetFilePerm $DESTDIR$f
fi
done
for file in $SUIDFILES; do
# Windows NFS Server does not like suid files
if [ "`echo $file | grep win32-x86`" != "" ]; then
- chmod 511 $file
+ chmod 511 $DESTDIR$file
else
- chmod 4511 $file
+ chmod 4511 $DESTDIR$file
fi
done

13
parallel/sge/patches/patch-daemons_common_procfs.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-daemons_common_procfs.c,v 1.1 2011/02/17 08:55:11 markd Exp $
--- source/daemons/common/procfs.c.orig 2006-03-10 06:03:19.000000000 +0000
+++ source/daemons/common/procfs.c
@@ -338,6 +338,8 @@ void procfs_kill_addgrpid(gid_t add_grp_
* uids[3], gids[3] => FSUID and FSGID
*/
groups = 0;
+ /* silence gcc's -Werror */
+ uids[0] = uids[1] = gids[0] = gids[1] = 0;
while (fgets(buffer, sizeof(buffer), fp)) {
char *label = NULL;
char *token = NULL;

125
parallel/sge/patches/patch-source-utilbin_Makefile Normal file
View File

@@ -0,0 +1,125 @@
$NetBSD: patch-source-utilbin_Makefile,v 1.1 2012/04/15 04:07:21 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
@@ -118,14 +118,14 @@ gethostbyaddr.o: $(UTILBIN_DIR)/gethostb
#---------------------------------------------------------------------
getservbyname: getservbyname.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(DLLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) -lcommlists $(DLLIB) $(LIBS)
getservbyname.o: $(UTILBIN_DIR)/getservbyname.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/getservbyname.c
#---------------------------------------------------------------------
filestat: filestat.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
filestat.o: $(UTILBIN_DIR)/filestat.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/filestat.c
@@ -146,28 +146,28 @@ read_raw.o: $(UTILBIN_DIR)/read_raw.c
#---------------------------------------------------------------------
echo_raw: echo_raw.o version.o $(UTILIB) $(COMMLISTSLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti $(COMMLISTSLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lcommlists $(LIBS)
echo_raw.o: $(UTILBIN_DIR)/echo_raw.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
#---------------------------------------------------------------------
checkprog: checkprog.o peopen_standalone.o pids_standalone.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS) $(DLLIB)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS) $(DLLIB)
checkprog.o: $(UTILBIN_DIR)/checkprog.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkprog.c
#---------------------------------------------------------------------
checkuser: checkuser.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
checkuser.o: $(UTILBIN_DIR)/checkuser.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkuser.c
#---------------------------------------------------------------------
adminrun: adminrun.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
adminrun.o: $(UTILBIN_DIR)/adminrun.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/adminrun.c
@@ -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.o: $(UTILBIN_DIR)/loadcheck.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
@@ -203,26 +203,26 @@ loadcheck.obj: $(UTILBIN_DIR)/loadcheck.
#---------------------------------------------------------------------
languagetest: languagetest.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
languagetest.o: $(UTILBIN_DIR)/languagetest.c
$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/languagetest.c
#---------------------------------------------------------------------
infotext: infotext.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
infotext.o: $(UTILBIN_DIR)/infotext.c
$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/infotext.c
#---------------------------------------------------------------------
fstype: fstype.o version.o $(WINGRIDLIB_DEP) $(COMMLISTSLIB) $(UTILIB)
- $(CC) -o $@ $(LFLAGS) fstype.o version.o $(WINGRIDLIB) $(FSTYPELIBS) -luti $(COMMLISTSLIB) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) fstype.o version.o $(WINGRIDLIB) $(FSTYPELIBS) -luti -lcommlists $(LIBS)
fstype.o: $(UTILBIN_DIR)/fstype.c
$(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)
spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
@@ -236,7 +236,7 @@ spoolinit.o: $(UTILBIN_DIR)/spoolinit.c
#---------------------------------------------------------------------
testsuidroot: testsuidroot.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
- $(CC) -o $@ $(LFLAGS) testsuidroot.o version.o -luti $(COMMLISTSLIB) $(WINGRIDLIB) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) testsuidroot.o version.o -luti -lcommlists $(WINGRIDLIB) $(LIBS)
testsuidroot.o: $(UTILBIN_DIR)/testsuidroot.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/testsuidroot.c
@@ -257,7 +257,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
#---------------------------------------------------------------------
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)
spooledit.o: $(UTILBIN_DIR)/spooledit.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c
@@ -290,7 +290,7 @@ valid_jvmlib.o: $(UTILBIN_DIR)/valid_jv
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/valid_jvmlib.c
#---------------------------------------------------------------------
-AUTHUSER_ADD_LIBS = -luti $(COMMLISTSLIB) $(DLLIB)
+AUTHUSER_ADD_LIBS = -luti -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_3rdparty_sge_depend_def.h Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-source_3rdparty_sge_depend_def.h,v 1.1 2012/04/15 04:07:21 markd Exp $
ensure varargs prototypes to fix build on 64bit
--- source/3rdparty/sge_depend/def.h.orig 2012-04-10 04:36:21.000000000 +0000
+++ source/3rdparty/sge_depend/def.h
@@ -170,6 +170,8 @@ int cppsetup();
struct symtab **isdefined();
#endif
+#define NeedVarargsPrototypes 1
+
#if NeedVarargsPrototypes
extern void fatalerr(char *, ...);
extern void warning(char *, ...);

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

@@ -0,0 +1,15 @@
$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.1 2013/05/23 18:41:48 joerg Exp $
--- source/libs/uti/sge_loadmem.c.orig 2013-05-23 16:27:21.000000000 +0000
+++ source/libs/uti/sge_loadmem.c
@@ -44,6 +44,10 @@
#include "uti/sge_log.h"
#include "uti/msg_utilib.h"
+#ifdef __NetBSD__
+#include <uvm/uvm_extern.h>
+#endif
+
#if !defined(LINUX) && !defined(CRAY) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD)
#include <unistd.h>