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

24
parallel/gridscheduler/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:55 wiz Exp $
# $NetBSD: Makefile,v 1.21 2016/07/09 06:38:47 wiz Exp $
PKGNAME= gridscheduler-2011.11
DISTNAME= GE2011.11
PKGREVISION= 9
PKGNAME= gridscheduler-2011.11.1
PKGREVISION= 2
DISTNAME= GE2011.11p1
CATEGORIES= parallel sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gridscheduler/}
@@ -12,9 +12,6 @@ COMMENT= Open Grid Scheduler/Grid Engine resource management system
BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
# Not 64-bit clean; crashes during build.
BROKEN_ON_PLATFORM= ${LP64PLATFORMS}
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl:run
@@ -36,8 +33,6 @@ PKG_GECOS.${SGE_USER}= Sun Grid Engine Administrator
PKG_GROUPS_VARS+= SGE_GROUP
PKG_USERS_VARS+= SGE_USER
EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl
AIMK= ${SETENV} ${MAKE_ENV} tcsh -fb ${WRKSRC}/source/aimk
CONFIG_GUESS_OVERRIDE= source/3rdparty/qmake/config.guess \
@@ -109,12 +104,12 @@ post-patch:
${ECHO} " `${WRKSRC}/source/dist/util/arch`" ; \
${FALSE} ; \
fi
( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \
( ${ECHO} "set OPENSSL_HOME = ${BUILDLINK_PREFIX.openssl}" ; \
${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \
${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \
${ECHO} "set BDB_LIB_SUFFIX = 4" ; \
${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private
( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \
( ${ECHO} "OPENSSLBASE=${BUILDLINK_PREFIX.openssl}" ; \
${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
SUBST_CLASSES+= paths
@@ -147,7 +142,7 @@ do-install:
for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \
ln -s ${DESTDIR}${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
ln -s ${DESTDIR}${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
ln -s ${DESTDIR}${SSL_PREFIX}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
ln -s ${DESTDIR}${BUILDLINK_PREFIX.openssl}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
cd ${DESTDIR}${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} DESTDIR=${DESTDIR} ./util/setfileperm.sh -auto \
${SGE_ROOT}
for f in ${DESTDIR}${SGE_ROOT}/bin/${SGE_ARCH}/q* ; do \
@@ -169,8 +164,3 @@ CHECK_INTERPRETER_SKIP= sge/hadoop/pestart.sh \
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
.if ${USE_BUILTIN.openssl} == "yes"
SSL_PREFIX= /usr
.else
SSL_PREFIX= ${PKGSRC_SSL_PREFIX}
.endif

3
parallel/gridscheduler/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
@comment $NetBSD: PLIST,v 1.2 2015/12/13 00:50:39 asau Exp $
bin/qacct
bin/qalter
bin/qconf
@@ -393,7 +393,6 @@ sge/qmon/PIXMAPS/xterm.xpm
sge/qmon/Qmon
sge/qmon/qmon_help.ad
sge/util/arch
sge/util/arch.dist
sge/util/arch_variables
sge/util/arch_variables.orig
sge/util/bdb_checkpoint.sh

16
parallel/gridscheduler/distinfo
View File

@@ -1,15 +1,15 @@
$NetBSD: distinfo,v 1.3 2013/12/28 07:03:11 asau Exp $
$NetBSD: distinfo,v 1.6 2015/12/25 20:12:16 joerg Exp $
SHA1 (GE2011.11.tar.gz) = bd06d10f7186652e9b264bf8256cb6b633d2b6b9
RMD160 (GE2011.11.tar.gz) = 9ed02a132993c34c89a47ae8e3ac22fbf10d6506
Size (GE2011.11.tar.gz) = 14293882 bytes
SHA1 (GE2011.11p1.tar.gz) = 8935cc015e9de87d000b7e1814a1359b3cd6f3ca
RMD160 (GE2011.11p1.tar.gz) = 535f453ace86bfa067cebad2b2b37d7e730aa779
Size (GE2011.11p1.tar.gz) = 14305562 bytes
SHA1 (patch-ad) = 0da714b6f9f2dfb0d952f84863a76fdac23aed8e
SHA1 (patch-ag) = f33c490bbb93c6d37ef1937210bff7b92cf19207
SHA1 (patch-ak) = e73a58e547b8401eff27a4635629577767234f0f
SHA1 (patch-am) = 3098e0016eaaff35c119cf8d0f67e0838c3eb28a
SHA1 (patch-ak) = d96eb75285ca793d96ae33a86c25b6f0e8f2d1b7
SHA1 (patch-am) = 954f3bc8093c52910c0cae66423d4d4042d04043
SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
SHA1 (patch-bd) = 3977477ccf3d67a3e807bbda42d072397a9d9485
SHA1 (patch-bl) = 5cf177b4b3d31a6483da6daa5ec5ff840b3be7fe
SHA1 (patch-bd) = 47e1a4f61916ec7038ed5ce9b8beedb0527c04e9
SHA1 (patch-bl) = d13fd8f276093304fcd34769714cbcce95012809
SHA1 (patch-bm) = a760a1f06ab301acb1f0dcb88151c308f381ab60
SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002
SHA1 (patch-source_libs_uti_sge__loadmem.c) = fa4a36931ef90f6d18f35bc1a081d0f7d2a0728a

13
parallel/gridscheduler/patches/patch-ak
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-ak,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
$NetBSD: patch-ak,v 1.2 2015/12/25 20:12:16 joerg 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.orig 2012-05-23 19:04:49.000000000 +0000
+++ source/utilbin/Makefile
@@ -146,7 +146,7 @@ read_raw.o: $(UTILBIN_DIR)/read_raw.c
@@ -33,6 +33,15 @@ doesnt reorder.
spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.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) $(LCKLIB) $(RMONLIB)
- $(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) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) ${COMPILER_RPATH_FLAG}${SGE_ROOT}/lib/${SGE_ARCH} spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -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

113
parallel/gridscheduler/patches/patch-am
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-am,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
$NetBSD: patch-am,v 1.3 2015/12/25 20:12:16 joerg Exp $
--- source/aimk.orig 2011-11-14 19:01:16.000000000 +0000
--- source/aimk.orig 2012-05-23 19:05:00.000000000 +0000
+++ source/aimk
@@ -412,7 +412,7 @@ set SPOOLING_DEPS = "spoolloaderlib sp
@@ -422,7 +422,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"
@@ -11,19 +11,35 @@ $NetBSD: patch-am,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
# JUTI Targets
set JUTI_ALL = juti_all
@@ -1301,9 +1301,9 @@ case NETBSD_*:
set DLLIB = ""
@@ -1301,11 +1301,11 @@ case FREEBSD_*:
set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
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 LFLAGS = "$DEBUG_FLAG $LFLAGS -Wl,-export-dynamic"
set LIBS = "$LIBS -lkvm"
set SHAREDLD = $CC
set SHARED_CFLAGS = "-fPIC"
@@ -1311,9 +1311,9 @@ case NETBSD_*:
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
@@ -1334,20 +1334,20 @@ case NETBSD_*:
set CXX = g++
set DLLIB = ""
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 DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set NOERR_CFLAG = "-Wno-error"
- set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
+ set LFLAGS = "$DEBUG_FLAG $LFLAGS -Wl,-export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
set LIBS = "$LIBS -lkvm"
set SHAREDLD = $CC
set SHARED_CFLAGS = "-fPIC"
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
@@ -34,17 +50,8 @@ $NetBSD: patch-am,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
+ 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
set XMLIBS = "$XLIBS"
@@ -2519,7 +2519,7 @@ if ( "$BUILDMAN" == 1 ) then
exit 1
endif
@@ -53,67 +60,3 @@ $NetBSD: patch-am,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
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_

40
parallel/gridscheduler/patches/patch-bd
View File

@@ -1,11 +1,8 @@
$NetBSD: patch-bd,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
$NetBSD: patch-bd,v 1.3 2015/12/25 20:12:16 joerg 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 @@
--- source/scripts/distinst.orig 2012-05-23 19:04:39.000000000 +0000
+++ source/scripts/distinst
@@ -75,13 +75,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,16 +20,16 @@ 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"
@@ -428,7 +428,7 @@
@@ -430,7 +430,7 @@ instclassictargets=false
instopenssl=true
instbdb=true
instarco=false
-instguiinst=true
+instguiinst=false
instsgeinspect=false
accept_prompts=false
enforce_shlibpath=false
@@ -527,11 +527,11 @@
@@ -530,11 +530,11 @@ while [ $# -ge 1 ]; do
echo Please set variable SGE_ROOT. Installation failed.
exit 1
fi
@@ -47,7 +44,7 @@ DESTDIR support.
localinst=true
;;
-mansrc)
@@ -897,13 +897,16 @@
@@ -901,13 +901,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 \
@@ -65,7 +62,7 @@ DESTDIR support.
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 @@
@@ -1089,9 +1092,6 @@ if [ $instcommon = true ]; then
if [ -f CLASSES/herd/herd.jar ]; then
Execute cp CLASSES/herd/herd.jar $DEST_SGE_ROOT/lib/herd.jar
@@ -75,3 +72,22 @@ DESTDIR support.
fi
fi
@@ -1121,11 +1121,14 @@ if [ $instcommon = true ]; then
Execute find $DEST_SGE_ROOT/man -type d | xargs chmod 755
Execute find $DEST_SGE_ROOT/man -type f | xargs chmod 644
-
- Execute find $DEST_SGE_ROOT/catman -type d | xargs chmod 755
- Execute find $DEST_SGE_ROOT/catman -type f | xargs chmod 644
- Cleanup man catman
+ Cleanup man
+
+ if [ -d MANSBUILD_$MANSRCDIR/ASCMAN/catman ]; then
+ Execute find $DEST_SGE_ROOT/catman -type d | xargs chmod 755
+ Execute find $DEST_SGE_ROOT/catman -type f | xargs chmod 644
+ Cleanup catman
+ fi
fi
if [ $instdoc = true ]; then

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;