Fix build on NetBSD-current: rename getline() and openssl>=1.0 issues.

5 files changed, 85 insertions, 9 deletions

diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo
index 85ad69440ca..2562f244292 100644
--- a/parallel/sge/distinfo
+++ b/parallel/sge/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/06/11 07:15:54 obache Exp $
+$NetBSD: distinfo,v 1.12 2010/12/08 11:30:18 markd Exp $
 
 SHA1 (ge-V62u2_1_TAG-src.tar.gz) = f4655c17ea80109aea797f76a02ead02e44ffeb3
 RMD160 (ge-V62u2_1_TAG-src.tar.gz) = fb36f8aaae2f4e9975428dca0d21e9328b77d37a
@@ -15,5 +15,8 @@ SHA1 (patch-am) = cb3c1f07a6e2f2bc24a5a98b3f2fa9c1892bde15
 SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
 SHA1 (patch-av) = 1e68be936996fe3b4be21b590600cec3fa26970a
 SHA1 (patch-bd) = c24a357d5a87be61b5e0a91daf219e1cc24087a2
-SHA1 (patch-bl) = 37f5bbaeedccc0889fd3e23b2dd2ec283e2cd778
+SHA1 (patch-bl) = cf90930071e837e56258b7a0cac731ceba775503
 SHA1 (patch-bm) = 524268d07060fac00a2648e7c63377f965377c9d
+SHA1 (patch-ca) = f248651b4be0514900d30f31a75843e1b54c1e51
+SHA1 (patch-cb) = e33ffad67579c8381cffd4f5c236235205108867
+SHA1 (patch-cc) = 0a60fdce9a501f290429a1827df57fcfb3b5950f
diff --git a/parallel/sge/patches/patch-bl b/parallel/sge/patches/patch-bl
index 5f0219df8e4..04f5af42e71 100644
--- a/parallel/sge/patches/patch-bl
+++ b/parallel/sge/patches/patch-bl
@@ -1,8 +1,18 @@
-$NetBSD: patch-bl,v 1.3 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-bl,v 1.4 2010/12/08 11:30:18 markd Exp $
 
---- source/libs/comm/cl_ssl_framework.c.orig	Fri Jun 15 12:34:16 2007
-+++ source/libs/comm/cl_ssl_framework.c	Fri May 30 11:17:47 2008
-@@ -1025,7 +1025,7 @@
+--- 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)
+@@ -1040,7 +1043,7 @@ static int cl_com_ssl_build_symbol_table
     {
        char* func_name = NULL;
        int had_errors = 0;
@@ -11,7 +21,7 @@ $NetBSD: patch-bl,v 1.3 2008/09/15 16:30:57 ahoka Exp $
        void* cl_com_ssl_crypto_handle_saved = NULL;
  #endif
  
-@@ -1047,7 +1047,7 @@
+@@ -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 */
  
@@ -20,7 +30,7 @@ $NetBSD: patch-bl,v 1.3 2008/09/15 16:30:57 ahoka Exp $
  #ifdef RTLD_NODELETE
        cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
  #else
-@@ -1076,7 +1076,7 @@
+@@ -1091,7 +1094,7 @@ static int cl_com_ssl_build_symbol_table
           return CL_RETVAL_SSL_DLOPEN_SSL_LIB_FAILED;
        }
        
@@ -29,7 +39,7 @@ $NetBSD: patch-bl,v 1.3 2008/09/15 16:30:57 ahoka Exp $
        cl_com_ssl_crypto_handle_saved = cl_com_ssl_crypto_handle;
        cl_com_ssl_crypto_handle = RTLD_DEFAULT;
  #endif
-@@ -1784,7 +1784,7 @@
+@@ -1813,7 +1816,7 @@ static int cl_com_ssl_build_symbol_table
           return CL_RETVAL_SSL_CANT_LOAD_ALL_FUNCTIONS;
        }
  
diff --git a/parallel/sge/patches/patch-ca b/parallel/sge/patches/patch-ca
new file mode 100644
index 00000000000..ce00131a8de
--- /dev/null
+++ b/parallel/sge/patches/patch-ca
@@ -0,0 +1,24 @@
+$NetBSD: patch-ca,v 1.1 2010/12/08 11:30:18 markd Exp $
+
+rename getline() to avoid clash
+
+--- source/3rdparty/sge_depend/def.h.orig	2003-03-09 05:06:35.000000000 +0000
++++ source/3rdparty/sge_depend/def.h
+@@ -136,7 +136,7 @@ char         *realloc();
+ #if NeedFunctionPrototypes
+ char *copy( char *str);
+ char *base_name(char *file, int strip);
+-char *getline(struct filepointer *filep);
++char *sge_getline(struct filepointer *filep);
+ struct filepointer *getfile(char *file);
+ struct inclist *newinclude(char *newfile, char *incstring);
+ struct inclist *inc_path(char	*file, char *include, boolean	dot);
+@@ -155,7 +155,7 @@ struct symtab **isdefined( char *symbol,
+ #else
+ char *copy();
+ char *base_name();
+-char *getline();
++char *sge_getline();
+ struct filepointer *getfile();
+ struct inclist *newinclude();
+ struct inclist *inc_path();
diff --git a/parallel/sge/patches/patch-cb b/parallel/sge/patches/patch-cb
new file mode 100644
index 00000000000..71f7d7966d6
--- /dev/null
+++ b/parallel/sge/patches/patch-cb
@@ -0,0 +1,15 @@
+$NetBSD: patch-cb,v 1.1 2010/12/08 11:30:18 markd Exp $
+
+rename getline() to avoid clash
+
+--- source/3rdparty/sge_depend/main.c.orig	2007-07-26 15:41:43.000000000 +0000
++++ source/3rdparty/sge_depend/main.c
+@@ -510,7 +510,7 @@ char *copy(str)
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *sge_getline(filep)
+    register struct filepointer   *filep;
+ {
+    register char   *p,   /* walking pointer */
diff --git a/parallel/sge/patches/patch-cc b/parallel/sge/patches/patch-cc
new file mode 100644
index 00000000000..d3ebeeb616f
--- /dev/null
+++ b/parallel/sge/patches/patch-cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-cc,v 1.1 2010/12/08 11:30:18 markd Exp $
+
+rename getline() to avoid clash
+
+--- source/3rdparty/sge_depend/parse.c.orig	2008-04-16 09:11:05.000000000 +0000
++++ source/3rdparty/sge_depend/parse.c
+@@ -80,7 +80,7 @@ static int gobble(filep, file, file_red)
+    register char   *line;
+    register int   type;
+ 
+-   while ((line = getline(filep))) {
++   while ((line = sge_getline(filep))) {
+       switch(type = deftype(line, filep, file_red, file, FALSE)) {
+       case IF:
+       case IFFALSE:
+@@ -571,7 +571,7 @@ int find_includes(filep, file, file_red,
+    register int   type;
+    boolean recfailOK;
+ 
+-   while ((line = getline(filep))) {
++   while ((line = sge_getline(filep))) {
+       switch(type = deftype(line, filep, file_red, file, TRUE)) {
+       case IF:
+       doif: