Teach pkg about linux (only i386 at this stage).

5 files changed, 188 insertions, 6 deletions

diff --git a/parallel/sge/patches/patch-ak b/parallel/sge/patches/patch-ak
index 3f8e6c76aae..4d3e3577c2f 100644
--- a/parallel/sge/patches/patch-ak
+++ b/parallel/sge/patches/patch-ak
@@ -1,10 +1,29 @@
-$NetBSD: patch-ak,v 1.6 2009/05/13 21:00:25 markd Exp $
+$NetBSD: patch-ak,v 1.7 2011/02/17 08:55:11 markd Exp $
 
 Add LDFLAGS
+replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
+doesnt reorder.
 
---- source/utilbin/Makefile.orig	2009-02-11 22:27:33.000000000 +1300
+--- source/utilbin/Makefile.orig	2009-02-11 09:27:33.000000000 +0000
 +++ source/utilbin/Makefile
-@@ -145,7 +145,7 @@ read_raw.o:		$(UTILBIN_DIR)/read_raw.c
+@@ -117,14 +117,14 @@ gethostbyaddr.o:	$(UTILBIN_DIR)/gethostb
+ 
+ #---------------------------------------------------------------------
+ getservbyname:	getservbyname.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(DLLIB) $(LIBS)
++		$(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(DLLIB) $(LIBS)
+ 
+ getservbyname.o:	$(UTILBIN_DIR)/getservbyname.c
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/getservbyname.c
+ 
+ #---------------------------------------------------------------------
+ filestat:	filestat.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LIBS)
++		$(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LIBS)
+ 
+ filestat.o:	$(UTILBIN_DIR)/filestat.c
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/filestat.c
+@@ -145,28 +145,28 @@ read_raw.o:		$(UTILBIN_DIR)/read_raw.c
  
  #---------------------------------------------------------------------
  echo_raw:		echo_raw.o version.o $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
@@ -13,6 +32,55 @@ Add LDFLAGS
  
  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) $(LCKLIB) $(RMONLIB)
+-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(LIBS) $(DLLIB)
++		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(LIBS) $(DLLIB)
+ 
+ checkprog.o:	$(UTILBIN_DIR)/checkprog.c
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkprog.c
+ 
+ #---------------------------------------------------------------------
+ checkuser:     checkuser.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LIBS)
++		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LIBS)
+ 
+ checkuser.o:      $(UTILBIN_DIR)/checkuser.c
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkuser.c
+ 
+ #---------------------------------------------------------------------
+ adminrun:   adminrun.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LIBS)
++		$(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LIBS)
+ 
+ adminrun.o: $(UTILBIN_DIR)/adminrun.c
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/adminrun.c
+@@ -187,7 +187,7 @@ signals.o:	$(UTILBIN_DIR)/signals.c
+ 
+ #---------------------------------------------------------------------
+ loadcheck:	loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
++		$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LOADAVGLIBS) $(LIBS)
+ 
+ loadcheck.o:	$(UTILBIN_DIR)/loadcheck.c 
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
+@@ -202,13 +202,13 @@ loadcheck.obj: $(UTILBIN_DIR)/loadcheck.
+ 
+ #---------------------------------------------------------------------
+ languagetest:   languagetest.o version.o  $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(LIBS)
++		$(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(LIBS)
+ 
+ languagetest.o: $(UTILBIN_DIR)/languagetest.c
+ 		$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/languagetest.c
+ #---------------------------------------------------------------------
+ infotext:   infotext.o  version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+-		$(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(LIBS)
++		$(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(LIBS)
+ 
+ infotext.o: $(UTILBIN_DIR)/infotext.c
+ 		$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/infotext.c
 @@ -221,7 +221,7 @@ fstype.o: $(UTILBIN_DIR)/fstype.c
  		$(CC) $(CFLAGS) $(MEMCFLAG) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/fstype.c
  #---------------------------------------------------------------------
diff --git a/parallel/sge/patches/patch-am b/parallel/sge/patches/patch-am
index 5382c5334cf..70168a92cee 100644
--- a/parallel/sge/patches/patch-am
+++ b/parallel/sge/patches/patch-am
@@ -1,7 +1,8 @@
-$NetBSD: patch-am,v 1.5 2009/05/13 21:00:25 markd Exp $
+$NetBSD: patch-am,v 1.6 2011/02/17 08:55:11 markd Exp $
 
 Pkgsrc stuff
 GridEngine dev mailing list patch for "nbsd-1" issue
+ArchLinux static crypto also needs libz.a
 
 --- source/aimk.orig	2009-02-17 22:27:39.000000000 +1300
 +++ source/aimk
@@ -47,7 +48,16 @@ GridEngine dev mailing list patch for "nbsd-1" issue
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM       = "rm -f"
-@@ -1875,6 +1875,12 @@ default:
+@@ -1376,6 +1376,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
+@@ -1875,6 +1877,12 @@ default:
  endsw
  
  set DEPEND_FLAGS = "`echo $DEPEND_FLAGS | sed -e 's/-[^DI][^ ]*//g'`"
diff --git a/parallel/sge/patches/patch-bl b/parallel/sge/patches/patch-bl
index 04f5af42e71..9a39a4a1a75 100644
--- a/parallel/sge/patches/patch-bl
+++ b/parallel/sge/patches/patch-bl
@@ -1,4 +1,4 @@
-$NetBSD: patch-bl,v 1.4 2010/12/08 11:30:18 markd Exp $
+$NetBSD: patch-bl,v 1.5 2011/02/17 08:55:11 markd Exp $
 
 --- source/libs/comm/cl_ssl_framework.c.orig	2009-02-16 08:50:41.000000000 +0000
 +++ source/libs/comm/cl_ssl_framework.c
@@ -12,6 +12,30 @@ $NetBSD: patch-bl,v 1.4 2010/12/08 11:30:18 markd Exp $
  
  #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;
@@ -39,6 +63,48 @@ $NetBSD: patch-bl,v 1.4 2010/12/08 11:30:18 markd 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
+       }
+ 
+       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;
        }
@@ -48,3 +114,12 @@ $NetBSD: patch-bl,v 1.4 2010/12/08 11:30:18 markd 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
+       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;
diff --git a/parallel/sge/patches/patch-daemons_common_procfs.c b/parallel/sge/patches/patch-daemons_common_procfs.c
new file mode 100644
index 00000000000..be997ee0d0e
--- /dev/null
+++ b/parallel/sge/patches/patch-daemons_common_procfs.c
@@ -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;
diff --git a/parallel/sge/patches/patch-utilbin_Makefile b/parallel/sge/patches/patch-utilbin_Makefile
new file mode 100644
index 00000000000..331b324cfeb
--- /dev/null
+++ b/parallel/sge/patches/patch-utilbin_Makefile
@@ -0,0 +1,16 @@
+$NetBSD: patch-utilbin_Makefile,v 1.1 2011/02/17 08:55:11 markd Exp $
+
+replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
+doesnt reorder.
+
+--- source/utilbin/Makefile.orig	2011-02-10 02:13:18.354047083 +0000
++++ source/utilbin/Makefile
+@@ -282,7 +282,7 @@ sge_share_mon.o: $(UTILBIN_DIR)/sge_shar
+ 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/sge_share_mon.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)