Attachment 131039 Details for Bug 175063 – torque.diff

[patch] torque.diff

torque.diff (text/plain; charset=us-ascii), 11.57 KB, created by Guido Falsi on 2013-03-26 11:29:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2013-03-26 11:29:10 UTC

Size: 11.57 KB

patch

obsolete

>Index: chinese/qterm/Makefile
>===================================================================
>--- chinese/qterm/Makefile	(revision 315282)
>+++ chinese/qterm/Makefile	(working copy)
>@@ -19,6 +19,8 @@
> MAKE_JOBS_SAFE=	yes
> INSTALLS_ICONS=	yes
> 
>+CONFLICTS_INSTALL=	torque-[0-9]*
>+
> OPTIONS_DEFINE=	DBUS OPENSSL PHONON QTSCRIPT KDE
> OPTIONS_DEFAULT=	DBUS OPENSSL PHONON QTSCRIPT
> 
>Index: games/qstat/Makefile
>===================================================================
>--- games/qstat/Makefile	(revision 315282)
>+++ games/qstat/Makefile	(working copy)
>@@ -11,6 +11,8 @@
> 
> GNU_CONFIGURE=	yes
> 
>+CONFLICTS_INSTALL=	torque-[0-9]*
>+
> OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
>Index: sysutils/torque/Makefile
>===================================================================
>--- sysutils/torque/Makefile	(revision 315282)
>+++ sysutils/torque/Makefile	(working copy)
>@@ -1,27 +1,26 @@
>-# New ports collection makefile for:	torque
>-# Date created:			20 Jul 2006
>-# Whom:				trasz
>-#
>+# Created by: trasz
> # $FreeBSD$
>-#
> 
> PORTNAME=	torque
>-PORTVERSION=	3.0.2
>+PORTVERSION=	3.0.6
> CATEGORIES=	sysutils parallel
>-MASTER_SITES=	http://www.clusterresources.com/downloads/torque/
>+MASTER_SITES=	 http://www.adaptivecomputing.com/resources/downloads/torque/
> 
> MAINTAINER=	jwbacon@tds.net
> COMMENT=	Open source distributed computing resource manager based on PBS
> 
> USE_AUTOTOOLS=	libtool
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-rcp=scp
>+CONFIGURE_ARGS=	--enable-syslog \
>+		--disable-spool
> USE_GMAKE=	yes
> USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
>-SUB_FILES=	pkg-message
>+SUB_FILES=	pkg-message torque-config
> USE_PERL5=	yes
> USE_LDCONFIG=	yes
> 
>+CONFLICTS_INSTALL=	qstat-[0-9]* qterm-[0-9]*
>+
> 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 \
>@@ -56,8 +55,16 @@
> MLINKS=		pbs_sched_cc.8 pbs_sched.8 \
> 		pbs_resources_freebsd.7 pbs_resources.7
> 
>+post-patch:
>+	${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup
>+
> post-install:
>+	${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${PREFIX}/bin
>+.if defined(NOPORTEXAMPLES)
>+	${RM} -rf ${EXAMPLESDIR}
>+.else
> 	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${EXAMPLESDIR}
>+.endif
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>Index: sysutils/torque/distinfo
>===================================================================
>--- sysutils/torque/distinfo	(revision 315282)
>+++ sysutils/torque/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (torque-3.0.2.tar.gz) = a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1
>-SIZE (torque-3.0.2.tar.gz) = 5864771
>+SHA256 (torque-3.0.6.tar.gz) = f76736d780fc0f8ac73c54d586b4d15704e37cf191649b748b07f660186642b3
>+SIZE (torque-3.0.6.tar.gz) = 5888678
>Index: sysutils/torque/files/patch-configure
>===================================================================
>--- sysutils/torque/files/patch-configure	(revision 315282)
>+++ sysutils/torque/files/patch-configure	(working copy)
>@@ -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.  */
>Index: sysutils/torque/files/patch-src-server-req_getcred.c
>===================================================================
>--- sysutils/torque/files/patch-src-server-req_getcred.c	(revision 0)
>+++ sysutils/torque/files/patch-src-server-req_getcred.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/server/req_getcred.c.orig	2012-07-15 11:42:07.000000000 -0500
>++++ src/server/req_getcred.c	2012-07-15 11:48:39.000000000 -0500
>+@@ -97,6 +97,7 @@
>+ #include <ctype.h>
>+ #include <netdb.h>
>+ #include <signal.h>
>++#include <netinet/in.h>
>+ #include "libpbs.h"
>+ #include "log.h"
>+ #include "server_limits.h"
>Index: sysutils/torque/files/pbs_mom.in
>===================================================================
>--- sysutils/torque/files/pbs_mom.in	(revision 315282)
>+++ sysutils/torque/files/pbs_mom.in	(working copy)
>@@ -3,7 +3,9 @@
> # $FreeBSD$
> #
> # PROVIDE: pbs_mom
>-# REQUIRE: 
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
> # to enable this service:
>@@ -14,7 +16,7 @@
> 
> . /etc/rc.subr
> 
>-name="pbs_mom"
>+name=pbs_mom
> rcvar=pbs_mom_enable
> 
> pidfile=/var/spool/torque/mom_priv/mom.lock
>@@ -22,6 +24,6 @@
> 
> load_rc_config $name
> 
>-: ${pbs_mom_enable="NO"}
>+: ${pbs_mom_enable:="NO"}
> 
> run_rc_command "$1"
>Index: sysutils/torque/files/pbs_sched.in
>===================================================================
>--- sysutils/torque/files/pbs_sched.in	(revision 315282)
>+++ sysutils/torque/files/pbs_sched.in	(working copy)
>@@ -4,6 +4,8 @@
> #
> # PROVIDE: pbs_sched
> # REQUIRE: pbs_server
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
> # to enable this service:
>@@ -14,7 +16,7 @@
> 
> . /etc/rc.subr
> 
>-name="pbs_sched"
>+name=pbs_sched
> rcvar=pbs_sched_enable
> 
> pidfile=/var/spool/torque/sched_priv/sched.lock
>@@ -22,6 +24,6 @@
> 
> load_rc_config $name
> 
>-: ${pbs_sched_enable="NO"}
>+: ${pbs_sched_enable:="NO"}
> 
> run_rc_command "$1"
>Index: sysutils/torque/files/pbs_server.in
>===================================================================
>--- sysutils/torque/files/pbs_server.in	(revision 315282)
>+++ sysutils/torque/files/pbs_server.in	(working copy)
>@@ -3,7 +3,9 @@
> # $FreeBSD$
> #
> # PROVIDE: pbs_server
>-# REQUIRE: 
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
> # to enable this service:
>@@ -14,7 +16,7 @@
> 
> . /etc/rc.subr
> 
>-name="pbs_server"
>+name=pbs_server
> rcvar=pbs_server_enable
> 
> pidfile=/var/spool/torque/server_priv/server.lock
>@@ -22,6 +24,6 @@
> 
> load_rc_config $name
> 
>-: ${pbs_server_enable="NO"}
>+: ${pbs_server_enable:="NO"}
> 
> run_rc_command "$1"
>Index: sysutils/torque/files/pkg-message.in
>===================================================================
>--- sysutils/torque/files/pkg-message.in	(revision 315282)
>+++ sysutils/torque/files/pkg-message.in	(working copy)
>@@ -1,69 +1,16 @@
> ******************************************************************************
>-You can find an example configuration in
>+On the server, run:
> 
>-	%%PREFIX%%/share/examples/torque/var/spool/torque
>+	torque-config head
> 
>-On all machines, both server and compute nodes:
>-
>-	1. Run
>-
>-		cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque \
>-			/var/spool
>-
>-	2. Put the hostname of the server into
>-
>-		/var/spool/torque/server_name
>-
> ******************************************************************************
>-On compute nodes:
>+On compute nodes, run:
> 
>-	1. Put '$pbsserver ip.address.of.server' into
>-	
>-		/var/spool/torque/mom_priv/config
>+	torque-config compute
> 
>-	2. Add the following line to /etc/rc.conf:
>-
>-		pbs_mom_enable="YES"
>-
>-	This may include the server if you allow it to be used
>-	as a compute node as well.
>-
> ******************************************************************************
>-On the server:
>-
>-	1. Put hostnames of compute nodes, one per line, into
>-
>-		/var/spool/torque/server_priv/nodes
>-
>-	Additional options can be specified for each entry.  Consult
>-	the torque documentation for details.
>-
>-	2. Add the following lines to /etc/rc.conf:
>-
>-		pbs_server_enable="YES"
>-		pbs_sched_enable="YES"
>-
>-	3. To configure queues, execute
>-
>-		%%PREFIX%%/share/examples/torque/torque.setup <admin>
>-
>-	The recommended <admin> user is root.
>-
>-******************************************************************************
>-After installation is complete on the server and compute nodes:
>-
>-	1. Start node services on all compute nodes with:
>-
>-		%%PREFIX%%/etc/rc.d/pbs_mom restart
>-
>-	2. Start scheduler services on the server with:
>-
>-		%%PREFIX%%/etc/rc.d/pbs_server restart
>-		%%PREFIX%%/etc/rc.d/pbs_sched restart
>-
>-******************************************************************************
> For further information, see
> 
>-	http://www.clusterresources.com/torquedocs21/
>+	http://www.adaptivecomputing.com/products/open-source/torque/
> 
> ******************************************************************************
>Index: sysutils/torque/files/torque-config.in
>===================================================================
>--- sysutils/torque/files/torque-config.in	(revision 0)
>+++ sysutils/torque/files/torque-config.in	(working copy)
>@@ -0,0 +1,63 @@
>+#!/bin/sh -e
>+
>+usage()
>+{
>+    printf "Usage: $0 head|compute\n"
>+    exit 1
>+}
>+
>+if [ $# != 1 ]; then
>+    usage
>+fi
>+node_type=$1
>+
>+if [ $node_type != 'head' ] && [ $node_type != 'compute' ]; then
>+    usage
>+fi
>+
>+spool_root=/var/spool
>+
>+if [ -e $spool_root/torque ]; then
>+    printf "$spool_root/torque already exists.  Aborting...\n"
>+    exit 1
>+fi
>+
>+cp -Rp %%PREFIX%%/share/examples/torque/var/spool/torque $spool_root
>+for dir in checkpoint spool undelivered; do
>+    chmod 1777 $spool_root/torque/$dir
>+done
>+
>+cat << EOM
>+===========================================================================
>+Enter the hostname of the torque server.  This should be resolved by
>+/etc/hosts on all nodes.  A short hostname is preferred.
>+===========================================================================
>+EOM
>+read server_hostname
>+echo $server_hostname > $spool_root/torque/server_name
>+
>+case $node_type in
>+'head')
>+    vi $spool_root/torque/server_priv/nodes
>+    if ! fgrep -q 'pbs_server_enable="YES"' /etc/rc.conf; then
>+	printf 'pbs_server_enable="YES"\n' >> /etc/rc.conf
>+    fi
>+    if ! fgrep -q 'pbs_sched_enable="YES"' /etc/rc.conf; then
>+	printf 'pbs_sched_enable="YES"\n' >> /etc/rc.conf
>+    fi
>+    %%PREFIX%%/share/examples/torque/torque.setup root
>+    %%PREFIX%%/etc/rc.d/pbs_server restart
>+    %%PREFIX%%/etc/rc.d/pbs_sched restart
>+    ;;
>+'compute')
>+    printf "Torque server IP address? "
>+    read server_ip
>+    printf '$pbsserver %s /var/spool/torque/mom_priv/config' $server_ip \
>+	> $spool_root/torque/mom_priv/config
>+    if ! fgrep -q 'pbs_mom_enable="YES"' /etc/rc.conf; then
>+	printf 'pbs_mom_enable="YES"\n' >> /etc/rc.conf
>+    fi
>+    %%PREFIX%%/etc/rc.d/pbs_mom restart
>+    ;;
>+esac
>+
>Index: sysutils/torque/pkg-plist
>===================================================================
>--- sysutils/torque/pkg-plist	(revision 315282)
>+++ sysutils/torque/pkg-plist	(working copy)
>@@ -31,6 +31,7 @@
> bin/qstop
> bin/qsub
> bin/qterm
>+bin/torque-config
> bin/tracejob
> include/pbs_error.h
> include/pbs_error_db.h

Actions: View | Diff

Attachments on bug 175063: 131038 | 131039 | 131040 | 131041 | 131042