From fbf4241addf86d69a23b089f0cd1a05c77ed58f0 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 14 Jan 2014 10:21:39 +0000 Subject: Update to sge 8.1.6 Version 8.1.6 ------------- * Bug fixes Version 8.1.5 ------------- * Bug fixes Version 8.1.4 ------------- Milestone version: over 1000 patches since the last from Sun * Bug fixes * Enhancements * qacct: print category information; support -A like -P ; make -u a synonym for -o; -E selects on job end times read from standard input with -f * Move manager/operator setup in startup scripts * Installation creates an environment modules file * Add monitor_qmaster.sh script * Write shepherd panic messages to syslog, not into /tmp * Add .desktop file for qmon * rpm/dpkg packaging allows building against motif (recent Debian/Fedora) * Accounting reports qmaster-enforced resource limits (only on master PE task if accounting_summary is false) * Add "smp" to the default queue PE list * install_execd doesn't check the presence of (mostly irrelevant) binaries * Add configuration for logcheck * Potentially incompatible changes * renew_all_certs.ksh re-named to renew_all_certs.sh * Expand $ja_task_id to 0 for non-array jobs * Move manager/operator setup in startup scripts * For security reasons, installation defaults for min_uid, min_gid in sge_conf(5) are now 100 without CSP. See * RPM layout changed to put relevant ones under noarch (on RHEL6 and recent Fedora), with a separate guiinst package * Memory values can be input and output in TB or tB (possible incompatibility parsing output) * Reduce execd CPU time reading large smaps files from Linux /proc and provide USE_SMAPS in execd_params to turn it on (default now off because huge smaps are generated by some programs) * Remove redundant -verify option from qsh, qlogin (per doc) Version 8.1.3 ------------- * Bug fixes * Enhancements * Document Interix building explicitly * qstat reports array task maximum concurrency * qstatus removes [] suffix for non-array jobs if -t was requested * Read /etc/default/{sgeexecd,sgemaster} to allow customizing rc scripts * Location of daemon pid files can be specified with SGE_QMASTER_PIDFILE, SGE_EXECD_PIDFILE * Debian packaging (as an add-on, installing into /opt/sge) * Expand $sge_root and $sge_cell in the definitions of prolog and similar methods * Check in init script that shepherd will load * Add lx-armhf architecture * On Linux and NetBSD, report jobs' virtual memory usage as accurately as possible * Add -nobincheck installation option to avoid checking binaries * Add some build hooks, useful for Debian particularly. * Potentially incompatible changes * qacct prints units (might affect parsing the output) * Correct spelling of "comunication_error" in qstat XML error output * Fix problems submitting to ARs (printing times now doesn't use a days field in qstat etc.) * Java version >= 1.5 required * Lower default MAX_DYN_EC somewhat to avoid warning on typical Linux configurations * Other changes * Don't install the ckpt directory (contents obsolete) Version 8.1.2 ------------- * Bug fixes * Enhancements * Use cpusets for process containment on fairly recent Linux-based systems (see USE_CGROUPS in sge_conf(5)) * Add bootstrap build script * Make SGE template an RPM conf file * Incompatible changes * Make CRL and certificate expiry consistent Version 8.1.1 ------------- * Bug fixes * Security * Don't pass any user environment to remote startup daemons -- better fix for half of CVE-2012-0208 * Enhancements * SGE_BINDING is set in the environment for all types of binding * New jobstats(1) provides historical job summary * Berkeleydb spools can optionally be opened "private" to allow operation on NFS3 filesystems. Currently no installer support, but see bootstrap(5) and the health warning * Environment variable SGE_DRMAA_ALLOW_JOB_ERROR_STATE allows DRMAA jobs to enter the error state; see drmaa_submit(3) * Define SGE_JOBEXIT_STAT environment variable in epilog; see submit(1) * The user from which mail is sent can be configured in sge_conf(5) * Topology items are now static load values; see load_parameters(5) * qstat now prints array job dependency info * Default to support for qsort_args in sge_pe(5) * Include an example of logrotate usage * Install an "smp" PE * Distribute/document sge_share_mon(1) to print share tree * Improve install template defaults * GPU load sensor (dist/util/resources/loadsensors/gpu-loadsensor.c) * Allow building Kerberos/GSSAPI security modules against Heimdal (but GSS is still not properly usable) * Support arm and mipsel on GNU/Linux, completing the set of official Debian Linux-based ports * Support for OpenBSD (untested) * Preliminary support for Cygwin: everything builds, clients work (lightly tested), daemons need fixing * Add ja_task_id to expandable variables in ckpt_command and similar methods * distinst supports installation with install(1) for use with -local * Incompatible changes * The CA directory is now /var/lib/sgeCA instead of /var/sgeCA but installation will offer to move it [fixme] * Drop (any pretence at) support for Cray/Unicos, NEC SX, Darwin 6 * The spool format for parallel job tasks has changed from any previous version built with qsort_args (as above), which will make live upgrades from such a version fail on nodes running parallel jobs * Other changes * Extensive internal changes to improve robustness, e.g. of string-handling against buffer overruns -- somewhat error-prone and may have caused regressions; more required * Install script allows rsh et al to be omitted from binary distribution in favour of ssh Version 8.1.0 ------------- * Security fix * Prevent users other than root deleting entries with sgepasswd * Version numbering * Switch to a more logical numbering scheme now that the Univa baseline is irrelevant * Bug fixes * Other changes * Hadoop support now for a more recent Hadoop distribution (see README.BUILD) Version 8.0.0e -------------- Mostly build and security issues * Bug fixes * Security fixes The first fix is for a trivial remote root by a valid user. The others, including fixes for potential buffer overruns in daemon and setuid programs, may or may not be exploitable. * Sanitize the environment before executing remote startup programs etc. Somewhat incompatible: LD_LIBRARY_PATH etc. may need to be set differently. See the security notes in remote_startup(5) and sge_conf(5). (CVE-2012-0208, thanks to William Hay) * Don't write initial log messages in /tmp. Somewhat incompatible: initial messages now in syslog. * Avoid using mktemp. (Probably not a significant problem.) * Control core dumps under setuid etc. with SGE_ENABLE_COREDUMP. (Not normally a security issue.) * Bounds checking in replace_params * Avoid execd crash and possible overruns * Fixes for buffer overrun and other improvements for (setuid program) sgepasswd --- parallel/sge/Makefile | 22 +-- parallel/sge/PLIST | 213 ++++++--------------- parallel/sge/distinfo | 22 +-- parallel/sge/patches/patch-ad | 14 +- parallel/sge/patches/patch-am | 70 +++---- parallel/sge/patches/patch-at | 8 +- parallel/sge/patches/patch-bd | 39 ++-- parallel/sge/patches/patch-bl | 116 ----------- parallel/sge/patches/patch-source-utilbin_Makefile | 22 +-- .../patch-source_libs_comm_cl_ssl_framework.c | 15 ++ .../patches/patch-source_libs_uti_sge__loadmem.c | 8 +- 11 files changed, 165 insertions(+), 384 deletions(-) delete mode 100644 parallel/sge/patches/patch-bl create mode 100644 parallel/sge/patches/patch-source_libs_comm_cl_ssl_framework.c (limited to 'parallel/sge') diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index f0590f21bf0..b51374f08ae 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.57 2014/01/11 14:42:05 adam Exp $ +# $NetBSD: Makefile,v 1.58 2014/01/14 10:21:39 markd Exp $ # -DISTNAME= sge-8.0.0d -PKGNAME= sge-8.0.0.4 -PKGREVISION= 8 +DISTNAME= sge-8.1.6 CATEGORIES= parallel sysutils -MASTER_SITES= http://arc.liv.ac.uk/downloads/SGE/releases/8.0.0d/ +MASTER_SITES= http://arc.liv.ac.uk/downloads/SGE/releases/8.1.6/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://arc.liv.ac.uk/trac/SGE @@ -47,6 +45,10 @@ REPLACE.tclsh.old= .*tclsh REPLACE.tclsh.new= ${PREFIX}/bin/tclsh REPLACE_FILES.tclsh= source/dist/util/resources/jsv/jsv.tcl REPLACE_PERL+= source/dist/util/resources/jsv/jsv.pl +REPLACE_PERL+= source/dist/util/resources/scripts/qsched +REPLACE_PERL+= source/dist/util/resources/scripts/process-scheduler-log +REPLACE_PERL+= source/dist/util/resources/scripts/jobstats +REPLACE_PERL+= source/dist/util/resources/wrappers/rshd-wrapper .include "../../mk/bsd.prefs.mk" @@ -78,7 +80,7 @@ SGE_BUILDARCH_cmd= ${ECHO} "${SGE_ARCH}" | ${TR} a-z A-Z SGE_ARCH= darwin SGE_BUILDARCH= DARWIN .elif ${OPSYS} == "Linux" -AIMK+= -no-dump +#AIMK+= -no-dump . if ${MACHINE_ARCH} == "i386" SGE_ARCH= lx-x86 SGE_BUILDARCH= LINUX86 @@ -143,9 +145,7 @@ do-build: cd ${WRKSRC}/source && ${AIMK} ${JAVA_ARGS} -no-hwloc cd ${WRKSRC}/source && ${AIMK} ${JAVA_ARGS} -no-hwloc -man -CHECK_INTERPRETER_SKIP= sge/bin/process-scheduler-log \ - sge/bin/qsched \ - sge/bin/status \ +CHECK_INTERPRETER_SKIP= sge/bin/qstatus \ sge/ckpt/cpr_* \ sge/examples/drmaa/ruby/* \ sge/hadoop/pestart.sh \ @@ -155,8 +155,8 @@ CHECK_INTERPRETER_SKIP= sge/bin/process-scheduler-log \ sge/mpi/myrinet/* \ sge/util/resources/drmaa4ruby/* \ sge/util/resources/drmaa4ruby/samples/* \ - sge/util/resources/loadsensors/interix-loadsensor.sh \ - sge/util/resources/wrappers/rshd-wrapper + sge/util/resources/jsv/jsv.sh \ + sge/util/resources/loadsensors/interix-loadsensor.sh do-install: ${MKDIR} ${DESTDIR}${SGE_ROOT} diff --git a/parallel/sge/PLIST b/parallel/sge/PLIST index 5d9e6cc8e74..1c65142a19a 100644 --- a/parallel/sge/PLIST +++ b/parallel/sge/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2012/04/15 04:07:21 markd Exp $ +@comment $NetBSD: PLIST,v 1.9 2014/01/14 10:21:39 markd Exp $ bin/qacct bin/qalter bin/qconf @@ -23,8 +23,10 @@ bin/qsh bin/qstat bin/qsub bin/qtcsh -sge/3rd_party/3rd_party_licscopyrights -sge/3rd_party/qmon/ltree_changed.tar.gz +sge/bin/busy-nodes +sge/bin/dead-nodes +sge/bin/idle-nodes +sge/bin/jobstats sge/bin/${SGE_ARCH}/qacct sge/bin/${SGE_ARCH}/qalter sge/bin/${SGE_ARCH}/qconf @@ -53,157 +55,49 @@ sge/bin/${SGE_ARCH}/sge_coshepherd sge/bin/${SGE_ARCH}/sge_execd sge/bin/${SGE_ARCH}/sge_qmaster sge/bin/${SGE_ARCH}/sge_shadowd +sge/bin/${SGE_ARCH}/sge_share_mon sge/bin/${SGE_ARCH}/sge_shepherd sge/bin/${SGE_ARCH}/sgepasswd -sge/bin/busy-nodes -sge/bin/dead-nodes -sge/bin/idle-nodes sge/bin/nodes-in-job sge/bin/process-scheduler-log sge/bin/qsched sge/bin/qselect-node-list +sge/bin/qstatus sge/bin/sge-disable-submits sge/bin/sge-enable-submits -sge/bin/status -sge/catman/cat/cat1/gethostbyaddr.1 -sge/catman/cat/cat1/gethostbyname.1 -sge/catman/cat/cat1/gethostname.1 -sge/catman/cat/cat1/getservbyname.1 -sge/catman/cat/cat1/hostnameutils.1 -sge/catman/cat/cat1/jsv.1 -sge/catman/cat/cat1/qacct.1 -sge/catman/cat/cat1/qalter.1 -sge/catman/cat/cat1/qconf.1 -sge/catman/cat/cat1/qdel.1 -sge/catman/cat/cat1/qhold.1 -sge/catman/cat/cat1/qhost.1 -sge/catman/cat/cat1/qlogin.1 -sge/catman/cat/cat1/qmake.1 -sge/catman/cat/cat1/qmod.1 -sge/catman/cat/cat1/qmon.1 -sge/catman/cat/cat1/qping.1 -sge/catman/cat/cat1/qquota.1 -sge/catman/cat/cat1/qrdel.1 -sge/catman/cat/cat1/qresub.1 -sge/catman/cat/cat1/qrls.1 -sge/catman/cat/cat1/qrsh.1 -sge/catman/cat/cat1/qrstat.1 -sge/catman/cat/cat1/qrsub.1 -sge/catman/cat/cat1/qsched.1 -sge/catman/cat/cat1/qselect.1 -sge/catman/cat/cat1/qsh.1 -sge/catman/cat/cat1/qstat.1 -sge/catman/cat/cat1/qsub.1 -sge/catman/cat/cat1/qtcsh.1 -sge/catman/cat/cat1/sge-enable-disable.1 -sge/catman/cat/cat1/sge-node-selection.1 -sge/catman/cat/cat1/sge_ckpt.1 -sge/catman/cat/cat1/sge_intro.1 -sge/catman/cat/cat1/sge_types.1 -sge/catman/cat/cat1/sgepasswd.1 -sge/catman/cat/cat1/status.1 -sge/catman/cat/cat1/submit.1 -sge/catman/cat/cat3/drmaa_allocate_job_template.3 -sge/catman/cat/cat3/drmaa_attributes.3 -sge/catman/cat/cat3/drmaa_control.3 -sge/catman/cat/cat3/drmaa_delete_job_template.3 -sge/catman/cat/cat3/drmaa_exit.3 -sge/catman/cat/cat3/drmaa_get_DRMAA_implementation.3 -sge/catman/cat/cat3/drmaa_get_DRM_system.3 -sge/catman/cat/cat3/drmaa_get_attribute.3 -sge/catman/cat/cat3/drmaa_get_attribute_names.3 -sge/catman/cat/cat3/drmaa_get_contact.3 -sge/catman/cat/cat3/drmaa_get_next_attr_name.3 -sge/catman/cat/cat3/drmaa_get_next_attr_value.3 -sge/catman/cat/cat3/drmaa_get_next_job_id.3 -sge/catman/cat/cat3/drmaa_get_num_attr_names.3 -sge/catman/cat/cat3/drmaa_get_num_attr_values.3 -sge/catman/cat/cat3/drmaa_get_num_job_ids.3 -sge/catman/cat/cat3/drmaa_get_vector_attribute.3 -sge/catman/cat/cat3/drmaa_get_vector_attribute_names.3 -sge/catman/cat/cat3/drmaa_init.3 -sge/catman/cat/cat3/drmaa_job_ps.3 -sge/catman/cat/cat3/drmaa_jobcontrol.3 -sge/catman/cat/cat3/drmaa_jobtemplate.3 -sge/catman/cat/cat3/drmaa_misc.3 -sge/catman/cat/cat3/drmaa_release_attr_names.3 -sge/catman/cat/cat3/drmaa_release_attr_values.3 -sge/catman/cat/cat3/drmaa_release_job_ids.3 -sge/catman/cat/cat3/drmaa_run_bulk_jobs.3 -sge/catman/cat/cat3/drmaa_run_job.3 -sge/catman/cat/cat3/drmaa_session.3 -sge/catman/cat/cat3/drmaa_set_attribute.3 -sge/catman/cat/cat3/drmaa_set_vector_attribute.3 -sge/catman/cat/cat3/drmaa_strerror.3 -sge/catman/cat/cat3/drmaa_submit.3 -sge/catman/cat/cat3/drmaa_synchronize.3 -sge/catman/cat/cat3/drmaa_version.3 -sge/catman/cat/cat3/drmaa_wait.3 -sge/catman/cat/cat3/drmaa_wcoredump.3 -sge/catman/cat/cat3/drmaa_wexitstatus.3 -sge/catman/cat/cat3/drmaa_wifaborted.3 -sge/catman/cat/cat3/drmaa_wifexited.3 -sge/catman/cat/cat3/drmaa_wifsignaled.3 -sge/catman/cat/cat3/drmaa_wtermsig.3 -sge/catman/cat/cat3/jsv_script_interface.3 -sge/catman/cat/cat5/access_list.5 -sge/catman/cat/cat5/accounting.5 -sge/catman/cat/cat5/bootstrap.5 -sge/catman/cat/cat5/calendar_conf.5 -sge/catman/cat/cat5/checkpoint.5 -sge/catman/cat/cat5/complex.5 -sge/catman/cat/cat5/host_aliases.5 -sge/catman/cat/cat5/host_conf.5 -sge/catman/cat/cat5/hostgroup.5 -sge/catman/cat/cat5/project.5 -sge/catman/cat/cat5/qtask.5 -sge/catman/cat/cat5/queue_conf.5 -sge/catman/cat/cat5/remote_startup.5 -sge/catman/cat/cat5/reporting.5 -sge/catman/cat/cat5/sched_conf.5 -sge/catman/cat/cat5/sge_aliases.5 -sge/catman/cat/cat5/sge_conf.5 -sge/catman/cat/cat5/sge_pe.5 -sge/catman/cat/cat5/sge_priority.5 -sge/catman/cat/cat5/sge_qstat.5 -sge/catman/cat/cat5/sge_request.5 -sge/catman/cat/cat5/sge_resource_quota.5 -sge/catman/cat/cat5/sgepasswd.5 -sge/catman/cat/cat5/share_tree.5 -sge/catman/cat/cat5/user.5 -sge/catman/cat/cat8/SGE_Helper_Service.exe.8 -sge/catman/cat/cat8/pam_sge-qrsh-setup.8 -sge/catman/cat/cat8/pam_sge_authorize.8 -sge/catman/cat/cat8/sge_ca.8 -sge/catman/cat/cat8/sge_coshepherd.8 -sge/catman/cat/cat8/sge_execd.8 -sge/catman/cat/cat8/sge_qmaster.8 -sge/catman/cat/cat8/sge_shadowd.8 -sge/catman/cat/cat8/sge_shepherd.8 -sge/ckpt/README.cpr -sge/ckpt/README.cray -sge/ckpt/checkpoint_command -sge/ckpt/clean_command -sge/ckpt/cpr_ckpt_command -sge/ckpt/cpr_clean_command -sge/ckpt/cpr_migration_command -sge/ckpt/cpr_restart_command -sge/ckpt/cray_ckpt_command -sge/ckpt/cray_clean_command -sge/ckpt/cray_migration_command -sge/ckpt/cray_restart_command -sge/ckpt/migration_command -sge/ckpt/restart_command -sge/ckpt/sx6_ckpt_command -sge/ckpt/sx6_clean_command -sge/ckpt/sx6_migration_command -sge/ckpt/sx6_restart_command +sge/doc/AUTHORS sge/doc/LICENCE.txt +sge/doc/LICENCES/Apache-2 +sge/doc/LICENCES/BSD +sge/doc/LICENCES/BerkeleyDB +sge/doc/LICENCES/Classpath +sge/doc/LICENCES/Cygwin +sge/doc/LICENCES/FreeBSD +sge/doc/LICENCES/GFDL-1.3 +sge/doc/LICENCES/GPL-2 +sge/doc/LICENCES/GPL-3 +sge/doc/LICENCES/Iconlist +sge/doc/LICENCES/LGPL-3 +sge/doc/LICENCES/NanoXML +sge/doc/LICENCES/OpenSSL +sge/doc/LICENCES/README +sge/doc/LICENCES/SISSL +sge/doc/LICENCES/Spinbox +sge/doc/LICENCES/Xbae +sge/doc/LICENCES/XmTab +sge/doc/LICENCES/Xmt +sge/doc/LICENCES/hwloc +sge/doc/LICENCES/jemalloc +sge/doc/LICENCES/standards +sge/doc/LICENCES/tango +sge/doc/LICENCES/top sge/doc/NEWS +sge/doc/README sge/doc/README-DRMAA.txt +sge/doc/README.hadoop +sge/doc/README.upgrade sge/doc/arc_depend_irix.asc sge/doc/arc_depend_solaris.asc -sge/doc/load_parameters.asc sge/doc/logfile-trimming.asc sge/dtrace/README-dtrace.txt sge/dtrace/monitor.d @@ -249,7 +143,6 @@ sge/examples/jobs/ssession.sh sge/examples/jobs/step_A_array_submitter.sh sge/examples/jobs/step_B_array_submitter.sh sge/examples/jobs/worker.sh -sge/examples/jobsbin/${SGE_ARCH}/showq sge/examples/jobsbin/${SGE_ARCH}/work sge/hadoop/env.sh sge/hadoop/jsv.sh @@ -262,6 +155,7 @@ sge/hadoop/setup.pl sge/hadoop/ssh sge/hadoop/wait.sh sge/include/drmaa.h +sge/include/sge_pqs_api.h sge/inst_sge sge/install_execd sge/install_qmaster @@ -275,11 +169,13 @@ sge/man/man1/gethostbyname.1 sge/man/man1/gethostname.1 sge/man/man1/getservbyname.1 sge/man/man1/hostnameutils.1 +sge/man/man1/jobstats.1 sge/man/man1/jsv.1 sge/man/man1/qacct.1 sge/man/man1/qalter.1 sge/man/man1/qconf.1 sge/man/man1/qdel.1 +sge/man/man1/qevent.1 sge/man/man1/qhold.1 sge/man/man1/qhost.1 sge/man/man1/qlogin.1 @@ -298,15 +194,15 @@ sge/man/man1/qsched.1 sge/man/man1/qselect.1 sge/man/man1/qsh.1 sge/man/man1/qstat.1 +sge/man/man1/qstatus.1 sge/man/man1/qsub.1 sge/man/man1/qtcsh.1 sge/man/man1/sge-enable-disable.1 sge/man/man1/sge-node-selection.1 -sge/man/man1/sge_ckpt.1 sge/man/man1/sge_intro.1 -sge/man/man1/sge_types.1 +sge/man/man1/sge_share_mon.1 +sge/man/man1/sge_work.1 sge/man/man1/sgepasswd.1 -sge/man/man1/status.1 sge/man/man1/submit.1 sge/man/man3/drmaa_allocate_job_template.3 sge/man/man3/drmaa_attributes.3 @@ -351,6 +247,7 @@ sge/man/man3/drmaa_wifexited.3 sge/man/man3/drmaa_wifsignaled.3 sge/man/man3/drmaa_wtermsig.3 sge/man/man3/jsv_script_interface.3 +sge/man/man3/list_intro.3 sge/man/man5/access_list.5 sge/man/man5/accounting.5 sge/man/man5/bootstrap.5 @@ -360,6 +257,7 @@ sge/man/man5/complex.5 sge/man/man5/host_aliases.5 sge/man/man5/host_conf.5 sge/man/man5/hostgroup.5 +sge/man/man5/load_parameters.5 sge/man/man5/project.5 sge/man/man5/qtask.5 sge/man/man5/queue_conf.5 @@ -367,12 +265,16 @@ sge/man/man5/remote_startup.5 sge/man/man5/reporting.5 sge/man/man5/sched_conf.5 sge/man/man5/sge_aliases.5 +sge/man/man5/sge_ckpt.5 sge/man/man5/sge_conf.5 sge/man/man5/sge_pe.5 sge/man/man5/sge_priority.5 sge/man/man5/sge_qstat.5 sge/man/man5/sge_request.5 sge/man/man5/sge_resource_quota.5 +sge/man/man5/sge_schedule.5 +sge/man/man5/sge_status.5 +sge/man/man5/sge_types.5 sge/man/man5/sgepasswd.5 sge/man/man5/share_tree.5 sge/man/man5/user.5 @@ -381,12 +283,12 @@ sge/man/man8/pam_sge-qrsh-setup.8 sge/man/man8/pam_sge_authorize.8 sge/man/man8/sge_ca.8 sge/man/man8/sge_coshepherd.8 +sge/man/man8/sge_dl.8 sge/man/man8/sge_execd.8 sge/man/man8/sge_qmaster.8 sge/man/man8/sge_shadowd.8 sge/man/man8/sge_shepherd.8 sge/mpi/README -sge/mpi/README.atm sge/mpi/Scali-MPI/README sge/mpi/Scali-MPI/Scali_Resume.sh sge/mpi/Scali-MPI/Scali_Suspend.sh @@ -533,7 +435,6 @@ sge/qmon/PIXMAPS/unknown.xpm sge/qmon/PIXMAPS/uparrow.xpm sge/qmon/PIXMAPS/xterm-axp.xpm sge/qmon/PIXMAPS/xterm-blank.xpm -sge/qmon/PIXMAPS/xterm-cray.xpm sge/qmon/PIXMAPS/xterm-dec.xpm sge/qmon/PIXMAPS/xterm-hp.xpm sge/qmon/PIXMAPS/xterm-ibm.xpm @@ -590,9 +491,9 @@ sge/util/logging.properties.template sge/util/management.properties.template sge/util/qtask sge/util/rctemplates/darwin_template -sge/util/rctemplates/sgebdb_template sge/util/rctemplates/sgeexecd_template sge/util/rctemplates/sgemaster_template +sge/util/resources/README sge/util/resources/calendars/day sge/util/resources/calendars/day_s sge/util/resources/calendars/night @@ -648,6 +549,9 @@ sge/util/resources/centry/tmpdir sge/util/resources/centry/virtual_free sge/util/resources/centry/virtual_total sge/util/resources/centry/virtual_used +sge/util/resources/configs/README +sge/util/resources/configs/logcheck.sge +sge/util/resources/configs/logrotate.sge sge/util/resources/drmaa4ruby/README sge/util/resources/drmaa4ruby/drmaa.rb sge/util/resources/drmaa4ruby/samples/array.rb @@ -680,8 +584,9 @@ sge/util/resources/jsv/jsv_include.sh sge/util/resources/jsv/jsv_include.tcl sge/util/resources/jsv/jsv_reject_all.sh sge/util/resources/jsv/logging.properties +sge/util/resources/loadsensors/Makefile sge/util/resources/loadsensors/calendar.sh -sge/util/resources/loadsensors/ibm-loadsensor +sge/util/resources/loadsensors/gpu-loadsensor.c sge/util/resources/loadsensors/interix-loadsensor.sh sge/util/resources/loadsensors/load.sh sge/util/resources/loadsensors/maui.sh @@ -689,15 +594,19 @@ sge/util/resources/loadsensors/nuser.sh sge/util/resources/loadsensors/sgi_tty_sensor.sh sge/util/resources/loadsensors/solaris-iidle.sh sge/util/resources/pe/make +sge/util/resources/pe/smp sge/util/resources/schemas/qhost/qhost.xsd sge/util/resources/schemas/qquota/qquota.xsd sge/util/resources/schemas/qrstat/qrstat.xsd sge/util/resources/schemas/qstat/detailed_job_info.xsd -sge/util/resources/schemas/qstat/detailed_job_info_cb.xsd sge/util/resources/schemas/qstat/message.xsd sge/util/resources/schemas/qstat/qstat.xsd +sge/util/resources/scripts/README +sge/util/resources/scripts/README.jobstats sge/util/resources/scripts/README.qsched sge/util/resources/scripts/README.status +sge/util/resources/scripts/monitor_qmaster.sh +sge/util/resources/scripts/setup-cgroups-etc sge/util/resources/starter_methods/settaskid.sh sge/util/resources/usersets/arusers sge/util/resources/usersets/deadlineusers @@ -706,12 +615,11 @@ sge/util/resources/wrappers/qlogin_wrapper sge/util/resources/wrappers/rshd-wrapper sge/util/rmiconsole.policy sge/util/setfileperm.sh -sge/util/sgeCA/renew_all_certs.csh +sge/util/sgeCA/renew_all_certs.sh sge/util/sgeCA/sge_ca sge/util/sgeCA/sge_ca.cnf sge/util/sgeCA/sge_ssl.cnf sge/util/sgeCA/sge_ssl_template.cnf -sge/util/sgeSMF/bdb_template.xml sge/util/sgeSMF/execd_template.xml sge/util/sgeSMF/qmaster_template.xml sge/util/sgeSMF/sge_smf.sh @@ -754,7 +662,6 @@ sge/utilbin/${SGE_ARCH}/read_raw sge/utilbin/${SGE_ARCH}/rlogin sge/utilbin/${SGE_ARCH}/rsh sge/utilbin/${SGE_ARCH}/rshd -sge/utilbin/${SGE_ARCH}/sge_share_mon sge/utilbin/${SGE_ARCH}/spooldefaults sge/utilbin/${SGE_ARCH}/spooledit sge/utilbin/${SGE_ARCH}/spoolinit diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo index 63907bf9ab1..db85a6cda88 100644 --- a/parallel/sge/distinfo +++ b/parallel/sge/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.17 2013/10/20 17:57:32 joerg Exp $ +$NetBSD: distinfo,v 1.18 2014/01/14 10:21:39 markd Exp $ -SHA1 (sge-8.0.0d.tar.gz) = e7500bbeec4075d054410f7465011efb61e93def -RMD160 (sge-8.0.0d.tar.gz) = aa83db459f4bbbebd7d2cc81290b7b8cb0818210 -Size (sge-8.0.0d.tar.gz) = 12289130 bytes -SHA1 (patch-ad) = 004600f060b5fcacd91ba68808686c0a679889f6 +SHA1 (sge-8.1.6.tar.gz) = 8348a543c736ed4f1c36cf1e8242eeb1a61033df +RMD160 (sge-8.1.6.tar.gz) = 231f4d100722c7a99a92e0b9b989125e5d15f295 +Size (sge-8.1.6.tar.gz) = 11875229 bytes +SHA1 (patch-ad) = 8a1c2aa9245bee66068073df7a5434ca37de03c7 SHA1 (patch-ag) = 57eb4296e531f3a47b95c8842e0db0575870dcf0 -SHA1 (patch-am) = d361698129c0396ee224d48872d680b7084c2a1e -SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5 -SHA1 (patch-bd) = aae1bdccfb81712c504b3add8b9728a2bcf3d1dd -SHA1 (patch-bl) = f04f92c1a1c69443e9336f9fcbe7d988001f6681 +SHA1 (patch-am) = 143ce85347f3653481d516142f205b7110b9f64d +SHA1 (patch-at) = 09b861e761f1e49fcd940b95d89b072c83e5c160 +SHA1 (patch-bd) = ec95d0a167c933607843894e4a62822474723b2f SHA1 (patch-bm) = 524268d07060fac00a2648e7c63377f965377c9d SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002 -SHA1 (patch-source-utilbin_Makefile) = b01de3925fd6795ee9bd0ad1c1bed7dfb2ed4d92 +SHA1 (patch-source-utilbin_Makefile) = 0a6fa06e71140ed8e74ebe0e5e37a4a3a515391b SHA1 (patch-source_3rdparty_sge_depend_def.h) = 92ad1ef5d0cf237fa083a262d38c67828593f679 -SHA1 (patch-source_libs_uti_sge__loadmem.c) = 46014f5a1294bfbcbe71e1c79cca3b8c5eb54e6f +SHA1 (patch-source_libs_comm_cl_ssl_framework.c) = 230c2a510b52516d9eea934b8c797141167a0b6d +SHA1 (patch-source_libs_uti_sge__loadmem.c) = d781009ee8efbfa210a698c885f0aab51ae96818 diff --git a/parallel/sge/patches/patch-ad b/parallel/sge/patches/patch-ad index 5c529126bb6..3f1bd09c3a9 100644 --- a/parallel/sge/patches/patch-ad +++ b/parallel/sge/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.4 2012/03/20 17:07:43 asau Exp $ +$NetBSD: patch-ad,v 1.5 2014/01/14 10:21:39 markd Exp $ ---- source/daemons/shepherd/Makefile.orig 2011-11-29 03:06:13.000000000 +0400 -+++ source/daemons/shepherd/Makefile 2012-02-20 19:55:03.000000000 +0400 -@@ -64,7 +64,7 @@ +--- source/daemons/shepherd/Makefile.orig 2013-10-28 16:22:53.000000000 +0000 ++++ source/daemons/shepherd/Makefile +@@ -65,7 +65,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) $(DLLIB) -+SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB) +-SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm_static -lcommlists -luti -luti2 $(HWLOCLIB) $(WINGRIDLIB_STATIC) $(DLLIB) ++SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti -luti2 $(HWLOCLIB) $(WINGRIDLIB_STATIC) $(DLLIB) - SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP) + SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(UTI2LIB) $(WINGRIDLIB_DEP) diff --git a/parallel/sge/patches/patch-am b/parallel/sge/patches/patch-am index 5785da88fd9..475ea52f928 100644 --- a/parallel/sge/patches/patch-am +++ b/parallel/sge/patches/patch-am @@ -1,21 +1,21 @@ -$NetBSD: patch-am,v 1.9 2013/10/20 17:57:32 joerg Exp $ +$NetBSD: patch-am,v 1.10 2014/01/14 10:21:39 markd Exp $ Pkgsrc stuff GridEngine dev mailing list patch for "nbsd-1" issue ArchLinux static crypto also needs libz.a ---- source/aimk.orig 2011-11-28 23:06:13.000000000 +0000 +--- source/aimk.orig 2013-10-28 16:22:52.000000000 +0000 +++ source/aimk -@@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then +@@ -937,7 +937,7 @@ if ( $SYSTEM_LIBS != 1 ) then # 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} ${COMPILER_RPATH_FLAG}$BERKELEYDB_HOME/lib" + set LFLAGS = "-L$BERKELEYDB_HOME/lib${BDB_LIB_SUFFIX} $LFLAGS" +- set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib${BDB_LIB_SUFFIX}" ++ set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib${BDB_LIB_SUFFIX} ${COMPILER_RPATH_FLAG}$BERKELEYDB_HOME/lib" endif set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS" -@@ -1213,9 +1213,9 @@ case DARWIN_PPC: +@@ -1185,9 +1185,9 @@ case DARWIN_PPC: set XMTDEF = "" set XMTINCD = "$XMTINCD -I$MOTIFHOME/include" @@ -23,11 +23,11 @@ ArchLinux static crypto also needs libz.a + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" set XCFLAGS = "-DNeedFunctionPrototypes -DNeedVarargsPrototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L$MOTIFHOME/lib -L/usr/X11R6/lib" -+ set XLIBD = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib" - set XLIBS = "-lXm -lXpm -lXt -lXext -lX11 -lSM -lICE" ++ set XLIBD = "-L$MOTIFHOME/lib ${COMPILER_RPATH_FLAG}${MOTIFHOME}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib" + set XLIBS = "-lXm -lXt -lXext -lX11 -lSM -lICE" if ("$ADOC" == 1) then set CFLAGS = "$CFLAGS -Wno-error" -@@ -1263,7 +1263,7 @@ case FREEBSD_*: +@@ -1234,7 +1234,7 @@ case FREEBSD_*: set DLLIB = "" set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" @@ -36,7 +36,7 @@ ArchLinux static crypto also needs libz.a set NOERR_CFLAG = "-Wno-error" set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" set LIBS = "$LIBS -lkvm" -@@ -1273,9 +1273,9 @@ case FREEBSD_*: +@@ -1244,9 +1244,9 @@ case FREEBSD_*: set AUTHLIBS = "-lcrypt -lpam" set XMTDEF = "" @@ -44,58 +44,32 @@ ArchLinux static crypto also needs libz.a + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L/usr/X11R6/lib" -+ set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAGS}${X11BASE}/lib" ++ set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib" set XLFLAGS = "$XLIBD" - set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" - set RM = "rm -f" -@@ -1294,9 +1294,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 ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib" - set LIBS = "$LIBS -lkvm" - set SHAREDLD = $CC - set SHARED_CFLAGS = "-fPIC" -@@ -1304,9 +1304,9 @@ case NETBSD_*: + set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXt -lXext -lX11 -lSM -lICE -lXp" + set JAVA_ARCH = "linux" +@@ -1275,9 +1275,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/usr/X11R7/include -I/usr/pkg/include" + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" -- set XLIBD = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib" +- set XLIBD = "-L/usr/X11R7/lib -R/usr/X11R7/lib -L/usr/pkg/lib -R /usr/pkg/lib" + set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib" set XLFLAGS = "$XLIBD" - set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" - set RM = "rm -f" -@@ -1508,6 +1508,8 @@ case LINUXSPARC64: + set XLIBS = " -lXm -lXt -lXext -lX11 -lSM -lICE -lXp" + set JAVA_ARCH = "netbsd" +@@ -1499,6 +1499,8 @@ case LINUX*: set DEBUG_FLAG = "$DEBUG_FLAG -fprofile-arcs -ftest-coverage" endif -+ set SECLIBS_STATIC = "$SECLIBS_STATIC /usr/lib/libz.a" ++ set SECLIBS_STATIC = "-lssl -lcrypto" + 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 -@@ -2103,6 +2105,13 @@ else - set LIBS_DIR = ${SDIR} - endif - -+ -+# we set SGE_ARCH_STRING down here because the sed command above -+# would mess up the quotes around buildarch -+set ARCH_STRING = SGE_ARCH_STRING='\"'${buildarch}'\"' -+set CFLAGS = "-D$ARCH_STRING $CFLAGS" -+set DEPEND_FLAGS = "-D$ARCH_STRING $DEPEND_FLAGS" -+ - if ( $JNI == 1 ) then - - if ( "${JAVA_HOME}/${JAVA_INCL}" != /usr/include ) then -@@ -2797,6 +2806,7 @@ if ( "$QMON" == 1 ) then +@@ -2627,6 +2629,7 @@ if ( "$QMON" == 1 ) then else set FT_INC = "" endif diff --git a/parallel/sge/patches/patch-at b/parallel/sge/patches/patch-at index 9f14e7af52b..9828f616110 100644 --- a/parallel/sge/patches/patch-at +++ b/parallel/sge/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.2 2006/10/19 11:51:27 markd Exp $ +$NetBSD: patch-at,v 1.3 2014/01/14 10:21:39 markd Exp $ ---- source/dist/util/arch_variables.orig 2005-11-11 03:53:15.000000000 +1300 +--- source/dist/util/arch_variables.orig 2013-10-28 16:22:53.000000000 +0000 +++ source/dist/util/arch_variables -@@ -197,8 +197,8 @@ case $ARCH in +@@ -191,8 +191,8 @@ case $ARCH in AWK=/usr/bin/awk ECHO="/bin/echo" RC_FILE=netbsd @@ -10,6 +10,6 @@ $NetBSD: patch-at,v 1.2 2006/10/19 11:51:27 markd Exp $ - RC_SUFFIX=.sh + RC_PREFIX=@rcd_dir@ + RC_SUFFIX= - XTERM=/usr/X11R6/bin/xterm + XTERM=/usr/X11R7/bin/xterm MAILER=/usr/bin/mail QLOGIN_COMMAND=telnet diff --git a/parallel/sge/patches/patch-bd b/parallel/sge/patches/patch-bd index 015066f513a..a26998a413a 100644 --- a/parallel/sge/patches/patch-bd +++ b/parallel/sge/patches/patch-bd @@ -1,11 +1,11 @@ -$NetBSD: patch-bd,v 1.5 2012/03/20 17:07:43 asau Exp $ +$NetBSD: patch-bd,v 1.6 2014/01/14 10:21:39 markd Exp $ Exclude Java files. DESTDIR support. ---- source/scripts/distinst.orig 2011-11-28 23:06:15.000000000 +0000 +--- source/scripts/distinst.orig 2013-10-28 16:22:54.000000000 +0000 +++ source/scripts/distinst -@@ -79,13 +79,13 @@ DRMAA_SHARED_LIBRARIES="libdrmaa" +@@ -85,13 +85,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,7 +23,7 @@ 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" -@@ -544,11 +544,11 @@ while [ $# -ge 1 ]; do +@@ -550,11 +550,11 @@ while [ $# -ge 1 ]; do echo Please set variable SGE_ROOT. Installation failed. exit 1 fi @@ -38,7 +38,7 @@ DESTDIR support. localinst=true ;; -mansrc) -@@ -927,13 +927,16 @@ if [ $instcommon = true ]; then +@@ -934,7 +934,6 @@ 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 \ @@ -46,27 +46,28 @@ DESTDIR support. $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 test -f $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; then -+ Execute chmod 644 $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; -+ fi +@@ -942,6 +941,10 @@ if [ $instcommon = true ]; then + $DEST_SGE_ROOT/util/resources/usersets/* \ + $DEST_SGE_ROOT/util/resources/jsv/jsv_include* + 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 \ -@@ -951,8 +954,7 @@ if [ $instcommon = true ]; then ++ if test -f $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; then ++ Execute chmod 644 $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; ++ fi + + if [ $instexamples = true ]; then + echo Installing \"examples\" +@@ -954,8 +957,7 @@ if [ $instcommon = true ]; then Execute cp libs/japi/example.c $DEST_SGE_ROOT/examples/drmaa Execute cp libs/japi/howto/*.c $DEST_SGE_ROOT/examples/drmaa MakeDir examples/drmaa/ruby - Execute mv $DEST_SGE_ROOT/util/resources/drmaa4ruby/samples/* $DEST_SGE_ROOT/examples/drmaa/ruby - Execute rmdir $DEST_SGE_ROOT/util/resources/drmaa4ruby/samples + Execute cp -r dist/util/resources/drmaa4ruby/samples/* $DEST_SGE_ROOT/examples/drmaa/ruby + Execute chmod 755 $DEST_SGE_ROOT/examples/drmaa/ruby/*.rb \ + $DEST_SGE_ROOT/examples/drmaa/ruby/flow/*.rb Cleanup examples - fi - -@@ -1117,9 +1119,6 @@ if [ $instcommon = true ]; then +@@ -1123,9 +1125,6 @@ if [ $instcommon = true ]; then if [ -f CLASSES/herd/herd.jar ]; then Execute cp CLASSES/herd/herd.jar $DEST_SGE_ROOT/lib/herd.jar @@ -76,7 +77,7 @@ DESTDIR support. fi fi -@@ -1276,7 +1275,9 @@ if [ $instguiinst = true ]; then +@@ -1318,7 +1317,9 @@ if [ $instguiinst = true ]; then echo "Installing \"start_gui_installer\" and \"/util/gui-installer\"" Execute mkdir -p $DEST_SGE_ROOT/util/gui-installer/html/en/help Execute mkdir -p $DEST_SGE_ROOT/util/gui-installer/templates diff --git a/parallel/sge/patches/patch-bl b/parallel/sge/patches/patch-bl deleted file mode 100644 index f7810c36633..00000000000 --- a/parallel/sge/patches/patch-bl +++ /dev/null @@ -1,116 +0,0 @@ -$NetBSD: patch-bl,v 1.6 2012/03/20 17:07:43 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 - -@@ -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; diff --git a/parallel/sge/patches/patch-source-utilbin_Makefile b/parallel/sge/patches/patch-source-utilbin_Makefile index 0d39ff3f660..c303ed0190e 100644 --- a/parallel/sge/patches/patch-source-utilbin_Makefile +++ b/parallel/sge/patches/patch-source-utilbin_Makefile @@ -1,10 +1,10 @@ -$NetBSD: patch-source-utilbin_Makefile,v 1.1 2012/04/15 04:07:21 markd Exp $ +$NetBSD: patch-source-utilbin_Makefile,v 1.2 2014/01/14 10:21:39 markd Exp $ Add LDFLAGS replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper doesnt reorder. ---- source/utilbin/Makefile.orig 2009-02-11 09:27:33.000000000 +0000 +--- source/utilbin/Makefile.orig 2013-10-28 16:22:54.000000000 +0000 +++ source/utilbin/Makefile @@ -118,14 +118,14 @@ gethostbyaddr.o: $(UTILBIN_DIR)/gethostb @@ -59,9 +59,9 @@ doesnt reorder. @@ -188,7 +188,7 @@ signals.o: $(UTILBIN_DIR)/signals.c #--------------------------------------------------------------------- - loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) -- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS) -+ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -lcommlists $(LOADAVGLIBS) $(LIBS) + loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) binding_support.o +- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o binding_support.o $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) $(UTILIB) $(WINGRIDLIB) $(COMMLISTSLIB) $(LOADAVGLIBS) $(HWLOCLIB) $(LIBS) ++ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o binding_support.o $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB) $(UTILIB) $(WINGRIDLIB) -lcommlists $(LOADAVGLIBS) $(HWLOCLIB) $(LIBS) loadcheck.o: $(UTILBIN_DIR)/loadcheck.c $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c @@ -91,8 +91,8 @@ doesnt reorder. $(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) $(WINGRIDLIB_DEP) $(UTILIB) -- $(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) $(DLLIB) $(SLIBS) $(LIBS) -+ $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS) +- $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS) ++ $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS) spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c @@ -109,8 +109,8 @@ doesnt reorder. #--------------------------------------------------------------------- spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB) -- $(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) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS) -+ $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS) +- $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS) ++ $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(SECLIB) $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS) spooledit.o: $(UTILBIN_DIR)/spooledit.c $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c @@ -118,8 +118,8 @@ doesnt reorder. $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/valid_jvmlib.c #--------------------------------------------------------------------- --AUTHUSER_ADD_LIBS = -luti $(COMMLISTSLIB) $(DLLIB) -+AUTHUSER_ADD_LIBS = -luti -lcommlists $(DLLIB) +-AUTHUSER_ADD_LIBS = $(UTILIB) $(COMMLISTSLIB) $(DLLIB) ++AUTHUSER_ADD_LIBS = $(UTILIB) -lcommlists $(DLLIB) authuser: authuser.o juti.o $(UTILIB) $(COMMLISTSLIB) $(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS) diff --git a/parallel/sge/patches/patch-source_libs_comm_cl_ssl_framework.c b/parallel/sge/patches/patch-source_libs_comm_cl_ssl_framework.c new file mode 100644 index 00000000000..f71c71336e1 --- /dev/null +++ b/parallel/sge/patches/patch-source_libs_comm_cl_ssl_framework.c @@ -0,0 +1,15 @@ +$NetBSD: patch-source_libs_comm_cl_ssl_framework.c,v 1.1 2014/01/14 10:21:39 markd Exp $ + +Fix typo + +--- source/libs/comm/cl_ssl_framework.c.orig 2013-10-28 16:22:53.000000000 +0000 ++++ source/libs/comm/cl_ssl_framework.c +@@ -3637,7 +3637,7 @@ int cl_com_ssl_connection_request_handle + + #ifndef USE_POLL + if (sockfd >= FD_SETSIZE) { +- CL_LOG_int(CL_LOG_ERROR,"number of filedescriptors exceeds FD_SETSIZE of this system: ", FD_SETSIZE); ++ CL_LOG_INT(CL_LOG_ERROR,"number of filedescriptors exceeds FD_SETSIZE of this system: ", FD_SETSIZE); + shutdown(sockfd, 2); + close(sockfd); + cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_REACHED_FILEDESCRIPTOR_LIMIT, MSG_CL_COMMLIB_COMPILE_SOURCE_WITH_LARGER_FD_SETSIZE ); diff --git a/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c b/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c index a0bb37ecb47..5e78cc0652f 100644 --- a/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c +++ b/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c @@ -1,8 +1,8 @@ -$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.1 2013/05/23 18:41:48 joerg Exp $ +$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.2 2014/01/14 10:21:39 markd Exp $ ---- source/libs/uti/sge_loadmem.c.orig 2013-05-23 16:27:21.000000000 +0000 +--- source/libs/uti/sge_loadmem.c.orig 2013-10-28 16:22:54.000000000 +0000 +++ source/libs/uti/sge_loadmem.c -@@ -44,6 +44,10 @@ +@@ -45,6 +45,10 @@ #include "uti/sge_log.h" #include "uti/msg_utilib.h" @@ -10,6 +10,6 @@ $NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.1 2013/05/23 18:41:48 joerg Ex +#include +#endif + - #if !defined(LINUX) && !defined(CRAY) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD) + #if !defined(__linux__) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD) #include -- cgit v1.2.3