ports/158699: [maintainer update] sysutils/torque
Jason Bacon
jwbacon at tds.net
Thu Jul 7 04:20:07 UTC 2011
>Number: 158699
>Category: ports
>Synopsis: [maintainer update] sysutils/torque
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 07 04:20:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Jason Bacon
>Release: 8.2-RELEASE
>Organization:
Acadix Consulting, LLC
>Environment:
FreeBSD sculpin.jbacon.dyndns.org 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Update to the latest version of torque batch scheduler.
>How-To-Repeat:
Not applicable.
>Fix:
Diff attached.
Patch attached with submission follows:
diff -ruN /usr/ports/sysutils/torque/Makefile torque-devel/Makefile
--- /usr/ports/sysutils/torque/Makefile 2010-12-04 01:33:41.000000000 -0600
+++ torque-devel/Makefile 2011-07-06 23:06:39.000000000 -0500
@@ -6,12 +6,12 @@
#
PORTNAME= torque
-PORTVERSION= 2.4.6
+PORTVERSION= 3.0.2
CATEGORIES= sysutils parallel
MASTER_SITES= http://www.clusterresources.com/downloads/torque/
MAINTAINER= jwbacon at tds.net
-COMMENT= Open source resource manager
+COMMENT= Open source distributed computing resource manager based on PBS
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
@@ -19,11 +19,13 @@
USE_GMAKE= yes
USE_RC_SUBR= pbs_server.sh pbs_sched.sh pbs_mom.sh
SUB_FILES= pkg-message
+USE_PERL5= yes
USE_LDCONFIG= yes
MAN1= qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \
qrls.1 qselect.1 qsig.1 qstat.1 qsub.1 pbs.1 pbsdsh.1 \
- nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1
+ nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1 \
+ qgpumode.1 qgpureset.1
MAN3= rpp.3 tm.3 pbs_alterjob.3 pbs_connect.3 pbs_default.3 \
pbs_deljob.3 pbs_disconnect.3 pbs_geterrmsg.3 pbs_holdjob.3 \
@@ -32,7 +34,8 @@
pbs_rescreserve.3 pbs_rlsjob.3 pbs_runjob.3 pbs_selectjob.3 \
pbs_selstat.3 pbs_sigjob.3 pbs_stagein.3 pbs_statjob.3 \
pbs_statnode.3 pbs_statque.3 pbs_statserver.3 pbs_submit.3 \
- pbs_terminate.3
+ pbs_terminate.3 pbs_checkpointjob.3 pbs_fbserver.3 \
+ pbs_get_server_list.3 pbs_gpumode.3 pbs_gpureset.3
MAN7= pbs_job_attributes.7 pbs_queue_attributes.7 \
pbs_server_attributes.7 pbs_resources_aix4.7 \
diff -ruN /usr/ports/sysutils/torque/distinfo torque-devel/distinfo
--- /usr/ports/sysutils/torque/distinfo 2010-03-14 11:51:25.000000000 -0500
+++ torque-devel/distinfo 2011-07-06 22:56:40.000000000 -0500
@@ -1,3 +1,2 @@
-MD5 (torque-2.4.6.tar.gz) = 970b5d9687dc1c1d74d20a8766c6b1e5
-SHA256 (torque-2.4.6.tar.gz) = 84c6f96bd034dc8766fc28a1e0f641c6c01d3c00712f05adb81c37b2be988975
-SIZE (torque-2.4.6.tar.gz) = 5537109
+SHA256 (torque-3.0.2.tar.gz) = a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1
+SIZE (torque-3.0.2.tar.gz) = 5864771
diff -ruN /usr/ports/sysutils/torque/files/patch-configure torque-devel/files/patch-configure
--- /usr/ports/sysutils/torque/files/patch-configure 2008-03-26 02:30:07.000000000 -0500
+++ torque-devel/files/patch-configure 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
---- configure.orig 2008-03-10 17:19:28.000000000 +0100
-+++ configure 2008-03-18 08:11:50.000000000 +0100
-@@ -20765,8 +20765,8 @@
- else
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- echo "$as_me:$LINENO: checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror" >&5
--echo $ECHO_N "checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic" >&5
-+echo $ECHO_N "checking CFLAGS for gcc -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic... $ECHO_C" >&6
- if test "${ac_cv_cflags_gcc_option__W__Wall__Wno_unused_parameter__Wno_long_long__pedantic__Werror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -20780,7 +20780,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- ac_save_CFLAGS="$CFLAGS"
--for ac_arg in "-pedantic -Werror % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror" "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror %% no, obsolete" #
-+for ac_arg in "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic" "-pedantic % -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic %% no, obsolete" #
- do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
diff -ruN /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c torque-devel/files/patch-src-resmom-freebsd5-mom_mach.c
--- /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c 1969-12-31 18:00:00.000000000 -0600
+++ torque-devel/files/patch-src-resmom-freebsd5-mom_mach.c 2011-06-24 13:52:01.000000000 -0500
@@ -0,0 +1,11 @@
+--- src/resmom/freebsd5/mom_mach.c.orig 2011-06-24 13:50:59.000000000 -0500
++++ src/resmom/freebsd5/mom_mach.c 2011-06-24 13:51:19.000000000 -0500
+@@ -166,7 +166,7 @@
+ extern int ignmem;
+
+ extern int LOGLEVEL;
+-extern void checkret(char **, int);
++// extern void checkret(char **, int);
+
+
+ /*
diff -ruN /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c torque-devel/files/patch-src-resmom-freebsd5-mom_start.c
--- /usr/ports/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c 1969-12-31 18:00:00.000000000 -0600
+++ torque-devel/files/patch-src-resmom-freebsd5-mom_start.c 2011-06-24 13:42:14.000000000 -0500
@@ -0,0 +1,10 @@
+--- src/resmom/freebsd5/mom_start.c.orig 2011-06-24 13:40:31.000000000 -0500
++++ src/resmom/freebsd5/mom_start.c 2011-06-24 13:41:15.000000000 -0500
+@@ -214,6 +214,7 @@
+ task *ptask = 0;
+ int statloc;
+ unsigned int momport = 0;
++ extern unsigned int pbs_rm_port;
+
+ if (LOGLEVEL >= 7)
+ {
diff -ruN /usr/ports/sysutils/torque/files/patch-src-server-node_manager.c torque-devel/files/patch-src-server-node_manager.c
--- /usr/ports/sysutils/torque/files/patch-src-server-node_manager.c 1969-12-31 18:00:00.000000000 -0600
+++ torque-devel/files/patch-src-server-node_manager.c 2011-06-24 13:28:22.000000000 -0500
@@ -0,0 +1,10 @@
+--- src/server/node_manager.c.orig 2011-06-24 13:21:21.000000000 -0500
++++ src/server/node_manager.c 2011-06-24 13:21:47.000000000 -0500
+@@ -88,6 +88,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <assert.h>
diff -ruN /usr/ports/sysutils/torque/files/patch-src-server-pbsd_main.c torque-devel/files/patch-src-server-pbsd_main.c
--- /usr/ports/sysutils/torque/files/patch-src-server-pbsd_main.c 1969-12-31 18:00:00.000000000 -0600
+++ torque-devel/files/patch-src-server-pbsd_main.c 2011-06-24 13:27:14.000000000 -0500
@@ -0,0 +1,10 @@
+--- src/server/pbsd_main.c.orig 2011-06-24 13:24:45.000000000 -0500
++++ src/server/pbsd_main.c 2011-06-24 13:25:15.000000000 -0500
+@@ -94,6 +94,7 @@
+ #include <sys/lock.h>
+ #endif /* PLOCK_DAEMONS */
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #include "pbs_ifl.h"
+ #include <assert.h>
+ #include <ctype.h>
diff -ruN /usr/ports/sysutils/torque/files/pkg-message.in torque-devel/files/pkg-message.in
--- /usr/ports/sysutils/torque/files/pkg-message.in 2010-03-14 11:51:25.000000000 -0500
+++ torque-devel/files/pkg-message.in 2011-07-06 22:55:28.000000000 -0500
@@ -3,7 +3,7 @@
%%PREFIX%%/share/examples/torque/var/spool/torque
-On all machines, both server and computing nodes:
+On all machines, both server and compute nodes:
1. Run
@@ -15,7 +15,7 @@
/var/spool/torque/server_name
******************************************************************************
-On computing nodes:
+On compute nodes:
1. Put '$pbsserver ip.address.of.server' into
@@ -26,12 +26,12 @@
pbs_mom_enable="YES"
This may include the server if you allow it to be used
- as a computing node as well.
+ as a compute node as well.
******************************************************************************
On the server:
- 1. Put hostnames of computing nodes, one per line, into
+ 1. Put hostnames of compute nodes, one per line, into
/var/spool/torque/server_priv/nodes
@@ -50,9 +50,9 @@
The recommended <admin> user is root.
******************************************************************************
-After installation is complete on the server and computing nodes:
+After installation is complete on the server and compute nodes:
- 1. Start node services on all computing nodes with:
+ 1. Start node services on all compute nodes with:
%%PREFIX%%/etc/rc.d/pbs_mom restart
diff -ruN /usr/ports/sysutils/torque/pkg-plist torque-devel/pkg-plist
--- /usr/ports/sysutils/torque/pkg-plist 2010-03-14 11:51:25.000000000 -0500
+++ torque-devel/pkg-plist 2011-07-06 09:01:01.000000000 -0500
@@ -13,6 +13,8 @@
bin/qdel
bin/qdisable
bin/qenable
+bin/qgpumode
+bin/qgpureset
bin/qhold
bin/qmgr
bin/qmove
@@ -50,55 +52,60 @@
sbin/qnoded
sbin/qschedd
sbin/qserverd
-%%EXAMPLESDIR%%/torque.setup
-%%EXAMPLESDIR%%/var/spool/torque/pbs_environment
-%%EXAMPLESDIR%%/var/spool/torque/sched_priv/dedicated_time
-%%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays
-%%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group
-%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config
-%%EXAMPLESDIR%%/var/spool/torque/server_name
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/spool
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint
- at dirrm %%EXAMPLESDIR%%/var/spool/torque/aux
- at dirrm %%EXAMPLESDIR%%/var/spool/torque
- at dirrm %%EXAMPLESDIR%%/var/spool
- at dirrm %%EXAMPLESDIR%%/var
- at dirrm %%EXAMPLESDIR%%
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/undelivered
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/spool
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_logs
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_logs
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_logs
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/checkpoint
- at exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/aux
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/torque.setup
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/pbs_environment
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/dedicated_time
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_name
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_priv/nodes
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/job_logs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/aux
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/undelivered
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/spool
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_logs
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_logs
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_logs
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/job_logs
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/checkpoint
+%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/aux
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list