Date: Tue, 16 Nov 1999 11:14:41 +1100 (EST) From: Tony Maher <Tony.Maher@eBioinformatics.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14915: Update port: net/generic-nqs Message-ID: <199911160014.LAA04701@shad.internal.en-bio>
next in thread | raw e-mail | index | archive | help
>Number: 14915 >Category: ports >Synopsis: Update port: net/generic-nqs >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 15 16:20:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Tony Maher >Release: FreeBSD 3.3-STABLE i386 >Organization: eBioinformatics >Environment: >Description: Update of generic nqs to version 3.50.6 This version should be Y2K compliant. GNQS has moved from its previous URL. Haven't tested on a current 4.0 box (dont have one at the moment). Also fixed up the port so that it now cleans up /var/spool/nqs (default but will find actual installed location) which it previously left behind. This is good/bad as the configuration stuff is contained in here, so make sure you make a snapfile (from qmgr) before upgrading. Now strips the binaries. Cleaned up man page installation. Now ignore bash and ksh (if installed) as they dont work with the gnqs configure/install routines. >How-To-Repeat: >Fix: diff -ruN generic-nqs.orig/Makefile generic-nqs/Makefile --- generic-nqs.orig/Makefile Tue Aug 31 00:22:46 1999 +++ generic-nqs/Makefile Tue Nov 16 08:21:44 1999 @@ -1,21 +1,25 @@ # New ports collection makefile for: nqs (Generic NQS) -# Version required: 3.50.4 -# Date created: 01 May 1998 -# Whom: tonym +# Version required: 3.50.6 +# Date created: 07 November 1999 +# Whom: tony.maher@ebioinformatics.com # # $FreeBSD: ports/net/generic-nqs/Makefile,v 1.3 1999/08/30 14:22:46 peter Exp $ # +# View this file with tabstop=4 +# + +DISTNAME= Generic-NQS-3.50.6 +CATEGORIES= net +MASTER_SITES= http://ftp.gnqs.org/pub/gnqs/v3.50/ -DISTNAME= Generic-NQS-3.50.4 -CATEGORIES= net -MASTER_SITES= ftp://ftp.shef.ac.uk/pub/uni/projects/nqs/v3.5x/ +MAINTAINER= tony.maher@ebioinformatics.com -MAINTAINER= tonym@angis.org.au +Y2K= http://www.gnqs.org/Year2000.htm IS_INTERACTIVE= yes -NO_PACKAGE= have to build on site due to the descriptors created in\ - /var/spool/nqs (default location) and the configuration\ - procedure +NO_PACKAGE= have to build on site due to the descriptors created in\ + /var/spool/nqs (default location) and the configuration\ + procedure # # NQS gets configured, built and installed via its own SETUP script @@ -30,12 +34,12 @@ # from there on in # -HOSTNAME= `uname -n` -RELEASE= `uname -r | cut -d'-' -f 1` -HARDWARE= `uname -m` +HOSTNAME= `uname -n` +RELEASE= `uname -r | cut -d'-' -f 1` +HARDWARE= `uname -m` -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= SETUP +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= SETUP CONFIGURE_ARGS= --fbconfig # @@ -46,14 +50,15 @@ STARTUP= nqs.sh TEMPLATE= i386-unknown-freebsd2.2.6 +# # We rename TEMPLATE (which is known to work for 2.2.6 up to and including -# 4.0-CURRENT as of Jan 26) to the release number of this machine. +# 4.0 current Mar 07) to the release number of this machine. # Maybe this is a mistake. NQS will auto generate a file from a similar # Platorm description file, but you would have to run make twice # in this case. # -PLATFORMDIR= ${WRKSRC}/SETUPDir/Platforms +PLATFORMDIR=${WRKSRC}/SETUPDir/Platforms PLATFORM= ${HARDWARE}-unknown-freebsd${RELEASE} # @@ -65,16 +70,17 @@ # CONFIGFILE= ${WRKSRC}/Build-Tree/${PLATFORM}/${HOSTNAME}/SETUP/General.h +MANDIR= ${WRKSRC}/Source-Tree/man/man1/all-systems RCDIR= ${PREFIX}/etc/rc.d SYSINST= ${SCRIPTDIR}/create-nqs-rc.sh SYSLOGFIX= ${SCRIPTDIR}/syslog-add.sh +PLISTFIX= ${SCRIPTDIR}/fix-PLIST.mktmp.sh CREATEQ= ${SCRIPTDIR}/create-example-batch-queues -MAN1= nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\ - qacct.1 qalter.1 qcat.1 qcmplx.1 qdel.1 qdev.1\ - qhold.1 qjob.1 qlimit.1 qmsg.1 qpr.1\ - qresume.1 qrls.1 qstat.1 qstatc.1 qsub.1 qsuspend.1 - +MAN1= nmapmgr.1 nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\ + qacct.1 qalter.1 qcat.1 qcmplx.1 qdel.1 qdev.1\ + qhold.1 qjob.1 qlimit.1 qmgr.1m qmsg.1 qpr.1\ + qresume.1 qrls.1 qstat.1 qstatc.1 qsub.1 qsuspend.1 # # Thus ends the definitions # @@ -84,22 +90,42 @@ # We need a dummy top level Makefile as NQS will put its Makefile # in Build-Tree/${PLATFORM}/${HOSTNAME} # Need to have the SETUP scripts executable. +# Remove the dross *.man files qcat.man and list_nqs_queues.man +# Rename man page to fit BSD extensions # pre-configure: @ ${CP} ${FILESDIR}/${TEMPLATE} ${PLATFORMDIR}/${PLATFORM}; \ ${CP} ${FILESDIR}/${DUMMYMAKE} ${WRKSRC}; \ ${CHMOD} 555 ${WRKDIR}/${DISTNAME}/Source-Tree/SETUP/all-systems/* + ${RM} ${MANDIR}/*.man ; \ + ${MV} ${MANDIR}/nmapmgr.1m ${MANDIR}/nmapmgr.1 # # Install system boot startup file but need to find out exactly where # the nqs stuff was installed as this is set in nqs' own install script -# Modify syslog.conf to hqndle nqs +# Modify syslog.conf to handle nqs # post-install: - @ ${SH} ${SYSINST} ${CONFIGFILE} ${FILESDIR}/${STARTUP} ${RCDIR}/${STARTUP}; \ - ${SH} ${SYSLOGFIX} ;\ + @ strip ${PREFIX}/sbin/loaddaemon ${PREFIX}/sbin/finish_autoinst \ + ${PREFIX}/sbin/lpserver ${PREFIX}/sbin/netclient \ + ${PREFIX}/sbin/netdaemon ${PREFIX}/sbin/netserver \ + ${PREFIX}/sbin/nqsdaemon ${PREFIX}/sbin/nqsexejob \ + ${PREFIX}/sbin/nqsmkdirs ${PREFIX}/sbin/nqsmkfile \ + ${PREFIX}/sbin/nqsmktrans ${PREFIX}/sbin/nqssetargv \ + ${PREFIX}/sbin/pipeclient ${PREFIX}/sbin/shlexefai; \ + strip ${PREFIX}/bin/nmapmgr ${PREFIX}/bin/qacct \ + ${PREFIX}/bin/qalter ${PREFIX}/bin/qcat \ + ${PREFIX}/bin/qdel ${PREFIX}/bin/qdev \ + ${PREFIX}/bin/qhold ${PREFIX}/bin/qlimit \ + ${PREFIX}/bin/qmgr ${PREFIX}/bin/qmsg \ + ${PREFIX}/bin/qpr ${PREFIX}/bin/qrls \ + ${PREFIX}/bin/qstat ${PREFIX}/bin/qsub \ + ${PREFIX}/bin/qsuspend; \ + ${SYSINST} ${CONFIGFILE} ${FILESDIR}/${STARTUP} ${RCDIR}/${STARTUP}; \ + ${SYSLOGFIX}; \ + ${PLISTFIX} ${CONFIGFILE} ${WRKDIR}; \ ${ECHO} "You may want run ${CREATEQ} to actually make some queues"; \ ${ECHO} "" diff -ruN generic-nqs.orig/files/i386-unknown-freebsd2.2.6 generic-nqs/files/i386-unknown-freebsd2.2.6 --- generic-nqs.orig/files/i386-unknown-freebsd2.2.6 Mon Jun 28 17:07:26 1999 +++ generic-nqs/files/i386-unknown-freebsd2.2.6 Sat Nov 13 19:09:50 1999 @@ -3,7 +3,7 @@ # PLATFORM DESCRIPTION FILE C_COMPILER "cc" -C_COMPILER_FLAGS_OPTIMISE "${CFLAGS}" +C_COMPILER_FLAGS_OPTIMISE "-O2" C_COMPILER_FLAGS_DEBUG "" C_COMPILER_FLAGS_COMMON "" C_COMPILER_FLAGS_INCLUDE "" diff -ruN generic-nqs.orig/files/md5 generic-nqs/files/md5 --- generic-nqs.orig/files/md5 Mon Jun 28 17:07:26 1999 +++ generic-nqs/files/md5 Sat Nov 13 19:17:22 1999 @@ -1 +1 @@ -MD5 (Generic-NQS-3.50.4.tar.gz) = 2c0bd7a28b976674e71530aa79fa47d1 +MD5 (Generic-NQS-3.50.6.tar.gz) = 61c14b782f8a487221bdd21a3b225685 diff -ruN generic-nqs.orig/patches/patch-ab generic-nqs/patches/patch-ab --- generic-nqs.orig/patches/patch-ab Mon Jun 28 17:07:27 1999 +++ generic-nqs/patches/patch-ab Sun Nov 14 11:17:00 1999 @@ -1,21 +1,20 @@ ---- Source-Tree/nqsdaemon/all-systems/nqs_reqser.c.orig Wed Sep 11 05:32:26 1996 -+++ Source-Tree/nqsdaemon/all-systems/nqs_reqser.c Sat May 2 11:09:26 1998 -@@ -1746,7 +1746,7 @@ - char *cp; - - environment_file = fopen("/etc/environment", "r"); -- if ( environment_file != (FILE *) 0 ) { -+ if ( environment_file > (FILE *) 0 ) { - while ( (fgets (env_line, sizeof(env_line), environment_file ) - != (char *) 0) ) { - if (env_line[0] == '#') continue; -@@ -1758,8 +1758,8 @@ - return (the_path); - } - } -+ fclose ( environment_file ); - } -- fclose ( environment_file ); - /* - * The file was not found, or the path was not in it. - */ +--- SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig Sat Nov 13 19:32:02 1999 ++++ SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh Sat Nov 13 19:32:36 1999 +@@ -72,7 +72,7 @@ + F_ECHO_LN "egcs" + + F_DEFINE_STRING GPORT_CC_FLAGS_DEBUG "-Wpointer-arith -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations" +- F_DEFINE_STRING GPORT_CC_FLAGS_OPTIMISE "-O6 -fno-strength-reduce" ++ F_DEFINE_STRING GPORT_CC_FLAGS_OPTIMISE "-O2" + F_DEFINE_STRING GPORT_CC_FLAGS_COMMON "-Wall" + elif [ "$GPORT_HAS_GCC" = 1 ]; then + F_TEST_TYPE BLANK +@@ -80,7 +80,7 @@ + F_ECHO_LN "gcc" + + F_DEFINE_STRING GPORT_CC_FLAGS_DEBUG "-Wpointer-arith -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations" +- F_DEFINE_STRING GPORT_CC_FLAGS_OPTIMISE "-O6 -fno-strength-reduce" ++ F_DEFINE_STRING GPORT_CC_FLAGS_OPTIMISE "-O2" + F_DEFINE_STRING GPORT_CC_FLAGS_COMMON "-Wall" + fi + } diff -ruN generic-nqs.orig/patches/patch-ad generic-nqs/patches/patch-ad --- generic-nqs.orig/patches/patch-ad Thu Jan 1 10:00:00 1970 +++ generic-nqs/patches/patch-ad Sun Nov 14 11:57:47 1999 @@ -0,0 +1,31 @@ +--- Source-Tree/SETUP/all-systems/General.inst.orig Sun Nov 14 11:52:32 1999 ++++ Source-Tree/SETUP/all-systems/General.inst Sun Nov 14 11:56:57 1999 +@@ -46,17 +46,21 @@ + Boolean " Do you want nmapmgr to automatically allocate a machine ID?" nmapmgr_allocate "y" + echo + if [ "$nmapmgr_allocate" = "y" ]; then +- echo " Okay. I need to know what the fully-qualified hostname of this machine" +- echo " is. For example, my workstation is called 'lanfear'. It's fully-" +- echo " qualified hostname is 'lanfear.shef.ac.uk'." +- echo +- String " What is your machine's full name?" nmapmgr_fqdn "" ++ fqdn=`hostname` ++ short=`hostname | cut -d. -f 1` ++ if [ $fqdn = $short ]; then ++ echo " Okay. I need to know what the fully-qualified hostname of this" ++ echo " machine is. For example, my workstation is called 'zen'." ++ echo " It's fully-qualified hostname is 'zen.my.domain'." ++ echo ++ String " What is your machine's full name?" fqdn "" ++ fi + echo + echo " Okay. I will now run nmapmgr; when the nmapmgr prompt appears, please" + echo " type in the commands below." + echo +- echo " add host `hostname`" +- echo " add alias $nmapmgr_fqdn `hostname`" ++ echo " add host $fqdn" ++ echo " add alias $short $fqdn" + echo " list" + echo " exit" + else diff -ruN generic-nqs.orig/patches/patch-ae generic-nqs/patches/patch-ae --- generic-nqs.orig/patches/patch-ae Thu Jan 1 10:00:00 1970 +++ generic-nqs/patches/patch-ae Sun Nov 14 21:19:54 1999 @@ -0,0 +1,19 @@ +--- SETUP.orig Sun Nov 14 21:18:57 1999 ++++ SETUP Sun Nov 14 21:19:31 1999 +@@ -1,16 +1,6 @@ + #!/bin/sh + +-our_path="`echo $PATH | tr ':' ' '`" + our_shell="/bin/sh" +- +-for x in ksh bash ; do +- for y in $our_path ; do +- if [ -f "$y/$x" ]; then +- our_shell="$y/$x" +- fi +- done +-done +- + export our_shell + SETUP_CC="$CC" + export SETUP_CC diff -ruN generic-nqs.orig/pkg/DESCR generic-nqs/pkg/DESCR --- generic-nqs.orig/pkg/DESCR Mon Jun 28 17:07:28 1999 +++ generic-nqs/pkg/DESCR Tue Nov 16 08:56:38 1999 @@ -1,7 +1,7 @@ NQS (or more properly Generic NQS) is a Network Queuing System available for multiple platforms. -It provides for configurable limits on jobs on a per queue basis -as well as for the total queue system. -As it's name suggests it allows jobs to be submitted on one machine and +It provides for configurable limits on jobs on a per queue basis as well +as for the total queue system. +As its name suggests it allows jobs to be submitted on one machine and transferred to run on another machine. It can be configured so jobs are automatically transferred to the least loaded machine in the cluster. diff -ruN generic-nqs.orig/pkg/PLIST generic-nqs/pkg/PLIST --- generic-nqs.orig/pkg/PLIST Mon Jun 28 17:07:28 1999 +++ generic-nqs/pkg/PLIST Sat Nov 13 19:09:50 1999 @@ -26,8 +26,15 @@ sbin/nqsmktrans sbin/pipeclient sbin/shlexefai +sbin/OLDloaddaemon +sbin/OLDnetdaemon +sbin/OLDnetserver +sbin/OLDnqsdaemon +sbin/OLDnqsmkdirs +sbin/OLDnqsmktrans lib/nqs/GNQS.VERSION lib/nqs/General.conf.def lib/nqs/qmgr.hlp lib/nqs/nmap/machines @unexec rm -rf %D/lib/nqs +@unexec rm -rf XXXX diff -ruN generic-nqs.orig/scripts/create-nqs-rc.sh generic-nqs/scripts/create-nqs-rc.sh --- generic-nqs.orig/scripts/create-nqs-rc.sh Mon Jun 28 17:07:30 1999 +++ generic-nqs/scripts/create-nqs-rc.sh Sat Nov 13 19:09:50 1999 @@ -1,5 +1,6 @@ #!/bin/sh +PATH="/usr/bin:/bin"; export PATH me=`basename $0` if [ $# -lt 3 ]; then @@ -11,5 +12,7 @@ sed -e"s#XXXX#$root#" $2 > $3 chmod 755 $3 echo "" -echo "created $3 startup file" +echo "Created $3 boot startup file." +echo " - it will startup the 2 NQS daemons" +echo " - run this script manually now before attempting to create queues" echo "" diff -ruN generic-nqs.orig/scripts/fix-PLIST.mktmp.sh generic-nqs/scripts/fix-PLIST.mktmp.sh --- generic-nqs.orig/scripts/fix-PLIST.mktmp.sh Thu Jan 1 10:00:00 1970 +++ generic-nqs/scripts/fix-PLIST.mktmp.sh Sun Nov 14 18:28:41 1999 @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Where did they actually store the spool area? +# Check the NQS config file! +# +# Fortunately the ports system creates a temporary packing list that we can +# modify post-install before the install gets officially recorded. +# + +PATH="/usr/bin:/bin"; export PATH + +me=`basename $0` + +if [ $# -lt 2 ]; then + echo usage: $me configfile workdir >&2 + exit 1 +fi + +root=`grep NQS_ROOTPRIV $1 | cut -f2 -d\"` +mv $2/.PLIST.mktmp $2/.PLIST.mktmp.orig +sed -e"s#XXXX#$root#" $2/.PLIST.mktmp.orig > $2/.PLIST.mktmp diff -ruN generic-nqs.orig/scripts/syslog-add.sh generic-nqs/scripts/syslog-add.sh --- generic-nqs.orig/scripts/syslog-add.sh Mon Jun 28 17:07:31 1999 +++ generic-nqs/scripts/syslog-add.sh Sun Nov 14 18:29:43 1999 @@ -1,10 +1,12 @@ #!/bin/sh +PATH="/usr/bin:/bin"; export PATH + if grep -q nqs /etc/syslog.conf then : else echo "local0.* /var/log/nqs" >> /etc/syslog.conf echo "" - echo "/etc/syslog modified to support nqs" + echo "/etc/syslog.conf modified to support nqs (using local0.*)" echo "" fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199911160014.LAA04701>