mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-01 10:59:55 +00:00
Upgrade to SGE 6.0u11
Also, fix a couple bugs in the FreeBSD integration that were causing periodic execd crashes. [1] Submitted by: Hans-Martin Rasch <rasch at incore dot de> [1]
This commit is contained in:
parent
d1a296d9d2
commit
fed9879891
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=198747
@ -7,12 +7,11 @@
|
||||
|
||||
PORTNAME= sge
|
||||
PORTVERSION= ${SGE_VERSION}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= sysutils parallel
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/122/
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/142/
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= brooks
|
||||
DISTNAME= sge-V60u10_TAG-src
|
||||
DISTNAME= sge-V60u11_TAG-src
|
||||
|
||||
MAINTAINER= brooks@FreeBSD.org
|
||||
COMMENT= Sun Grid Engine, a batch queueing system
|
||||
@ -46,8 +45,8 @@ SGE_BASE?= sge
|
||||
SGE_ROOT= ${PREFIX}/${SGE_BASE}
|
||||
SGE_ARCH= fbsd-${ARCH}
|
||||
SGE_BUILD_ARCH= FREEBSD_${ARCH:U}
|
||||
SGE_VERSION= 6.0.10
|
||||
SGE_RELEASE= 6.0u10
|
||||
SGE_VERSION= 6.0.11
|
||||
SGE_RELEASE= 6.0u11
|
||||
|
||||
PLIST_SUB+= SGE_ARCH=${SGE_ARCH}
|
||||
PLIST_SUB+= SGE_BASE=${SGE_BASE}
|
||||
@ -236,7 +235,7 @@ build-plist: build
|
||||
${SED} -e 's|${WRKSRC}/../doc|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
|
||||
>> ${PLIST}
|
||||
@echo '@dirrmtry %%SGE_BASE%%' >> ${PLIST}
|
||||
@echo '@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo '@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo "# Do not edit! Auto-generated file." > ${.CURDIR}/Makefile.man
|
||||
@echo "# See build-plist target in Makefile." >> ${.CURDIR}/Makefile.man
|
||||
@echo "#" >> ${.CURDIR}/Makefile.man
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (sge-V60u10_TAG-src.tar.gz) = 52297caf69806d4f0884762fdb02cfc7
|
||||
SHA256 (sge-V60u10_TAG-src.tar.gz) = 80d2fa7eba5e048bc72013a0eba39f90e4d6965be55e4273eba2bc4467dd5e58
|
||||
SIZE (sge-V60u10_TAG-src.tar.gz) = 7501686
|
||||
MD5 (sge-V60u11_TAG-src.tar.gz) = 8ce08ca24abcffad9359013754daaffa
|
||||
SHA256 (sge-V60u11_TAG-src.tar.gz) = 31defa7f480005e672d5b555d8056e43d7d5c020ef7a8f94966ffdeec43a846e
|
||||
SIZE (sge-V60u11_TAG-src.tar.gz) = 7509896
|
||||
|
@ -0,0 +1,28 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemons/execd/execd_signal_queue.c.orig
|
||||
+++ daemons/execd/execd_signal_queue.c
|
||||
@@ -542,11 +542,11 @@
|
||||
** execd.uid==0 && execd.euid==admin_user
|
||||
** => kill does neither send SIGCONT-signals nor return an error
|
||||
*/
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2start_user();
|
||||
#endif
|
||||
if (kill(pid, direct_signal?sig:SIGTTIN)) {
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
if (errno == ESRCH)
|
||||
@@ -554,7 +554,7 @@
|
||||
DEXIT;
|
||||
return -1;
|
||||
}
|
||||
-#if defined(NECSX4) || defined(NECSX5)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
|
@ -51,7 +51,7 @@
|
||||
+ kvm_close(kd);
|
||||
+ return;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (i = 0; i < procs->ki_ngroups; i++) {
|
||||
+ if (procs->ki_groups[i] == add_grp_id) {
|
||||
+ char err_str[256];
|
||||
@ -108,7 +108,7 @@
|
||||
+ DEXIT;
|
||||
+ return -1;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (curr=job_list.next; curr != &job_list; curr=curr->next) {
|
||||
+ job_elem = LNK_DATA(curr, job_elem_t, link);
|
||||
+
|
||||
|
@ -420,10 +420,6 @@
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
|
||||
%%SGE_BASE%%/util/resources/spooling/disable_history.sql
|
||||
%%SGE_BASE%%/util/resources/spooling/history.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sql
|
||||
%%SGE_BASE%%/util/resources/starter_methods/settaskid.sh
|
||||
%%SGE_BASE%%/util/resources/usersets/deadlineusers
|
||||
%%SGE_BASE%%/util/resources/usersets/defaultdepartment
|
||||
@ -433,7 +429,6 @@
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl.cnf
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl_template.cnf
|
||||
%%SGE_BASE%%/util/sge_aliases
|
||||
%%SGE_BASE%%/util/sge_log_tee
|
||||
%%SGE_BASE%%/util/sge_request
|
||||
%%SGE_BASE%%/util/sgeremoterun
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
|
||||
@ -470,6 +465,7 @@
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/spoolinit
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/testsuidroot
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/uidgid
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-ARCo.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-Autoinstall.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
|
||||
@ -785,7 +781,6 @@
|
||||
@dirrm %%SGE_BASE%%/util/sgeCA
|
||||
@dirrm %%SGE_BASE%%/util/resources/usersets
|
||||
@dirrm %%SGE_BASE%%/util/resources/starter_methods
|
||||
@dirrm %%SGE_BASE%%/util/resources/spooling
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas/qstat
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas
|
||||
@dirrm %%SGE_BASE%%/util/resources/pe
|
||||
@ -846,4 +841,4 @@
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrmtry %%SGE_BASE%%
|
||||
@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
|
@ -7,12 +7,11 @@
|
||||
|
||||
PORTNAME= sge
|
||||
PORTVERSION= ${SGE_VERSION}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= sysutils parallel
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/122/
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/142/
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= brooks
|
||||
DISTNAME= sge-V60u10_TAG-src
|
||||
DISTNAME= sge-V60u11_TAG-src
|
||||
|
||||
MAINTAINER= brooks@FreeBSD.org
|
||||
COMMENT= Sun Grid Engine, a batch queueing system
|
||||
@ -46,8 +45,8 @@ SGE_BASE?= sge
|
||||
SGE_ROOT= ${PREFIX}/${SGE_BASE}
|
||||
SGE_ARCH= fbsd-${ARCH}
|
||||
SGE_BUILD_ARCH= FREEBSD_${ARCH:U}
|
||||
SGE_VERSION= 6.0.10
|
||||
SGE_RELEASE= 6.0u10
|
||||
SGE_VERSION= 6.0.11
|
||||
SGE_RELEASE= 6.0u11
|
||||
|
||||
PLIST_SUB+= SGE_ARCH=${SGE_ARCH}
|
||||
PLIST_SUB+= SGE_BASE=${SGE_BASE}
|
||||
@ -236,7 +235,7 @@ build-plist: build
|
||||
${SED} -e 's|${WRKSRC}/../doc|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
|
||||
>> ${PLIST}
|
||||
@echo '@dirrmtry %%SGE_BASE%%' >> ${PLIST}
|
||||
@echo '@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo '@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo "# Do not edit! Auto-generated file." > ${.CURDIR}/Makefile.man
|
||||
@echo "# See build-plist target in Makefile." >> ${.CURDIR}/Makefile.man
|
||||
@echo "#" >> ${.CURDIR}/Makefile.man
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (sge-V60u10_TAG-src.tar.gz) = 52297caf69806d4f0884762fdb02cfc7
|
||||
SHA256 (sge-V60u10_TAG-src.tar.gz) = 80d2fa7eba5e048bc72013a0eba39f90e4d6965be55e4273eba2bc4467dd5e58
|
||||
SIZE (sge-V60u10_TAG-src.tar.gz) = 7501686
|
||||
MD5 (sge-V60u11_TAG-src.tar.gz) = 8ce08ca24abcffad9359013754daaffa
|
||||
SHA256 (sge-V60u11_TAG-src.tar.gz) = 31defa7f480005e672d5b555d8056e43d7d5c020ef7a8f94966ffdeec43a846e
|
||||
SIZE (sge-V60u11_TAG-src.tar.gz) = 7509896
|
||||
|
@ -0,0 +1,28 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemons/execd/execd_signal_queue.c.orig
|
||||
+++ daemons/execd/execd_signal_queue.c
|
||||
@@ -542,11 +542,11 @@
|
||||
** execd.uid==0 && execd.euid==admin_user
|
||||
** => kill does neither send SIGCONT-signals nor return an error
|
||||
*/
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2start_user();
|
||||
#endif
|
||||
if (kill(pid, direct_signal?sig:SIGTTIN)) {
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
if (errno == ESRCH)
|
||||
@@ -554,7 +554,7 @@
|
||||
DEXIT;
|
||||
return -1;
|
||||
}
|
||||
-#if defined(NECSX4) || defined(NECSX5)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
|
@ -51,7 +51,7 @@
|
||||
+ kvm_close(kd);
|
||||
+ return;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (i = 0; i < procs->ki_ngroups; i++) {
|
||||
+ if (procs->ki_groups[i] == add_grp_id) {
|
||||
+ char err_str[256];
|
||||
@ -108,7 +108,7 @@
|
||||
+ DEXIT;
|
||||
+ return -1;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (curr=job_list.next; curr != &job_list; curr=curr->next) {
|
||||
+ job_elem = LNK_DATA(curr, job_elem_t, link);
|
||||
+
|
||||
|
@ -420,10 +420,6 @@
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
|
||||
%%SGE_BASE%%/util/resources/spooling/disable_history.sql
|
||||
%%SGE_BASE%%/util/resources/spooling/history.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sql
|
||||
%%SGE_BASE%%/util/resources/starter_methods/settaskid.sh
|
||||
%%SGE_BASE%%/util/resources/usersets/deadlineusers
|
||||
%%SGE_BASE%%/util/resources/usersets/defaultdepartment
|
||||
@ -433,7 +429,6 @@
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl.cnf
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl_template.cnf
|
||||
%%SGE_BASE%%/util/sge_aliases
|
||||
%%SGE_BASE%%/util/sge_log_tee
|
||||
%%SGE_BASE%%/util/sge_request
|
||||
%%SGE_BASE%%/util/sgeremoterun
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
|
||||
@ -470,6 +465,7 @@
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/spoolinit
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/testsuidroot
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/uidgid
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-ARCo.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-Autoinstall.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
|
||||
@ -785,7 +781,6 @@
|
||||
@dirrm %%SGE_BASE%%/util/sgeCA
|
||||
@dirrm %%SGE_BASE%%/util/resources/usersets
|
||||
@dirrm %%SGE_BASE%%/util/resources/starter_methods
|
||||
@dirrm %%SGE_BASE%%/util/resources/spooling
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas/qstat
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas
|
||||
@dirrm %%SGE_BASE%%/util/resources/pe
|
||||
@ -846,4 +841,4 @@
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrmtry %%SGE_BASE%%
|
||||
@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
|
@ -7,12 +7,11 @@
|
||||
|
||||
PORTNAME= sge
|
||||
PORTVERSION= ${SGE_VERSION}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= sysutils parallel
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/122/
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/142/
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= brooks
|
||||
DISTNAME= sge-V60u10_TAG-src
|
||||
DISTNAME= sge-V60u11_TAG-src
|
||||
|
||||
MAINTAINER= brooks@FreeBSD.org
|
||||
COMMENT= Sun Grid Engine, a batch queueing system
|
||||
@ -46,8 +45,8 @@ SGE_BASE?= sge
|
||||
SGE_ROOT= ${PREFIX}/${SGE_BASE}
|
||||
SGE_ARCH= fbsd-${ARCH}
|
||||
SGE_BUILD_ARCH= FREEBSD_${ARCH:U}
|
||||
SGE_VERSION= 6.0.10
|
||||
SGE_RELEASE= 6.0u10
|
||||
SGE_VERSION= 6.0.11
|
||||
SGE_RELEASE= 6.0u11
|
||||
|
||||
PLIST_SUB+= SGE_ARCH=${SGE_ARCH}
|
||||
PLIST_SUB+= SGE_BASE=${SGE_BASE}
|
||||
@ -236,7 +235,7 @@ build-plist: build
|
||||
${SED} -e 's|${WRKSRC}/../doc|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
|
||||
>> ${PLIST}
|
||||
@echo '@dirrmtry %%SGE_BASE%%' >> ${PLIST}
|
||||
@echo '@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo '@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo "# Do not edit! Auto-generated file." > ${.CURDIR}/Makefile.man
|
||||
@echo "# See build-plist target in Makefile." >> ${.CURDIR}/Makefile.man
|
||||
@echo "#" >> ${.CURDIR}/Makefile.man
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (sge-V60u10_TAG-src.tar.gz) = 52297caf69806d4f0884762fdb02cfc7
|
||||
SHA256 (sge-V60u10_TAG-src.tar.gz) = 80d2fa7eba5e048bc72013a0eba39f90e4d6965be55e4273eba2bc4467dd5e58
|
||||
SIZE (sge-V60u10_TAG-src.tar.gz) = 7501686
|
||||
MD5 (sge-V60u11_TAG-src.tar.gz) = 8ce08ca24abcffad9359013754daaffa
|
||||
SHA256 (sge-V60u11_TAG-src.tar.gz) = 31defa7f480005e672d5b555d8056e43d7d5c020ef7a8f94966ffdeec43a846e
|
||||
SIZE (sge-V60u11_TAG-src.tar.gz) = 7509896
|
||||
|
@ -0,0 +1,28 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemons/execd/execd_signal_queue.c.orig
|
||||
+++ daemons/execd/execd_signal_queue.c
|
||||
@@ -542,11 +542,11 @@
|
||||
** execd.uid==0 && execd.euid==admin_user
|
||||
** => kill does neither send SIGCONT-signals nor return an error
|
||||
*/
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2start_user();
|
||||
#endif
|
||||
if (kill(pid, direct_signal?sig:SIGTTIN)) {
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
if (errno == ESRCH)
|
||||
@@ -554,7 +554,7 @@
|
||||
DEXIT;
|
||||
return -1;
|
||||
}
|
||||
-#if defined(NECSX4) || defined(NECSX5)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
|
@ -51,7 +51,7 @@
|
||||
+ kvm_close(kd);
|
||||
+ return;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (i = 0; i < procs->ki_ngroups; i++) {
|
||||
+ if (procs->ki_groups[i] == add_grp_id) {
|
||||
+ char err_str[256];
|
||||
@ -108,7 +108,7 @@
|
||||
+ DEXIT;
|
||||
+ return -1;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (curr=job_list.next; curr != &job_list; curr=curr->next) {
|
||||
+ job_elem = LNK_DATA(curr, job_elem_t, link);
|
||||
+
|
||||
|
@ -420,10 +420,6 @@
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
|
||||
%%SGE_BASE%%/util/resources/spooling/disable_history.sql
|
||||
%%SGE_BASE%%/util/resources/spooling/history.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sql
|
||||
%%SGE_BASE%%/util/resources/starter_methods/settaskid.sh
|
||||
%%SGE_BASE%%/util/resources/usersets/deadlineusers
|
||||
%%SGE_BASE%%/util/resources/usersets/defaultdepartment
|
||||
@ -433,7 +429,6 @@
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl.cnf
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl_template.cnf
|
||||
%%SGE_BASE%%/util/sge_aliases
|
||||
%%SGE_BASE%%/util/sge_log_tee
|
||||
%%SGE_BASE%%/util/sge_request
|
||||
%%SGE_BASE%%/util/sgeremoterun
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
|
||||
@ -470,6 +465,7 @@
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/spoolinit
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/testsuidroot
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/uidgid
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-ARCo.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-Autoinstall.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
|
||||
@ -785,7 +781,6 @@
|
||||
@dirrm %%SGE_BASE%%/util/sgeCA
|
||||
@dirrm %%SGE_BASE%%/util/resources/usersets
|
||||
@dirrm %%SGE_BASE%%/util/resources/starter_methods
|
||||
@dirrm %%SGE_BASE%%/util/resources/spooling
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas/qstat
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas
|
||||
@dirrm %%SGE_BASE%%/util/resources/pe
|
||||
@ -846,4 +841,4 @@
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrmtry %%SGE_BASE%%
|
||||
@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
|
@ -7,12 +7,11 @@
|
||||
|
||||
PORTNAME= sge
|
||||
PORTVERSION= ${SGE_VERSION}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= sysutils parallel
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/122/
|
||||
MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/142/
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= brooks
|
||||
DISTNAME= sge-V60u10_TAG-src
|
||||
DISTNAME= sge-V60u11_TAG-src
|
||||
|
||||
MAINTAINER= brooks@FreeBSD.org
|
||||
COMMENT= Sun Grid Engine, a batch queueing system
|
||||
@ -46,8 +45,8 @@ SGE_BASE?= sge
|
||||
SGE_ROOT= ${PREFIX}/${SGE_BASE}
|
||||
SGE_ARCH= fbsd-${ARCH}
|
||||
SGE_BUILD_ARCH= FREEBSD_${ARCH:U}
|
||||
SGE_VERSION= 6.0.10
|
||||
SGE_RELEASE= 6.0u10
|
||||
SGE_VERSION= 6.0.11
|
||||
SGE_RELEASE= 6.0u11
|
||||
|
||||
PLIST_SUB+= SGE_ARCH=${SGE_ARCH}
|
||||
PLIST_SUB+= SGE_BASE=${SGE_BASE}
|
||||
@ -236,7 +235,7 @@ build-plist: build
|
||||
${SED} -e 's|${WRKSRC}/../doc|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
|
||||
>> ${PLIST}
|
||||
@echo '@dirrmtry %%SGE_BASE%%' >> ${PLIST}
|
||||
@echo '@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo '@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")' >> ${PLIST}
|
||||
@echo "# Do not edit! Auto-generated file." > ${.CURDIR}/Makefile.man
|
||||
@echo "# See build-plist target in Makefile." >> ${.CURDIR}/Makefile.man
|
||||
@echo "#" >> ${.CURDIR}/Makefile.man
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (sge-V60u10_TAG-src.tar.gz) = 52297caf69806d4f0884762fdb02cfc7
|
||||
SHA256 (sge-V60u10_TAG-src.tar.gz) = 80d2fa7eba5e048bc72013a0eba39f90e4d6965be55e4273eba2bc4467dd5e58
|
||||
SIZE (sge-V60u10_TAG-src.tar.gz) = 7501686
|
||||
MD5 (sge-V60u11_TAG-src.tar.gz) = 8ce08ca24abcffad9359013754daaffa
|
||||
SHA256 (sge-V60u11_TAG-src.tar.gz) = 31defa7f480005e672d5b555d8056e43d7d5c020ef7a8f94966ffdeec43a846e
|
||||
SIZE (sge-V60u11_TAG-src.tar.gz) = 7509896
|
||||
|
@ -0,0 +1,28 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemons/execd/execd_signal_queue.c.orig
|
||||
+++ daemons/execd/execd_signal_queue.c
|
||||
@@ -542,11 +542,11 @@
|
||||
** execd.uid==0 && execd.euid==admin_user
|
||||
** => kill does neither send SIGCONT-signals nor return an error
|
||||
*/
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2start_user();
|
||||
#endif
|
||||
if (kill(pid, direct_signal?sig:SIGTTIN)) {
|
||||
-#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(DARWIN) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
if (errno == ESRCH)
|
||||
@@ -554,7 +554,7 @@
|
||||
DEXIT;
|
||||
return -1;
|
||||
}
|
||||
-#if defined(NECSX4) || defined(NECSX5)
|
||||
+#if defined(NECSX4) || defined(NECSX5) || defined(FREEBSD)
|
||||
sge_switch2admin_user();
|
||||
#endif
|
||||
|
@ -51,7 +51,7 @@
|
||||
+ kvm_close(kd);
|
||||
+ return;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (i = 0; i < procs->ki_ngroups; i++) {
|
||||
+ if (procs->ki_groups[i] == add_grp_id) {
|
||||
+ char err_str[256];
|
||||
@ -108,7 +108,7 @@
|
||||
+ DEXIT;
|
||||
+ return -1;
|
||||
+ }
|
||||
+ for (; nprocs >= 0; nprocs--, procs++) {
|
||||
+ for (; nprocs > 0; nprocs--, procs++) {
|
||||
+ for (curr=job_list.next; curr != &job_list; curr=curr->next) {
|
||||
+ job_elem = LNK_DATA(curr, job_elem_t, link);
|
||||
+
|
||||
|
@ -420,10 +420,6 @@
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
|
||||
%%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
|
||||
%%SGE_BASE%%/util/resources/spooling/disable_history.sql
|
||||
%%SGE_BASE%%/util/resources/spooling/history.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sh
|
||||
%%SGE_BASE%%/util/resources/spooling/init_postgres.sql
|
||||
%%SGE_BASE%%/util/resources/starter_methods/settaskid.sh
|
||||
%%SGE_BASE%%/util/resources/usersets/deadlineusers
|
||||
%%SGE_BASE%%/util/resources/usersets/defaultdepartment
|
||||
@ -433,7 +429,6 @@
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl.cnf
|
||||
%%SGE_BASE%%/util/sgeCA/sge_ssl_template.cnf
|
||||
%%SGE_BASE%%/util/sge_aliases
|
||||
%%SGE_BASE%%/util/sge_log_tee
|
||||
%%SGE_BASE%%/util/sge_request
|
||||
%%SGE_BASE%%/util/sgeremoterun
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
|
||||
@ -470,6 +465,7 @@
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/spoolinit
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/testsuidroot
|
||||
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/uidgid
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-ARCo.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-Autoinstall.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
|
||||
@ -785,7 +781,6 @@
|
||||
@dirrm %%SGE_BASE%%/util/sgeCA
|
||||
@dirrm %%SGE_BASE%%/util/resources/usersets
|
||||
@dirrm %%SGE_BASE%%/util/resources/starter_methods
|
||||
@dirrm %%SGE_BASE%%/util/resources/spooling
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas/qstat
|
||||
@dirrm %%SGE_BASE%%/util/resources/schemas
|
||||
@dirrm %%SGE_BASE%%/util/resources/pe
|
||||
@ -846,4 +841,4 @@
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrmtry %%SGE_BASE%%
|
||||
@unexec test -d %D/%%SGE_BASE%% && ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
@unexec test ! -d %D/%%SGE_BASE%% || ( echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
|
||||
|
Loading…
Reference in New Issue
Block a user