Update SGE to 6.1.5

patch-au compiles sge_arch.c with -ansi so that stringification hack works
on NetBSD and FreeBSD and probably others. Otherwise architecture names
like nbsd-i386 turn into nbsd-1 - From the FreeBSD port.

Bugs fixed in SGE 6.1u5 since release 6.1u4

wrong documentation for upgrade 6.0u2 and higher to 6.1u2 and higher
Multiple loadsensor instances are trying to access the same temp load
 file on AIX51
Validation of the Filter List in Simple Query builder fails
qhost -l h=<hostname> does not work
Numbers in error mail too large
use of the same pathes for input/output stream must be dealt with
DRMAA Java language binding segfaults on Session.exit() with sol-x86
 binaries on AMD64
sgeexecd startup script shouldn't suppress error messages from sge_execd
 binary
Advanced Query with wild card character * does not produce correct results.
'Infinity' must be rejected when specified in 'complex_values' or RQS
 limits for consumables
Invalid qconf -mrqs crashes qmaster with segmentation fault
RQS: Line wrap of host list introduces syntax error
Row Limit in ARCo Simple Query builder cannot be empty
loadsensor does not work on AIX51
qhost -xml has wrong namespace
QMON: The help for Resource Quotas is not available
qmon fills in fields incorrectly for restoring config for Submit Job
sgemaster -qmaster stop shutdowns also shadowd
incorrect depencency on xinetd in init scripts for linux
Latebindings for Advanced Queries does not work
Switching from Simple Query to Advanced Query removes the Latebingings
32-bit Linux binaries are having problems with file access in 64-bit NFS
 environments
using of default_domain may prohibit execd installation
Commlib might crash if running out of memory
Configuration file check of automatic installation does not recognize remsh
loadcheck prints error message "kstat finds too many cpus"
Communication library thread locking problem results in qmaster crash
ARCo should not print exception stack trace in the console
TABLESPACE values should be written to dbwriter.conf
Incorrectly considering two host group names to be the same
Clients not disconnecting correctly
SGE util/arch script is broken for AIX 5.3 Operating System
error message given by qalter -q '' <jobid> suggests a memory access problem
bootstrap(5) man page sees itself als sge_conf(5)
qmaster reinstall overwriting an existing installation fails
qconf -ae|-Ae return 0 even if exechost exists already
qconf -dxxxx does not set exit status on error
qconf -as, -am, -ao, -Ae, -Acal, -Ackpt, -Ap when msg "already exist"
 should return not 0 exit code
qconf -acal doesn't return error code 1 when failed
setting of QMaster port number leads to infinite loop
use of -l tmpdir=abc can crash schedd
load scaling display not working correctly
qstat -j does not print array task information
job hold due to -hold_jid is not indicated as STATE_SYSTEM_ON_HOLD by
 drmaa_job_ps(3)
Segmentation fault of sge_schedd
A load sensor reporting values for other hosts does not work
reporting file is lacking information about global consumables, if
 log_consumables=false
Wallclock_Time query should be more constrained
"./install_execd -winsvc -auto /path/to/auto.conf" command causes error
The default has to be local spool directory when install_execd is run for
 a Windows host
qmaster runs out of memory on AIX
dbw install parameters are not verified
Incorrect slots_total from qstat -F -xml output
Wrong permissions if install_qmaster creates qmaster spool directory
Installation of execution daemon left user unclear which port was chosen.
Exception occurs during the exportation of a query result to pdf
memory leak in sge_execd with qsub -v SGE_* or qsub -V
ARCo should support SJWC 3.1

Bugs fixed in SGE 6.1u4 since release 6.1u3

on Windows installation fails when installing as root and SGE admin
 user = none
accounting records for slave tasks of pe jobs should contain the correct
 task submission time
check if config parameters qlogin_daemon and rlogin_daemon are pathes
parallel scheduling memory leak in sge_schedd
execd installation does not test absolute path for local spool dir
Sort on table column throws exception if explicit SORT specified in
 SimpleQuery Sort on table column
Error.jsp contains unbalanced tagError.jsp contains unbalanced tag
arco_read should be able to create synonyms instead of arco_write
DBW should use batch inserts
prolog an epilog descriptions should include exit codes
It is possible to negative tickets / shares in qmon and from the command
 line
ORDER BY clause ignored in Advanced Query
Queue Consumables query incorrect in ARCo predefined queries
CLI accepts the slot number of more than 10000000
ARCo online help contains invalid, unclear or outdated information
the installation of two rpc databases on the some host fails
DBWriter should not exit if there is a database connection error
Reporting 'View' dropdown menu and 'Save Result' functionality is confusing
DBW derived rules and reporting queries that count jobs need to be updated
incomplete error loging in case of classic spooling failures
Row Limit in Simple Query uses wrong syntax
NONE' as value is not rejected for queue_conf(5) shell and qsub(1) -S
Upgrade to 6.1u3 fails for PostgreSQL < 8.0, minor issues i
 dbdefinition.xml for PSQL > 8.0
dbwriter should write checkpoint to database
dbwriter deletion rules delete tasks of pe_jobs
unclear 'exit_status' description in accounting(5) about Grid Engine
 specific status
autoinstall configfile should be parsed and checked for valid input!
qstat -j output is broken for shell_path
the project field should be displayed in the qstat -j output
Wrong variable for calculating daily host values from hourly ones
Pending PE job qstat -j output displays addtional useless message when not
 running because of RQs
automatic backup is broken!
Spelling mistakes in the qmon help menus
deletion rule for PostgreSQL incorrect for deletion of sge_share_log
qquota broken if quota definition contains "hosts" or "users" scope negation
Access_list(5) man page not precise enough with regards secondary/primary
 group(s)
RQS debitation of running jobs is broken if enabled by -mattr
Set SGE_QMASTER_PORT in settings file if sge_qmaster is not found in
 /etc/services file
Failed to deliver STOP signal for subordinated jobs
Missing array job task usage in the accounting file
qhost/qstat can't be interrupted with ctrl-c
typographical errors in messages from install_qmaster
Sort order and row limit cannot be specified together in ARCo Simple Query
 builder
Qmaster segfaults with long host resource evaluation expression
Error message for unsupported platforms should be more verbose
qsub does not accept resource strings size larger than 256
Memory leak in drmaa_run_job()/drmaa_run_bulk_job()
ARCo reporting module installation script is broken on Red Hat Enterprise
 Linux 4 Update 4
Job predecessor list missing from qstat -j output
In SJWC on Oracle dates appear truncated to just MM/DD/YYYY
configfile check in automatic installation is to strict
load sensor might block execd port
Uninstallation of remote execd if not interactive
Infotext spawned on remote machine with -wait or -ask does not display the
 text
Uninstall does not remove the SGE_STARTUP_SCRIPT
qmaster crashes when SGE_ND=1, dl 2 and BDB server spooling
inst_sge -ux all -um fails
Usage string for some commands is incomplete
dbwriter installation can't finish on large amount of data
reprioritize disappears after sge_qmaster restart
qmaster failover should not change the state of any queue

5 files changed, 36 insertions, 25 deletions

diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 17d11ec7e56..b6d83d1feaa 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2008/10/19 19:18:44 he Exp $
+# $NetBSD: Makefile,v 1.34 2008/11/26 10:20:08 markd Exp $
 #
 
-PKGNAME=		sge-6.1.3
-DISTNAME=		ge-V61u3_TAG-src
-PKGREVISION=		1
+PKGNAME=		sge-6.1.5
+DISTNAME=		ge-V61u5_TAG-src
 CATEGORIES=		parallel sysutils
-MASTER_SITES=		http://gridengine.sunsource.net/files/documents/7/161/
+MASTER_SITES=		http://gridengine.sunsource.net/files/documents/7/182/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gridengine.sunsource.net/
diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo
index d8d362a6baa..577fc9c84cd 100644
--- a/parallel/sge/distinfo
+++ b/parallel/sge/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.9 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: distinfo,v 1.10 2008/11/26 10:20:08 markd Exp $
 
-SHA1 (ge-V61u3_TAG-src.tar.gz) = 10dd4ae1d930f691acb7c14445293393ffc9e221
-RMD160 (ge-V61u3_TAG-src.tar.gz) = c1125fb6000b1addb52a9c623994a9cd55689c07
-Size (ge-V61u3_TAG-src.tar.gz) = 8559414 bytes
-SHA1 (patch-ah) = f3485710b3f4ab5e09f396f7760fbb84150c8542
-SHA1 (patch-ai) = 1d6dc93df47ab2dccffe5fb6751f26d51352e7be
+SHA1 (ge-V61u5_TAG-src.tar.gz) = 0328a43c8cf29c8f9a858e75b2f22f0c0f43207c
+RMD160 (ge-V61u5_TAG-src.tar.gz) = 243a2041121d2667d08f15248d47d4279b90575f
+Size (ge-V61u5_TAG-src.tar.gz) = 8635279 bytes
+SHA1 (patch-ah) = f44be88e6488a07b0ba5d8df8dca829c6357797a
+SHA1 (patch-ai) = c118080423d55e3caeba80563e9d9ccd36afdec5
 SHA1 (patch-ak) = 75ccac72140aaf788d6d7da65e5dc39c8cbcd378
 SHA1 (patch-am) = 69a89aa18036894c1e729394b722b07643be1395
 SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
+SHA1 (patch-au) = 6c3f2f8be9b44db9d649083056e20107a99c7b08
 SHA1 (patch-bd) = 6043e9a12bdf161514a92cf87a8b1ad51e163f7b
 SHA1 (patch-bl) = 37f5bbaeedccc0889fd3e23b2dd2ec283e2cd778
 SHA1 (patch-bm) = 4a558bb3bcdd35686eff5bf61bf749bffb0f25ca
diff --git a/parallel/sge/patches/patch-ah b/parallel/sge/patches/patch-ah
index 777850561a9..387f134917a 100644
--- a/parallel/sge/patches/patch-ah
+++ b/parallel/sge/patches/patch-ah
@@ -1,21 +1,19 @@
-$NetBSD: patch-ah,v 1.4 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-ah,v 1.5 2008/11/26 10:20:08 markd Exp $
 
---- source/aimk.site.orig	Fri Feb 16 17:02:44 2007
-+++ source/aimk.site	Fri May 30 11:07:25 2008
-@@ -72,7 +72,7 @@
+--- source/aimk.site.orig	2008-07-04 03:10:38.000000000 +1200
++++ source/aimk.site
+@@ -72,16 +72,16 @@ setenv TMPDIR /tmp
  # is installed
  #
  set OPENSSL_SOVERSION = 0.9.7l
--set OPENSSL_HOME = /vol2/tools/SW/openssl-0.9.7l-origin/$buildarch
+-set OPENSSL_HOME = /off_home/gridengine/openssl-0.9.7l-origin/$buildarch
 +set OPENSSL_HOME = @ssl_prefix@
  
- 
  # 
-@@ -85,10 +85,10 @@
  # BERKELEYDB_HOME the directory where the include and lib directory of
  # Berkeley DB is installed
  #
--set BERKELEYDB_HOME = /vol2/SW/db-4.4.20/$buildarch
+-set BERKELEYDB_HOME = /off_home/gridengine/db-4.4.20/$buildarch
 -set BDB_INCLUDE_SUBDIR =
 +set BERKELEYDB_HOME = @db4_prefix@
 +set BDB_INCLUDE_SUBDIR = db4
@@ -25,7 +23,7 @@ $NetBSD: patch-ah,v 1.4 2008/09/15 16:30:57 ahoka Exp $
  
  # 
  # KRB_HOME the directory where the include and lib directory of kerberos is
-@@ -117,7 +117,7 @@
+@@ -106,7 +106,7 @@ set SWIG = /vol2/tools/SW/swig-1.3.22/$b
  #
  # PERL path
  #
diff --git a/parallel/sge/patches/patch-ai b/parallel/sge/patches/patch-ai
index 0a89e370540..082c78463e0 100644
--- a/parallel/sge/patches/patch-ai
+++ b/parallel/sge/patches/patch-ai
@@ -1,16 +1,16 @@
-$NetBSD: patch-ai,v 1.4 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-ai,v 1.5 2008/11/26 10:20:08 markd Exp $
 
---- source/scripts/distinst.site.orig	Mon Jan 22 22:58:31 2007
-+++ source/scripts/distinst.site	Fri May 30 11:10:46 2008
+--- source/scripts/distinst.site.orig	2008-07-04 03:10:39.000000000 +1200
++++ source/scripts/distinst.site
 @@ -32,10 +32,10 @@
  
  # Base directory where the openssl binary and libraries reside
  OPENSSLSOVERSION=0.9.7
--OPENSSLBASE=/vol2/tools/SW/openssl-0.9.7l-origin
+-OPENSSLBASE=/off_home/gridengine/openssl-0.9.7l-origin
 +OPENSSLBASE=@ssl_prefix@
  
  # Base directory where BDB resides
--BERKELEYDBBASE=/vol2/SW/db-4.4.20
+-BERKELEYDBBASE=/off_home/gridengine/db-4.4.20
 +BERKELEYDBBASE=@db4_prefix@
  
  TAR=gtar
diff --git a/parallel/sge/patches/patch-au b/parallel/sge/patches/patch-au
new file mode 100644
index 00000000000..084746c854e
--- /dev/null
+++ b/parallel/sge/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.3 2008/11/26 10:20:08 markd Exp $
+
+--- source/libs/uti/Makefile.orig	2007-07-10 01:43:48.000000000 +1200
++++ source/libs/uti/Makefile
+@@ -186,7 +186,7 @@ sge_nprocs.o:	$(UTILIB_DIR)/sge_nprocs.c
+ 		$(CC) $(CFLAGS) $(COD_NPROCS_CFLAGS) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_nprocs.c
+ 
+ sge_arch.o:	$(UTILIB_DIR)/sge_arch.c
+-		$(CC) $(CFLAGS) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_arch.c
++		$(CC) -ansi $(CFLAGS) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_arch.c
+ 
+ sge_loadmem.o:	$(UTILIB_DIR)/sge_loadmem.c 
+ 		$(CC) $(CFLAGS) $(MEMCFLAG) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_loadmem.c