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/gridscheduler/patches/patch-ad Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
--- source/daemons/shepherd/Makefile.orig 2008-10-31 02:54:16.000000000 +1300
+++ source/daemons/shepherd/Makefile
@@ -62,7 +62,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) -llck -lrmon $(DLLIB)
+SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB)
SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP) $(LCKLIB) $(RMONLIB)

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

@@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
--- source/libs/spool/Makefile.orig 2009-02-10 00:06:38.000000000 +1300
+++ source/libs/spool/Makefile
@@ -123,7 +123,7 @@ test_sge_spooling.o: $(SPOOLLIB_DIR)/tes
$(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) $(LCKLIB) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(UTILIB) $(RMONLIB) $(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) $(RMONLIB) $(WINGRIDLIB) $(LCKLIB) $(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) $(LCKLIB) $(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

44
parallel/gridscheduler/patches/patch-ak Normal file
View File

@@ -0,0 +1,44 @@
$NetBSD: patch-ak,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
Add LDFLAGS
replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
doesnt reorder.
--- source/utilbin/Makefile.orig 2011-11-14 19:00:55.000000000 +0000
+++ source/utilbin/Makefile
@@ -146,7 +146,7 @@ read_raw.o: $(UTILBIN_DIR)/read_raw.c
#---------------------------------------------------------------------
echo_raw: echo_raw.o version.o $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck $(COMMLISTSLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck -lcommlists $(LIBS)
echo_raw.o: $(UTILBIN_DIR)/echo_raw.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
@@ -188,7 +188,7 @@ signals.o: $(UTILBIN_DIR)/signals.c
#---------------------------------------------------------------------
loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB)
- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LOADAVGLIBS) $(LIBS)
loadcheck.o: $(UTILBIN_DIR)/loadcheck.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
@@ -222,7 +222,7 @@ 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) $(LCKLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB)
- $(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) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) $(COMPILER_RPATH_FLAG)$(SGE_ROOT)/lib/$(SGE_ARCH) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
@@ -290,7 +290,7 @@ valid_jvmlib.o: $(UTILBIN_DIR)/valid_jv
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/valid_jvmlib.c
#---------------------------------------------------------------------
-AUTHUSER_ADD_LIBS = -luti -llck -lrmon $(COMMLISTSLIB) $(DLLIB)
+AUTHUSER_ADD_LIBS = -luti -llck -lrmon -lcommlists $(DLLIB)
authuser: authuser.o juti.o $(UTILIB) $(LCKLIB) $(RMONLIB) $(COMMLISTSLIB)
$(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS)

119
parallel/gridscheduler/patches/patch-am Normal file
View File

@@ -0,0 +1,119 @@
$NetBSD: patch-am,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
--- source/aimk.orig 2011-11-14 19:01:16.000000000 +0000
+++ source/aimk
@@ -412,7 +412,7 @@ set SPOOLING_DEPS = "spoolloaderlib sp
# 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"
# JUTI Targets
set JUTI_ALL = juti_all
@@ -1301,9 +1301,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"
@@ -1311,9 +1311,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 $XCFLAGS"
- 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"
@@ -2246,7 +2246,7 @@ endif
if ( $HWLOC == 1 ) then
set CFLAGS = "$CFLAGS -DTHREADBINDING -DHWLOC"
- set CORE_INCLUDE = "$CORE_INCLUDE -I$SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/include/ -I$SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH/include"
+# set CORE_INCLUDE = "$CORE_INCLUDE -I$SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/include/ -I$SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH/include"
# set LFLAGS = "$LFLAGS -L$SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH/src/.libs/"
# set LIBS = "$LIBS -lhwloc"
set LIBS = "-L$SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH/src/.libs/ -lhwloc $LIBS"
@@ -2317,7 +2317,7 @@ if ( "$BUILDMAN" == 1 ) then
exit 1
endif
- $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE $BUILDMAN $BUILDHTMLMAN $KVMAN
+ $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE 0 $BUILDHTMLMAN $KVMAN
if ( $status != 0 ) then
echo not done
@@ -2581,36 +2581,36 @@ if ( "$PLPA" == 1 ) then
cd $SOURCE
endif
-if ( "$HWLOC" == 1 ) then
- echo _________3_r_d_p_a_r_t_y__H_W_L_O_C_______
-
- set maj_ver = `echo $HWLOC_VERSION| cut -f 1 -d .`
- set min_ver = `echo $HWLOC_VERSION| cut -f 2 -d .`
-
- if ( "$maj_ver" == 1 && "$min_ver" <= 2 ) then
- set HWLOC_CFLAGS_EXTRA = "--disable-xml"
- else
- set HWLOC_CFLAGS_EXTRA = "--disable-libxml2 --disable-pci"
- endif
-
- if ( ! -d $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH || \
- ! -r $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH/Makefile ) then
- mkdir -p $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH
- cd $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH
- env CFLAGS="$HWLOC_CFLAGS" ../configure --enable-static --disable-shared $HWLOC_CFLAGS_EXTRA
- endif
+# if ( "$HWLOC" == 1 ) then
+# echo _________3_r_d_p_a_r_t_y__H_W_L_O_C_______
- cd $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH
+# set maj_ver = `echo $HWLOC_VERSION| cut -f 1 -d .`
+# set min_ver = `echo $HWLOC_VERSION| cut -f 2 -d .`
- $MAKE $MAKEOPT -f Makefile "MAKE=$MAKE" "COMPILE_ARCH=$COMPILE_ARCH" $argv
+# if ( "$maj_ver" == 1 && "$min_ver" <= 2 ) then
+# set HWLOC_CFLAGS_EXTRA = "--disable-xml"
+# else
+# set HWLOC_CFLAGS_EXTRA = "--disable-libxml2 --disable-pci"
+# endif
+
+# if ( ! -d $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH || \
+# ! -r $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH/Makefile ) then
+# mkdir -p $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH
+# cd $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH
+# env CFLAGS="$HWLOC_CFLAGS" ../configure --enable-static --disable-shared $HWLOC_CFLAGS_EXTRA
+# endif
+
+# cd $SOURCE/3rdparty/hwloc/$HWLOC_DIRECTORY/$COMPILE_ARCH
+
+# $MAKE $MAKEOPT -f Makefile "MAKE=$MAKE" "COMPILE_ARCH=$COMPILE_ARCH" $argv
+
+# if ( $status != 0 ) then
+# echo not done
+# exit 1
+# endif
- if ( $status != 0 ) then
- echo not done
- exit 1
- endif
-
- cd $SOURCE
-endif
+# cd $SOURCE
+# endif
if ( "$MAKESTRPTIME" == 1 ) then
echo _________3_r_d_p_a_r_t_y__S_T_R_P_T_I_M_E_

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

@@ -0,0 +1,15 @@
$NetBSD: patch-at,v 1.1.1.1 2012/03/21 20:48:53 asau 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

77
parallel/gridscheduler/patches/patch-bd Normal file
View File

@@ -0,0 +1,77 @@
$NetBSD: patch-bd,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
Exclude Java files.
DESTDIR support.
--- source/scripts/distinst.orig 2011-11-14 23:00:44.000000000 +0400
+++ source/scripts/distinst 2012-02-22 01:09:06.000000000 +0400
@@ -75,13 +75,13 @@
# 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"
@@ -428,7 +428,7 @@
instopenssl=true
instbdb=true
instarco=false
-instguiinst=true
+instguiinst=false
instsgeinspect=false
enforce_shlibpath=false
@@ -527,11 +527,11 @@
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)
@@ -897,13 +897,16 @@
$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 [ -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 \
@@ -1085,9 +1088,6 @@
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

125
parallel/gridscheduler/patches/patch-bl Normal file
View File

@@ -0,0 +1,125 @@
$NetBSD: patch-bl,v 1.1.1.1 2012/03/21 20:48:53 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
@@ -1062,7 +1065,7 @@ static int cl_com_ssl_build_symbol_table
cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL );
#endif /* RTLD_NODELETE */
-#elif defined(FREEBSD)
+#elif defined(NETBSD) || defined(FREEBSD)
#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
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;

60
parallel/gridscheduler/patches/patch-bm Normal file
View File

@@ -0,0 +1,60 @@
$NetBSD: patch-bm,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
DESTDIR support.
--- source/dist/util/setfileperm.sh.orig 2011-11-14 23:00:55.000000000 +0400
+++ source/dist/util/setfileperm.sh 2012-02-22 01:42:23.000000000 +0400
@@ -49,7 +49,7 @@
PATH=/bin:/usr/bin:/usr/sbin
FILELIST="3rd_party bin ckpt dtrace examples inst_sge install_execd install_qmaster \
- lib mpi pvm qmon util utilbin start_gui_installer"
+ lib mpi pvm qmon util utilbin"
OPTFILES="catman doc include man hadoop"
@@ -81,7 +81,7 @@
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 @@
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 @@
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 @@
exit 1
fi
-. $SGE_ROOT/util/arch_variables
+. "$DESTDIR$SGE_ROOT"/util/arch_variables
if [ $ARCH = "win32-x86" ]; then
echo
@@ -183,7 +183,7 @@
done
fi
-cd $1
+cd $DESTDIR$1
if [ $? != 0 ]; then
$ECHO "ERROR: can't change to directory \"$1\". Exiting."
exit 1

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

@@ -0,0 +1,13 @@
$NetBSD: patch-daemons_common_procfs.c,v 1.1.1.1 2012/03/21 20:48:53 asau 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;