From 098bdfe696a5931356c7386d07e727648d402030 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 9 Dec 2010 23:58:26 +0100 Subject: [PATCH 01/33] - New upstream 3.0.0. Drop patches torque-cond-touch.patch and torque-start-start.patch since both upstream now. --- .gitignore | 1 + sources | 2 +- torque-cond-touch.patch | 45 ------------------------- torque-start-start.patch | 71 ---------------------------------------- torque.spec | 14 ++++---- 5 files changed, 8 insertions(+), 125 deletions(-) delete mode 100644 torque-cond-touch.patch delete mode 100644 torque-start-start.patch diff --git a/.gitignore b/.gitignore index 808b65c..e72e3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /torque-2.5.2.tar.gz /torque-2.5.3.tar.gz +/torque-3.0.0.tar.gz diff --git a/sources b/sources index 4175e51..ae680d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7868cf95582e20f2725651f97266947 torque-2.5.3.tar.gz +1f8e56035901f1ff7ac3c099198d2a91 torque-3.0.0.tar.gz diff --git a/torque-cond-touch.patch b/torque-cond-touch.patch deleted file mode 100644 index 9fb0834..0000000 --- a/torque-cond-touch.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_mom torque-2.5.2/contrib/init.d/pbs_mom ---- torque-2.5.2.ORIG/contrib/init.d/pbs_mom 2010-10-14 21:47:05.035383236 +0200 -+++ torque-2.5.2/contrib/init.d/pbs_mom 2010-10-14 21:49:38.433427973 +0200 -@@ -54,7 +54,7 @@ - # ulimit -c unlimited # Uncomment this to preserve core files - daemon $PBS_DAEMON $args -d $PBS_HOME - RET=$? -- touch /var/lock/subsys/pbs_mom -+ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_mom - echo - ;; - purge) -@@ -62,7 +62,7 @@ - echo -n "Starting TORQUE Mom with purge: " - daemon $PBS_DAEMON -r - RET=$? -- touch /var/lock/subsys/pbs_mom -+ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_mom - echo - ;; - stop) -diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_sched torque-2.5.2/contrib/init.d/pbs_sched ---- torque-2.5.2.ORIG/contrib/init.d/pbs_sched 2010-10-14 21:47:05.034384022 +0200 -+++ torque-2.5.2/contrib/init.d/pbs_sched 2010-10-14 21:50:32.826542794 +0200 -@@ -22,7 +22,7 @@ - echo -n "Starting TORQUE Scheduler: " - daemon $PBS_DAEMON -d $PBS_HOME - RET=$? -- touch /var/lock/subsys/pbs_sched -+ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_sched - echo - ;; - stop) -diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_server torque-2.5.2/contrib/init.d/pbs_server ---- torque-2.5.2.ORIG/contrib/init.d/pbs_server 2010-10-14 21:47:05.034384022 +0200 -+++ torque-2.5.2/contrib/init.d/pbs_server 2010-10-14 21:50:09.310577353 +0200 -@@ -28,7 +28,7 @@ - daemon $PBS_DAEMON -t create -d $PBS_HOME - fi - RET=$? -- touch /var/lock/subsys/pbs_server -+ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server - echo - ;; - stop) diff --git a/torque-start-start.patch b/torque-start-start.patch deleted file mode 100644 index 66a9841..0000000 --- a/torque-start-start.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_mom torque-2.5.2/contrib/init.d/pbs_mom ---- torque-2.5.2.ORIG/contrib/init.d/pbs_mom 2010-10-14 23:20:58.500633494 +0200 -+++ torque-2.5.2/contrib/init.d/pbs_mom 2010-10-14 23:36:00.369403267 +0200 -@@ -51,6 +51,9 @@ - case "$1" in - start) - echo -n "Starting TORQUE Mom: " -+ status pbs_mom 2>&1 > /dev/null -+ RET=$? -+ [ $RET -eq 0 ] && echo -n "pbs_mom already running" && success && echo && exit 0 - # ulimit -c unlimited # Uncomment this to preserve core files - daemon $PBS_DAEMON $args -d $PBS_HOME - RET=$? -@@ -67,6 +70,9 @@ - ;; - stop) - echo -n "Shutting down TORQUE Mom: " -+ status pbs_mom 2>&1 > /dev/null -+ RET=$? -+ [ ! $RET -eq 0 ] && echo -n "pbs_mom already stopped" && success && echo && exit 0 - kill_pbs_mom - RET=$? - [ $RET -eq 0 ] && success "shutdown" || failure "shutdown" -diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_sched torque-2.5.2/contrib/init.d/pbs_sched ---- torque-2.5.2.ORIG/contrib/init.d/pbs_sched 2010-10-14 23:20:58.500633494 +0200 -+++ torque-2.5.2/contrib/init.d/pbs_sched 2010-10-14 23:38:04.275381652 +0200 -@@ -20,6 +20,10 @@ - case "$1" in - start) - echo -n "Starting TORQUE Scheduler: " -+ status pbs_sched 2>&1 > /dev/null -+ RET=$? -+ [ $RET -eq 0 ] && echo -n "pbs_sched already running" && success && echo && exit 0 -+ - daemon $PBS_DAEMON -d $PBS_HOME - RET=$? - [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_sched -@@ -27,6 +31,9 @@ - ;; - stop) - echo -n "Shutting down TORQUE Scheduler: " -+ status pbs_sched 2>&1 > /dev/null -+ RET=$? -+ [ ! $RET -eq 0 ] && echo -n "pbs_sched already stopped" && success && echo && exit 0 - killproc pbs_sched - RET=$? - rm -f /var/lock/subsys/pbs_sched -diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_server torque-2.5.2/contrib/init.d/pbs_server ---- torque-2.5.2.ORIG/contrib/init.d/pbs_server 2010-10-14 23:20:58.499634001 +0200 -+++ torque-2.5.2/contrib/init.d/pbs_server 2010-10-14 23:37:06.460197422 +0200 -@@ -20,6 +20,10 @@ - case "$1" in - start) - echo -n "Starting TORQUE Server: " -+ status pbs_server 2>&1 > /dev/null -+ RET=$? -+ [ $RET -eq 0 ] && echo -n "pbs_server already running" && success && echo && exit 0 -+ - # ulimit -c unlimited # Uncomment this to preserve core files - if [ -r $PBS_HOME/server_priv/serverdb ] - then -@@ -51,6 +55,9 @@ - ;; - stop) - echo -n "Shutting down TORQUE Server: " -+ status pbs_server 2>&1 > /dev/null -+ RET=$? -+ [ ! $RET -eq 0 ] && echo -n "pbs_server already stopped" && success && echo && exit 0 - killproc pbs_server - RET=$? - rm -f /var/lock/subsys/pbs_server diff --git a/torque.spec b/torque.spec index 97deef1..9a59aeb 100644 --- a/torque.spec +++ b/torque.spec @@ -67,8 +67,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 2.5.3 -Release: 3%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -77,12 +77,8 @@ Source4: xpbs.png Source5: xpbsmon.png Source6: README.Fedora Source8: config -# https://bugzilla.redhat.com/show_bug.cgi?id=528060 -Patch0: torque-cond-touch.patch # https://bugzilla.redhat.com/show_bug.cgi?id=631256 Patch1: torque-create-request.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=643194 -Patch2: torque-start-start.patch License: OpenPBS Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -333,9 +329,7 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -774,6 +768,10 @@ fi %endif %changelog +* Thu Dec 9 2010 Steve Traylen - 3.0.0-1 +- New upstream 3.0.0. Drop patches torque-cond-touch.patch and + torque-start-start.patch since both upstream now. + * Wed Dec 8 2010 Steve Traylen - 2.5.3-3 - Remove own copy of pbs-config. #657027 - Move man pages from doc subpackage to relavent sub package. From 95be658a764f941c1d7b35532411fffef52f099a Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 10 Dec 2010 20:36:38 +0100 Subject: [PATCH 02/33] - Enable or rather force munge support. --- README.Fedora | 17 +++++++++++++++-- torque.spec | 11 +++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/README.Fedora b/README.Fedora index 0d82a1c..6a6811e 100644 --- a/README.Fedora +++ b/README.Fedora @@ -5,6 +5,17 @@ To setup a basic single-node localhost-only batch system, install the torque-server, torque-mom, and torque-scheduler packages, and do something like this: +0) If torque is built with munge support then this + must be enabled first on all nodes. The munge + package should allready be installed. + + Create a munge key with + + /usr/sbin/create-munge-key + + Copy resulting key /etc/munge/munge.key to + all torque nodes in your cluster including + pbs_server, pbs_mom and client (qstat,qsub) nodes. 1) Get your full hostname with @@ -55,6 +66,7 @@ service pbs_server start # /sbin/chkconfig pbs_mom on # /sbin/chkconfig pbs_server on # /sbin/chkconfig pbs_sched on +# /sbin/chkconfig munge on 9) Submit a test job. As a user not as root run the following @@ -64,8 +76,9 @@ hostname echo "Hi I am a batch job running in torque" EOF - - +10 ) Monitor the state of that job with qstat. + +In case of problems first of all look in /var/log/torque diff --git a/torque.spec b/torque.spec index 9a59aeb..7d8a335 100644 --- a/torque.spec +++ b/torque.spec @@ -68,7 +68,7 @@ Name: torque Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -135,6 +135,7 @@ This package holds just a few shared files and directories. Group: Applications/System Summary: Client part of TORQUE Requires: %{name}-libs = %{version}-%{release} +Requires: munge Requires(posttrans): chkconfig Requires(preun): chkconfig @@ -185,6 +186,7 @@ This package holds the graphical clients. Summary: Run-time libs for programs which will use the %{name} library Group: Development/Libraries Requires: torque = %{version}-%{release} +Requires: munge Obsoletes: libtorque < 2.4.8-2 Provides: libtorque = %{version}-%{release} @@ -221,6 +223,7 @@ necessary for developing programs which will use %{name}. Group: System Environment/Daemons Summary: Node execution daemon for TORQUE Requires: torque-libs = %{version}-%{release} +Requires: munge %if ! %{use_rcp} Requires: openssh-clients %endif @@ -275,6 +278,7 @@ This package holds the fifo C scheduler. Group: System Environment/Daemons Summary: The main part of TORQUE Requires: torque-libs = %{version}-%{release} +Requires: munge %if ! %{use_rcp} Requires: openssh-server %endif @@ -340,7 +344,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings" %configure --includedir=%{_includedir}/torque \ --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=%{_sbindir}/sendmail --disable-static \ - --enable-drmaa \ + --enable-drmaa --enable-munge-auth \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} @@ -768,6 +772,9 @@ fi %endif %changelog +* Fri Dec 10 2010 Steve Traylen - 3.0.0-2 +- Enable or rather force munge support. + * Thu Dec 9 2010 Steve Traylen - 3.0.0-1 - New upstream 3.0.0. Drop patches torque-cond-touch.patch and torque-start-start.patch since both upstream now. From c97c2e1f9e236319ddbd0f7fce86a693ab914849 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 2 Feb 2011 21:22:17 +0100 Subject: [PATCH 03/33] - Update to 3.0.0-snap.201102011355-1. - Drop torque-create-request.patch since upstream. --- .gitignore | 1 + sources | 2 +- torque.spec | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e72e3c5..159bc42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /torque-2.5.2.tar.gz /torque-2.5.3.tar.gz /torque-3.0.0.tar.gz +/torque-3.0.0-snap.201102011355.tar.gz diff --git a/sources b/sources index ae680d8..d8c81dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f8e56035901f1ff7ac3c099198d2a91 torque-3.0.0.tar.gz +ded9cf062a2e323b89112956aa7ea8f4 torque-3.0.0-snap.201102011355.tar.gz diff --git a/torque.spec b/torque.spec index 7d8a335..5bda81e 100644 --- a/torque.spec +++ b/torque.spec @@ -15,6 +15,10 @@ # that $PBS_SERVER_HOME/server_name contains the correct hostname. %global server_name localhost +# Define this if a snapshot. +%global snap 201102011355 + + %global use_rcp 0 %global use_tcl 1 %global build_gui 1 @@ -67,18 +71,16 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.0%{?snap:_snap.%{snap}} +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz +Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-3.0.0%{?snap:-snap.%{snap}}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png Source5: xpbsmon.png Source6: README.Fedora Source8: config -# https://bugzilla.redhat.com/show_bug.cgi?id=631256 -Patch1: torque-create-request.patch License: OpenPBS Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -332,8 +334,7 @@ DRMAA is "Distributed Resource Management Application API" %prep -%setup -q -%patch1 -p1 +%setup -q -n torque-3.0.0%{?snap:-snap.%{snap}} install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -772,6 +773,10 @@ fi %endif %changelog +* Fri Dec 10 2010 Steve Traylen - 3.0.0-snap.201102011355-1 +- Update to 3.0.0-snap.201102011355-1. +- Drop torque-create-request.patch since upstream. + * Fri Dec 10 2010 Steve Traylen - 3.0.0-2 - Enable or rather force munge support. From afe1e000673c95e9e7dd9247bc0441aca06aa8f8 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 3 Feb 2011 19:31:00 +0100 Subject: [PATCH 04/33] - License change to "OpenPBS and TORQUEv1.1" from OpenPBS. --- torque.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 5bda81e..820adc2 100644 --- a/torque.spec +++ b/torque.spec @@ -81,7 +81,13 @@ Source4: xpbs.png Source5: xpbsmon.png Source6: README.Fedora Source8: config -License: OpenPBS +# Feb 3rd 2011, I've sent a mail upstream to request the re-inclusion +# of the OpenPBS license file in distribution. +# I'll announce to fedora-devel once this is resolved either way. +# Fedora approval of TORQUEv1.1 +# http://lists.fedoraproject.org/pipermail/legal/2011-February/001530.html + +License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ %if 0%{?el4}%{?el5} @@ -776,6 +782,7 @@ fi * Fri Dec 10 2010 Steve Traylen - 3.0.0-snap.201102011355-1 - Update to 3.0.0-snap.201102011355-1. - Drop torque-create-request.patch since upstream. +- License change to "OpenPBS and TORQUEv1.1" from OpenPBS. * Fri Dec 10 2010 Steve Traylen - 3.0.0-2 - Enable or rather force munge support. From 7c3de4376fbc8a29d835b670d1d4591fc37f36cb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 14:17:05 -0600 Subject: [PATCH 05/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 820adc2..032610a 100644 --- a/torque.spec +++ b/torque.spec @@ -72,7 +72,7 @@ Name: torque Version: 3.0.0%{?snap:_snap.%{snap}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-3.0.0%{?snap:-snap.%{snap}}.tar.gz Source2: xpbs.desktop @@ -779,6 +779,9 @@ fi %endif %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 3.0.0_snap.201102011355-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Dec 10 2010 Steve Traylen - 3.0.0-snap.201102011355-1 - Update to 3.0.0-snap.201102011355-1. - Drop torque-create-request.patch since upstream. From 48c939bc5d58dda652e07e877028aced8f107f20 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 21 Apr 2011 22:19:53 +0200 Subject: [PATCH 06/33] Update to 3.0.1. License file name change. --- .gitignore | 1 + sources | 2 +- torque.spec | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 159bc42..91fcb2a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /torque-2.5.3.tar.gz /torque-3.0.0.tar.gz /torque-3.0.0-snap.201102011355.tar.gz +/torque-3.0.1.tar.gz diff --git a/sources b/sources index d8c81dc..19cd989 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ded9cf062a2e323b89112956aa7ea8f4 torque-3.0.0-snap.201102011355.tar.gz +d65463f823fdcd864c09ffd16841507b torque-3.0.1.tar.gz diff --git a/torque.spec b/torque.spec index 032610a..4080584 100644 --- a/torque.spec +++ b/torque.spec @@ -15,8 +15,6 @@ # that $PBS_SERVER_HOME/server_name contains the correct hostname. %global server_name localhost -# Define this if a snapshot. -%global snap 201102011355 %global use_rcp 0 @@ -71,10 +69,10 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.0%{?snap:_snap.%{snap}} -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-3.0.0%{?snap:-snap.%{snap}}.tar.gz +Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png @@ -340,7 +338,7 @@ DRMAA is "Distributed Resource Management Application API" %prep -%setup -q -n torque-3.0.0%{?snap:-snap.%{snap}} +%setup -q -n torque-%{version} install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -541,7 +539,7 @@ fi %files %defattr(-, root, root, -) %doc README.torque torque.setup Release_Notes -%doc CHANGELOG PBS_License.txt README.Fedora +%doc CHANGELOG PBS_License_2.5.txt README.Fedora contrib/PBS_License_2.3.txt %dir %{torquehomedir} %dir %{torquehomedir}/aux %dir %{torquehomedir}/spool @@ -779,6 +777,10 @@ fi %endif %changelog +* Thu Apr 21 2011 Steve Traylen - 3.0.1-1 +- Update to 3.0.1. + License file name change. + * Wed Feb 09 2011 Fedora Release Engineering - 3.0.0_snap.201102011355-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 08215d161318c6be20243b3a54929409d08c50c3 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 21 Apr 2011 22:54:36 +0200 Subject: [PATCH 07/33] Renable doxygen documentation for drmaa. --- torque.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/torque.spec b/torque.spec index 4080584..42d2a60 100644 --- a/torque.spec +++ b/torque.spec @@ -15,7 +15,8 @@ # that $PBS_SERVER_HOME/server_name contains the correct hostname. %global server_name localhost - +# Build doxygen docs +%global doxydoc 1 %global use_rcp 0 %global use_tcl 1 @@ -103,12 +104,7 @@ BuildRequires: tcl-devel BuildRequires: tk-devel %endif -#doxygen appears to be broken in rawhide at the moment -#Dec 9th 2010 so don't build the drmaa documentation -#for now. -%if ! 0%{?fc15} -%global doxydoc 1 -%endif + %if 0%{?doxydoc} BuildRequires: graphviz @@ -780,6 +776,7 @@ fi * Thu Apr 21 2011 Steve Traylen - 3.0.1-1 - Update to 3.0.1. License file name change. +- Renable doxygen documentation for drmaa. * Wed Feb 09 2011 Fedora Release Engineering - 3.0.0_snap.201102011355-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 5a5d6ce543f40bd610e430c75eeb9f6860ec34b4 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 8 Jun 2011 16:37:54 +0200 Subject: [PATCH 08/33] Add torque-buffer-overrun.patch patch, rhbz#711463 --- torque-buffer-overrun.patch | 119 ++++++++++++++++++++++++++++++++++++ torque.spec | 9 ++- 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 torque-buffer-overrun.patch diff --git a/torque-buffer-overrun.patch b/torque-buffer-overrun.patch new file mode 100644 index 0000000..58e2921 --- /dev/null +++ b/torque-buffer-overrun.patch @@ -0,0 +1,119 @@ +Index: src/server/req_quejob.c +=================================================================== +--- src/server/req_quejob.c (revision 4680) ++++ src/server/req_quejob.c (revision 4681) +@@ -1307,17 +1307,19 @@ + { + if (errno == 0) + { +- sprintf(log_buffer, "job %s in unexpected state '%s'", +- pj->ji_qs.ji_jobid, +- PJobSubState[pj->ji_qs.ji_substate]); ++ snprintf(log_buffer, sizeof(log_buffer), ++ "job %s in unexpected state '%s'", ++ pj->ji_qs.ji_jobid, ++ PJobSubState[pj->ji_qs.ji_substate]); + } + else + { +- sprintf(log_buffer, "job %s in unexpected state '%s' (errno=%d - %s)", +- pj->ji_qs.ji_jobid, +- PJobSubState[pj->ji_qs.ji_substate], +- errno, +- strerror(errno)); ++ snprintf(log_buffer, sizeof(log_buffer), ++ "job %s in unexpected state '%s' (errno=%d - %s)", ++ pj->ji_qs.ji_jobid, ++ PJobSubState[pj->ji_qs.ji_substate], ++ errno, ++ strerror(errno)); + } + + log_err(errno, id, log_buffer); +@@ -1555,9 +1557,10 @@ + + if (LOGLEVEL >= 6) + { +- sprintf(log_buffer, "successfully moved file '%s' for job '%s'", +- namebuf, +- preq->rq_ind.rq_jobfile.rq_jobid); ++ snprintf(log_buffer, sizeof(log_buffer), ++ "successfully moved file '%s' for job '%s'", ++ namebuf, ++ preq->rq_ind.rq_jobfile.rq_jobid); + + log_record( + PBSEVENT_JOB, +@@ -1684,9 +1687,10 @@ + { + char tmpLine[1024]; + +- sprintf(tmpLine, "cannot save job - errno=%d - %s", +- errno, +- strerror(errno)); ++ snprintf(tmpLine, sizeof(tmpLine), ++ "cannot save job - errno=%d - %s", ++ errno, ++ strerror(errno)); + + log_err(errno, id, tmpLine); + +@@ -1719,9 +1723,10 @@ + { + /* reply failed, purge the job and close the connection */ + +- sprintf(log_buffer, "cannot report jobid - errno=%d - %s", +- errno, +- strerror(errno)); ++ snprintf(log_buffer, sizeof(log_buffer), ++ "cannot report jobid - errno=%d - %s", ++ errno, ++ strerror(errno)); + + log_err(errno, id, log_buffer); + +@@ -2026,11 +2031,12 @@ + + /* need to format message first, before request goes away */ + +- sprintf(log_buffer, msg_jobnew, +- preq->rq_user, preq->rq_host, +- pj->ji_wattr[JOB_ATR_job_owner].at_val.at_str, +- pj->ji_wattr[JOB_ATR_jobname].at_val.at_str, +- pj->ji_qhdr->qu_qs.qu_name); ++ snprintf(log_buffer, sizeof(log_buffer), ++ msg_jobnew, ++ preq->rq_user, preq->rq_host, ++ pj->ji_wattr[JOB_ATR_job_owner].at_val.at_str, ++ pj->ji_wattr[JOB_ATR_jobname].at_val.at_str, ++ pj->ji_qhdr->qu_qs.qu_name); + + /* acknowledge the request with the job id */ + +@@ -2069,8 +2075,10 @@ + { + if (LOGLEVEL >= 7) + { +- sprintf(log_buffer, "Trying to AUTORUN job %s", +- pj->ji_qs.ji_jobid); ++ snprintf(log_buffer, sizeof(log_buffer), ++ "Trying to AUTORUN job %s", ++ pj->ji_qs.ji_jobid); ++ + log_record( + PBSEVENT_JOB, + PBS_EVENTCLASS_JOB, +Index: src/lib/Libnet/get_hostaddr.c +=================================================================== +--- src/lib/Libnet/get_hostaddr.c (revision 4680) ++++ src/lib/Libnet/get_hostaddr.c (revision 4681) +@@ -183,7 +183,8 @@ + + if (hp == NULL) + { +- sprintf(log_buffer,"cannot resolve IP address for host '%s' herror=%d: %s", ++ snprintf(log_buffer, sizeof(log_buffer), ++ "cannot resolve IP address for host '%s' herror=%d: %s", + hostname, + h_errno, + hstrerror(h_errno)); diff --git a/torque.spec b/torque.spec index 42d2a60..b36fb2e 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -86,6 +86,9 @@ Source8: config # Fedora approval of TORQUEv1.1 # http://lists.fedoraproject.org/pipermail/legal/2011-February/001530.html +# https://bugzilla.redhat.com/show_bug.cgi?id=711463 +Patch0: torque-buffer-overrun.patch + License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -335,6 +338,7 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -n torque-%{version} +%patch0 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -773,6 +777,9 @@ fi %endif %changelog +* Wed Jun 8 2011 Steve Traylen - 3.0.1-2 +- Add torque-buffer-overrun.patch patch, rhbz#711463 + * Thu Apr 21 2011 Steve Traylen - 3.0.1-1 - Update to 3.0.1. License file name change. From 5409298eac07b4112d8f2143c63614fbb79c816e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 17 Jun 2011 19:28:36 +0200 Subject: [PATCH 09/33] Add torque-munge-size.patch, rhbz#713996 --- torque-munge-size.patch | 12 ++++++++++++ torque.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 torque-munge-size.patch diff --git a/torque-munge-size.patch b/torque-munge-size.patch new file mode 100644 index 0000000..1f0470f --- /dev/null +++ b/torque-munge-size.patch @@ -0,0 +1,12 @@ +diff -uNr torque-3.0.1.ORIG/src/include/libpbs.h torque-3.0.1/src/include/libpbs.h +--- torque-3.0.1.ORIG/src/include/libpbs.h 2011-06-17 19:19:32.984380003 +0200 ++++ torque-3.0.1/src/include/libpbs.h 2011-06-17 19:23:19.406379620 +0200 +@@ -117,7 +117,7 @@ + #define EOF -1 + #endif + +-#define MUNGE_SIZE 256 /* I do not know what the proper size of this should be. My ++#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My + testing with munge shows it creates a string of 128 bytes */ + + /* enums for standard job files (sync w/TJobFileType[]) */ diff --git a/torque.spec b/torque.spec index b36fb2e..0d4bec7 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -89,6 +89,9 @@ Source8: config # https://bugzilla.redhat.com/show_bug.cgi?id=711463 Patch0: torque-buffer-overrun.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=713996 +Patch1: torque-munge-size.patch + License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -339,6 +342,7 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -n torque-%{version} %patch0 +%patch1 -p 1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -777,6 +781,9 @@ fi %endif %changelog +* Fri Jun 17 2011 Steve Traylen - 3.0.1-3 +- Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky + * Wed Jun 8 2011 Steve Traylen - 3.0.1-2 - Add torque-buffer-overrun.patch patch, rhbz#711463 From e3aa6e0cf9dc5244cc99a232d34f73aa891cfb45 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 26 Jun 2011 18:21:02 +0200 Subject: [PATCH 10/33] Removes nodes database file from package rhbz#716659 --- torque.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 0d4bec7..284969f 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -400,6 +400,10 @@ do %{buildroot}%{_mandir}/man1/${bin}-torque.1 done +# Remove nodes file database since we don't want it in +# the package. +rm %{buildroot}/%{torquehomedir}/server_priv/nodes + # Relocate configuration files. mkdir -p %{buildroot}%{_sysconfdir}/torque pushd %{buildroot}%{torquehomedir} @@ -781,6 +785,9 @@ fi %endif %changelog +* Sun Jun 26 2011 Steve Traylen - 3.0.1-4 +- Removes nodes database file from package rhbz#716659 + * Fri Jun 17 2011 Steve Traylen - 3.0.1-3 - Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky From 189f58021f22d5850fa99594c125593e4d087b35 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 28 Jun 2011 06:49:10 +0200 Subject: [PATCH 11/33] Update to 3.0.2. Remove torque-buffer-overrun since upstream now. --- .gitignore | 1 + sources | 2 +- torque-buffer-overrun.patch | 119 ------------------------------------ torque.spec | 16 +++-- 4 files changed, 12 insertions(+), 126 deletions(-) delete mode 100644 torque-buffer-overrun.patch diff --git a/.gitignore b/.gitignore index 91fcb2a..85258c3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /torque-3.0.0.tar.gz /torque-3.0.0-snap.201102011355.tar.gz /torque-3.0.1.tar.gz +/torque-3.0.2.tar.gz diff --git a/sources b/sources index 19cd989..1e3b2f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d65463f823fdcd864c09ffd16841507b torque-3.0.1.tar.gz +a2f008c7eeffcb3a0721fbb252397936 torque-3.0.2.tar.gz diff --git a/torque-buffer-overrun.patch b/torque-buffer-overrun.patch deleted file mode 100644 index 58e2921..0000000 --- a/torque-buffer-overrun.patch +++ /dev/null @@ -1,119 +0,0 @@ -Index: src/server/req_quejob.c -=================================================================== ---- src/server/req_quejob.c (revision 4680) -+++ src/server/req_quejob.c (revision 4681) -@@ -1307,17 +1307,19 @@ - { - if (errno == 0) - { -- sprintf(log_buffer, "job %s in unexpected state '%s'", -- pj->ji_qs.ji_jobid, -- PJobSubState[pj->ji_qs.ji_substate]); -+ snprintf(log_buffer, sizeof(log_buffer), -+ "job %s in unexpected state '%s'", -+ pj->ji_qs.ji_jobid, -+ PJobSubState[pj->ji_qs.ji_substate]); - } - else - { -- sprintf(log_buffer, "job %s in unexpected state '%s' (errno=%d - %s)", -- pj->ji_qs.ji_jobid, -- PJobSubState[pj->ji_qs.ji_substate], -- errno, -- strerror(errno)); -+ snprintf(log_buffer, sizeof(log_buffer), -+ "job %s in unexpected state '%s' (errno=%d - %s)", -+ pj->ji_qs.ji_jobid, -+ PJobSubState[pj->ji_qs.ji_substate], -+ errno, -+ strerror(errno)); - } - - log_err(errno, id, log_buffer); -@@ -1555,9 +1557,10 @@ - - if (LOGLEVEL >= 6) - { -- sprintf(log_buffer, "successfully moved file '%s' for job '%s'", -- namebuf, -- preq->rq_ind.rq_jobfile.rq_jobid); -+ snprintf(log_buffer, sizeof(log_buffer), -+ "successfully moved file '%s' for job '%s'", -+ namebuf, -+ preq->rq_ind.rq_jobfile.rq_jobid); - - log_record( - PBSEVENT_JOB, -@@ -1684,9 +1687,10 @@ - { - char tmpLine[1024]; - -- sprintf(tmpLine, "cannot save job - errno=%d - %s", -- errno, -- strerror(errno)); -+ snprintf(tmpLine, sizeof(tmpLine), -+ "cannot save job - errno=%d - %s", -+ errno, -+ strerror(errno)); - - log_err(errno, id, tmpLine); - -@@ -1719,9 +1723,10 @@ - { - /* reply failed, purge the job and close the connection */ - -- sprintf(log_buffer, "cannot report jobid - errno=%d - %s", -- errno, -- strerror(errno)); -+ snprintf(log_buffer, sizeof(log_buffer), -+ "cannot report jobid - errno=%d - %s", -+ errno, -+ strerror(errno)); - - log_err(errno, id, log_buffer); - -@@ -2026,11 +2031,12 @@ - - /* need to format message first, before request goes away */ - -- sprintf(log_buffer, msg_jobnew, -- preq->rq_user, preq->rq_host, -- pj->ji_wattr[JOB_ATR_job_owner].at_val.at_str, -- pj->ji_wattr[JOB_ATR_jobname].at_val.at_str, -- pj->ji_qhdr->qu_qs.qu_name); -+ snprintf(log_buffer, sizeof(log_buffer), -+ msg_jobnew, -+ preq->rq_user, preq->rq_host, -+ pj->ji_wattr[JOB_ATR_job_owner].at_val.at_str, -+ pj->ji_wattr[JOB_ATR_jobname].at_val.at_str, -+ pj->ji_qhdr->qu_qs.qu_name); - - /* acknowledge the request with the job id */ - -@@ -2069,8 +2075,10 @@ - { - if (LOGLEVEL >= 7) - { -- sprintf(log_buffer, "Trying to AUTORUN job %s", -- pj->ji_qs.ji_jobid); -+ snprintf(log_buffer, sizeof(log_buffer), -+ "Trying to AUTORUN job %s", -+ pj->ji_qs.ji_jobid); -+ - log_record( - PBSEVENT_JOB, - PBS_EVENTCLASS_JOB, -Index: src/lib/Libnet/get_hostaddr.c -=================================================================== ---- src/lib/Libnet/get_hostaddr.c (revision 4680) -+++ src/lib/Libnet/get_hostaddr.c (revision 4681) -@@ -183,7 +183,8 @@ - - if (hp == NULL) - { -- sprintf(log_buffer,"cannot resolve IP address for host '%s' herror=%d: %s", -+ snprintf(log_buffer, sizeof(log_buffer), -+ "cannot resolve IP address for host '%s' herror=%d: %s", - hostname, - h_errno, - hstrerror(h_errno)); diff --git a/torque.spec b/torque.spec index 284969f..0c40402 100644 --- a/torque.spec +++ b/torque.spec @@ -70,8 +70,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -86,9 +86,6 @@ Source8: config # Fedora approval of TORQUEv1.1 # http://lists.fedoraproject.org/pipermail/legal/2011-February/001530.html -# https://bugzilla.redhat.com/show_bug.cgi?id=711463 -Patch0: torque-buffer-overrun.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=713996 Patch1: torque-munge-size.patch @@ -341,7 +338,6 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -n torque-%{version} -%patch0 %patch1 -p 1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . @@ -585,6 +581,8 @@ fi %{_mandir}/man1/qorder.1.* %{_mandir}/man1/qrerun.1.* %{_mandir}/man1/qsig.1.* +%{_mandir}/man1/qgpumode.1.gz +%{_mandir}/man1/qgpureset.1.gz %{_mandir}/man8/pbsnodes.8.* %{_mandir}/man8/qdisable.8.* %{_mandir}/man8/qenable.8.* @@ -692,6 +690,8 @@ fi %{_mandir}/man3/pbs_checkpointjob.3.gz %{_mandir}/man3/pbs_fbserver.3.gz %{_mandir}/man3/pbs_get_server_list.3.gz +%{_mandir}/man3/pbs_gpumode.3.gz +%{_mandir}/man3/pbs_gpureset.3.gz %{_mandir}/man3/rpp.3.* %{_mandir}/man3/tm.3.* @@ -785,6 +785,10 @@ fi %endif %changelog +* Mon Jun 27 2011 Steve Traylen - 3.0.2-1 +- Update to 3.0.2. +- Remove torque-buffer-overrun since upstream now. + * Sun Jun 26 2011 Steve Traylen - 3.0.1-4 - Removes nodes database file from package rhbz#716659 From 094dd388193565f48bc263b0d139c34737ca6d67 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 31 Aug 2011 20:11:00 +0200 Subject: [PATCH 12/33] Move checkpoint directory from torque-mom to torque package. rhbz#734878. --- torque.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/torque.spec b/torque.spec index 0c40402..7913786 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -548,6 +548,7 @@ fi %dir %{torquehomedir}/aux %dir %{torquehomedir}/spool %dir %{torquehomedir}/undelivered +%{torquehomedir}/checkpoint %{torquehomedir}/pbs_environment %{torquehomedir}/server_name %config(noreplace) %{_sysconfdir}/torque/pbs_environment @@ -708,7 +709,6 @@ fi %endif %{torquehomedir}/mom_priv %{torquehomedir}/mom_logs -%{torquehomedir}/checkpoint %{torquehomedir}/undelivered %dir %{_var}/log/torque %dir %{_var}/log/torque/mom_logs @@ -785,6 +785,10 @@ fi %endif %changelog +* Wed Aug 30 2011 Steve Traylen - 3.0.2-2 +- Move checkpoint directory from torque-mom to torque package. + rhbz#734878. + * Mon Jun 27 2011 Steve Traylen - 3.0.2-1 - Update to 3.0.2. - Remove torque-buffer-overrun since upstream now. From 1a17a8fd8f8c7aa9702af3041741e995872ca53d Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 18 Sep 2011 20:26:43 +0200 Subject: [PATCH 13/33] Add --with-tcp-retry-limit=2 to build, rhbz#738576. --- torque.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 7913786..4278f84 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -349,6 +349,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings" %configure --includedir=%{_includedir}/torque \ --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=%{_sbindir}/sendmail --disable-static \ + --with-tcp-retry-limit=2 \ --enable-drmaa --enable-munge-auth \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} @@ -785,6 +786,9 @@ fi %endif %changelog +* Mon Sep 19 2011 Steve Traylen - 3.0.2-3 +- Add --with-tcp-retry-limit=2 to build, rhbz#738576. + * Wed Aug 30 2011 Steve Traylen - 3.0.2-2 - Move checkpoint directory from torque-mom to torque package. rhbz#734878. From cb579b8d8b0ac6a45071945c08d9f008c6e54c35 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 9 Oct 2011 00:16:39 +0200 Subject: [PATCH 14/33] Add patch torque-initd-hangs-rhbz-744138.patch --- torque-initd-hangs-rhbz-744138.patch | 19 +++++++++++++++++++ torque.spec | 9 ++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 torque-initd-hangs-rhbz-744138.patch diff --git a/torque-initd-hangs-rhbz-744138.patch b/torque-initd-hangs-rhbz-744138.patch new file mode 100644 index 0000000..c0ffbd2 --- /dev/null +++ b/torque-initd-hangs-rhbz-744138.patch @@ -0,0 +1,19 @@ +diff -uNr torque-3.0.2.ORIG/contrib/init.d/pbs_server torque-3.0.2/contrib/init.d/pbs_server +--- torque-3.0.2.ORIG/contrib/init.d/pbs_server 2011-10-09 00:09:29.026651535 +0200 ++++ torque-3.0.2/contrib/init.d/pbs_server 2011-10-09 00:12:05.012653474 +0200 +@@ -14,13 +14,11 @@ + echo "Configuration already exists. Please remove $PBS_SERVERDB to create a new one." + exit 1 + fi +- + $PBS_DAEMON -d $PBS_HOME -t create & +- while [ ! -r $PBS_SERVERDB ]; do +- sleep 1 +- done ++ sleep 5 + killproc pbs_server + RET=$? ++ + } + + start() { diff --git a/torque.spec b/torque.spec index 4278f84..1c2c958 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -89,6 +89,9 @@ Source8: config # https://bugzilla.redhat.com/show_bug.cgi?id=713996 Patch1: torque-munge-size.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=744138 +Patch2: torque-initd-hangs-rhbz-744138.patch + License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -339,6 +342,7 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -n torque-%{version} %patch1 -p 1 +%patch2 -p 1 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -786,6 +790,9 @@ fi %endif %changelog +* Sun Oct 9 2011 Steve Traylen - 3.0.2-4 +- Add patch torque-initd-hangs-rhbz-744138.patch + * Mon Sep 19 2011 Steve Traylen - 3.0.2-3 - Add --with-tcp-retry-limit=2 to build, rhbz#738576. From 24f9b08ead64e6e99a1cbee4882d3f5b44faa2a0 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 17 Nov 2011 19:20:39 +0100 Subject: [PATCH 15/33] New upstream. --- .gitignore | 1 + sources | 2 +- torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85258c3..76d9a32 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /torque-3.0.0-snap.201102011355.tar.gz /torque-3.0.1.tar.gz /torque-3.0.2.tar.gz +/torque-3.0.3.tar.gz diff --git a/sources b/sources index 1e3b2f0..12bdcd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2f008c7eeffcb3a0721fbb252397936 torque-3.0.2.tar.gz +f6e7271673a4290414b04081c07e3437 torque-3.0.3.tar.gz diff --git a/torque.spec b/torque.spec index 1c2c958..8c454b0 100644 --- a/torque.spec +++ b/torque.spec @@ -70,8 +70,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.2 -Release: 4%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Thu Nov 17 2011 Steve Traylen - 3.0.3-1 +- New upstream. + * Sun Oct 9 2011 Steve Traylen - 3.0.2-4 - Add patch torque-initd-hangs-rhbz-744138.patch From 13d785bfe7292d02e65f016e215bd96a155f0783 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 17 Nov 2011 22:15:24 +0100 Subject: [PATCH 16/33] Empty release for release mistake. --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 8c454b0..8e4106f 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Thu Nov 17 2011 Steve Traylen - 3.0.3-2 +- Empty release for release mistake. + * Thu Nov 17 2011 Steve Traylen - 3.0.3-1 - New upstream. From 289bcf559483e3ba26a50fb7816d645bd8627513 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 00:54:37 -0600 Subject: [PATCH 17/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 8e4106f..6368382 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 3.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Nov 17 2011 Steve Traylen - 3.0.3-2 - Empty release for release mistake. From 1fa3f1f0260efc2be400ed569bc4c971876e9562 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 5 Feb 2012 15:31:06 +0100 Subject: [PATCH 18/33] New upstream. --- .gitignore | 1 + sources | 2 +- torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 76d9a32..4a4742d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /torque-3.0.1.tar.gz /torque-3.0.2.tar.gz /torque-3.0.3.tar.gz +/torque-3.0.4.tar.gz diff --git a/sources b/sources index 12bdcd4..6bb34ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6e7271673a4290414b04081c07e3437 torque-3.0.3.tar.gz +dd822d5ba1ac938ac1c48392b55e775e torque-3.0.4.tar.gz diff --git a/torque.spec b/torque.spec index 6368382..213c7f1 100644 --- a/torque.spec +++ b/torque.spec @@ -70,8 +70,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.3 -Release: 3%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Sun Feb 5 2012 Steve Traylen - 3.0.4-1 +- New upstream. + * Sat Jan 14 2012 Fedora Release Engineering - 3.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 091d3376103ab548c48eb51fa5ef0a8d7d635c48 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 18:48:37 -0500 Subject: [PATCH 19/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 213c7f1..023a5a7 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Feb 5 2012 Steve Traylen - 3.0.4-1 - New upstream. From 210c5d89270d5169a41cf0827fdc309f38b2da38 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 19:50:31 -0600 Subject: [PATCH 20/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 023a5a7..d075df7 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 3.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5e6609bb34d9c0b16d5681b21c64b11c9fefdf4b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 23:22:31 -0500 Subject: [PATCH 21/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index d075df7..cc8d0b5 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 3.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -790,6 +790,9 @@ fi %endif %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 3.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 72969598d6a3fa1cc5752d7c8c2303672150a0e5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Aug 2013 15:12:00 -0600 Subject: [PATCH 22/33] Update URL and Source0 --- torque.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torque.spec b/torque.spec index cc8d0b5..bfcfc8b 100644 --- a/torque.spec +++ b/torque.spec @@ -73,7 +73,7 @@ Name: torque Version: 3.0.4 Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz +Source0: http://adaptive.wpengine.com/resources/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png @@ -94,7 +94,7 @@ Patch2: torque-initd-hangs-rhbz-744138.patch License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons -URL: http://www.clusterresources.com/products/torque/ +URL: http://www.adaptivecomputing.com/products/open-source/torque/ %if 0%{?el4}%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif From 961c3e57d5c5940b98875810e839f3489500654e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Aug 2013 15:21:48 -0600 Subject: [PATCH 23/33] Fix changelog dates --- torque.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torque.spec b/torque.spec index bfcfc8b..79be298 100644 --- a/torque.spec +++ b/torque.spec @@ -817,7 +817,7 @@ fi * Mon Sep 19 2011 Steve Traylen - 3.0.2-3 - Add --with-tcp-retry-limit=2 to build, rhbz#738576. -* Wed Aug 30 2011 Steve Traylen - 3.0.2-2 +* Wed Aug 31 2011 Steve Traylen - 3.0.2-2 - Move checkpoint directory from torque-mom to torque package. rhbz#734878. @@ -914,7 +914,7 @@ fi * Wed Feb 25 2009 Fedora Release Engineering - 2.1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Mon Apr 16 2008 Garrick Staples 2.1.10-6 +* Thu Apr 17 2008 Garrick Staples 2.1.10-6 - add alternatives system * Thu Feb 14 2008 Garrick Staples 2.1.10-5 From 3a5d38cddd97ca5f14e1d0be4d45f498e8bb7e83 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Aug 2013 15:50:08 -0600 Subject: [PATCH 24/33] Drop Source URL for now --- torque.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 79be298..0068dce 100644 --- a/torque.spec +++ b/torque.spec @@ -73,7 +73,7 @@ Name: torque Version: 3.0.4 Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: http://adaptive.wpengine.com/resources/downloads/%{name}/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png From aed6def2b29e7a9e24eaeac53dbd03b7449f8e84 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Aug 2013 16:00:27 -0600 Subject: [PATCH 25/33] Add missing BRs for latex docs --- torque.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/torque.spec b/torque.spec index 0068dce..12c5652 100644 --- a/torque.spec +++ b/torque.spec @@ -120,6 +120,10 @@ BuildRequires: graphviz-gd %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(sectsty.sty) +BuildRequires: tex(tocloft.sty) +BuildRequires: tex(xtab.sty) %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) @@ -790,6 +794,9 @@ fi %endif %changelog +* Fri Aug 16 2013 Orion Poplawski - 3.0.4-4 +- Add missing BRs for latex docs + * Sun Aug 04 2013 Fedora Release Engineering - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From c9991409415707a65bf75fae3d9c72eba6ad9d39 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Aug 2013 16:28:33 -0600 Subject: [PATCH 26/33] Remove doxygen directory reference file --- torque.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/torque.spec b/torque.spec index 12c5652..fcb2b5b 100644 --- a/torque.spec +++ b/torque.spec @@ -459,6 +459,8 @@ popd %if 0%{?doxydoc} mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/. +# Remove strange doxygen directory reference file +rm %{buildroot}%{_mandir}/man3/_* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/* # Include drmaa.pdf later from the src tree. From 1f2427ba043306f1c1817fb41f95aac69bf315d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= Date: Sun, 12 Jan 2014 13:48:49 +0100 Subject: [PATCH 27/33] upstream 4.2.6.1 --- .gitignore | 1 + sources | 2 +- torque-munge-size.patch | 25 ++++++++++++++++------ torque.spec | 47 +++++++++++++++++++++++------------------ 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 4a4742d..97388d2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /torque-3.0.2.tar.gz /torque-3.0.3.tar.gz /torque-3.0.4.tar.gz +/torque-4.2.6.1.tar.gz diff --git a/sources b/sources index 6bb34ce..d5f8326 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd822d5ba1ac938ac1c48392b55e775e torque-3.0.4.tar.gz +a87afed9436967cf10468ef76a7e8fcd torque-4.2.6.1.tar.gz diff --git a/torque-munge-size.patch b/torque-munge-size.patch index 1f0470f..a473f4d 100644 --- a/torque-munge-size.patch +++ b/torque-munge-size.patch @@ -1,12 +1,25 @@ -diff -uNr torque-3.0.1.ORIG/src/include/libpbs.h torque-3.0.1/src/include/libpbs.h ---- torque-3.0.1.ORIG/src/include/libpbs.h 2011-06-17 19:19:32.984380003 +0200 -+++ torque-3.0.1/src/include/libpbs.h 2011-06-17 19:23:19.406379620 +0200 -@@ -117,7 +117,7 @@ +From 12a8d7dde1d07aed670f0dd50b317b256daaa991 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Sun, 12 Jan 2014 11:42:32 +0100 +Subject: [PATCH] munge size fix + +--- + src/include/libpbs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/libpbs.h b/src/include/libpbs.h +index 6d32c8b..06b1bec 100644 +--- a/src/include/libpbs.h ++++ b/src/include/libpbs.h +@@ -121,7 +121,7 @@ #define EOF -1 #endif -#define MUNGE_SIZE 256 /* I do not know what the proper size of this should be. My -+#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My ++#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My testing with munge shows it creates a string of 128 bytes */ - /* enums for standard job files (sync w/TJobFileType[]) */ + +-- +1.8.4.2 + diff --git a/torque.spec b/torque.spec index fcb2b5b..6d64e18 100644 --- a/torque.spec +++ b/torque.spec @@ -70,10 +70,10 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.4 -Release: 4%{?dist} +Version: 4.2.6.1 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: %{name}-%{version}.tar.gz +Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png @@ -89,12 +89,9 @@ Source8: config # https://bugzilla.redhat.com/show_bug.cgi?id=713996 Patch1: torque-munge-size.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=744138 -Patch2: torque-initd-hangs-rhbz-744138.patch - License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons -URL: http://www.adaptivecomputing.com/products/open-source/torque/ +URL: http://www.clusterresources.com/products/torque/ %if 0%{?el4}%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -103,6 +100,9 @@ BuildRequires: pam-devel BuildRequires: xauth BuildRequires: readline-devel BuildRequires: ncurses-devel +BuildRequires: gperf +BuildRequires: openssl-devel +BuildRequires: libxml2-devel %if %{use_tcl} BuildRequires: tcl-devel %endif @@ -120,10 +120,10 @@ BuildRequires: graphviz-gd %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(sectsty.sty) -BuildRequires: tex(tocloft.sty) -BuildRequires: tex(xtab.sty) +BuildRequires: tex-xtab +BuildRequires: tex-sectsty +BuildRequires: tex-tocloft +BuildRequires: tex-multirow %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) @@ -346,7 +346,7 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -n torque-%{version} %patch1 -p 1 -%patch2 -p 1 +sed -i '/LATEX_BATCHMODE/d' src/drmaa/Doxyfile.in install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -361,7 +361,6 @@ CFLAGS="%{optflags} -Wno-overlength-strings" --enable-drmaa --enable-munge-auth \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} - make %{?_smp_mflags} for daemon in pbs_mom pbs_sched pbs_server @@ -458,9 +457,8 @@ popd # and delete the three copies of the same documentation. %if 0%{?doxydoc} +rm %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/*_src_drmaa_src_.3 mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/. -# Remove strange doxygen directory reference file -rm %{buildroot}%{_mandir}/man3/_* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/* # Include drmaa.pdf later from the src tree. @@ -470,6 +468,9 @@ rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf #Remove man page for binary that is not included. rm %{buildroot}%{_mandir}/man1/basl2c.1 +# fix permissions for some directories in /var/lib/torque +chmod 755 `find %{buildroot}/var/lib/torque -type d` + %clean rm -rf %{buildroot} @@ -554,7 +555,7 @@ fi %files %defattr(-, root, root, -) %doc README.torque torque.setup Release_Notes -%doc CHANGELOG PBS_License_2.5.txt README.Fedora contrib/PBS_License_2.3.txt +%doc CHANGELOG PBS_License.txt README.Fedora contrib/PBS_License_2.3.txt %dir %{torquehomedir} %dir %{torquehomedir}/aux %dir %{torquehomedir}/spool @@ -579,7 +580,6 @@ fi %{_bindir}/printtracking %{_bindir}/tracejob %{_sbindir}/momctl -%attr(4755, root, root) %{_sbindir}/pbs_iff %{_sbindir}/pbs_demux %if %{use_tcl} %{_bindir}/pbs_tclsh @@ -671,6 +671,7 @@ fi %{_includedir}/torque/rpp.h %{_includedir}/torque/tm.h %{_includedir}/torque/tm_.h +%{_includedir}/torque/*.h %{_bindir}/pbs-config %{_mandir}/man3/pbs_alterjob.3.* %{_mandir}/man3/pbs_connect.3.* @@ -704,7 +705,6 @@ fi %{_mandir}/man3/pbs_get_server_list.3.gz %{_mandir}/man3/pbs_gpumode.3.gz %{_mandir}/man3/pbs_gpureset.3.gz -%{_mandir}/man3/rpp.3.* %{_mandir}/man3/tm.3.* @@ -755,6 +755,7 @@ fi %defattr(-, root, root, -) %attr(0755, root, root) %{_sbindir}/pbs_server %attr(0755, root, root) %{_sbindir}/momctl +%attr(0755, root, root) %{_sbindir}/trqauthd %{_sbindir}/qserverd %{_initrddir}/pbs_server %dir %{_var}/log/torque/server_logs @@ -796,6 +797,12 @@ fi %endif %changelog +* Sun Jan 12 2014 Haïkel Guémar - 4.2.6.1-1 +- upstream 4.2.6.1 + +* Wed Nov 13 2013 Haïkel Guémar - 4.2.6-1 +- upstream 4.2.6 + * Fri Aug 16 2013 Orion Poplawski - 3.0.4-4 - Add missing BRs for latex docs @@ -826,7 +833,7 @@ fi * Mon Sep 19 2011 Steve Traylen - 3.0.2-3 - Add --with-tcp-retry-limit=2 to build, rhbz#738576. -* Wed Aug 31 2011 Steve Traylen - 3.0.2-2 +* Tue Aug 30 2011 Steve Traylen - 3.0.2-2 - Move checkpoint directory from torque-mom to torque package. rhbz#734878. @@ -923,7 +930,7 @@ fi * Wed Feb 25 2009 Fedora Release Engineering - 2.1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Apr 17 2008 Garrick Staples 2.1.10-6 +* Wed Apr 16 2008 Garrick Staples 2.1.10-6 - add alternatives system * Thu Feb 14 2008 Garrick Staples 2.1.10-5 From bc8451121fec00f341418feaadbf6174e072a6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 21 May 2014 12:42:21 +0200 Subject: [PATCH 28/33] - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 6d64e18..0f3f151 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -797,6 +797,9 @@ fi %endif %changelog +* Wed May 21 2014 Jaroslav Škarvada - 4.2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + * Sun Jan 12 2014 Haïkel Guémar - 4.2.6.1-1 - upstream 4.2.6.1 From a228f6a4ed9a7c0ca763f2a8f78a8a7800e3ba14 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 03:47:06 -0500 Subject: [PATCH 29/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 0f3f151..6387d04 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -797,6 +797,9 @@ fi %endif %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed May 21 2014 Jaroslav Škarvada - 4.2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 From 3282eeabe0024465f9ce6c7cf2957d252cfa3bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 17 Jul 2014 15:08:47 +0200 Subject: [PATCH 30/33] Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455). - Pass --without-debug to %configure to let configure pass through %optflags (RHBZ#1074571). - Fix twice listed files in *-devel. --- torque.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/torque.spec b/torque.spec index 6387d04..66df7e2 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -353,11 +353,11 @@ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ chmod 644 torque.setup %build -CFLAGS="%{optflags} -Wno-overlength-strings" +CFLAGS="%{optflags} -Wno-overlength-strings -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" %configure --includedir=%{_includedir}/torque \ --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=%{_sbindir}/sendmail --disable-static \ - --with-tcp-retry-limit=2 \ + --with-tcp-retry-limit=2 --without-debug \ --enable-drmaa --enable-munge-auth \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} @@ -664,14 +664,8 @@ fi %files devel %defattr(-, root, root, -) %{_libdir}/libtorque.so -%{_includedir}/torque/pbs_error.h -%{_includedir}/torque/pbs_error_db.h -%{_includedir}/torque/pbs_ifl.h -%{_includedir}/torque/rm.h -%{_includedir}/torque/rpp.h -%{_includedir}/torque/tm.h -%{_includedir}/torque/tm_.h -%{_includedir}/torque/*.h +%{_includedir}/torque +%exclude %{_includedir}/torque/drmaa.h %{_bindir}/pbs-config %{_mandir}/man3/pbs_alterjob.3.* %{_mandir}/man3/pbs_connect.3.* @@ -797,6 +791,13 @@ fi %endif %changelog +* Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-4 +- Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around + Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455). +- Pass --without-debug to %%configure to let configure pass through + %%optflags (RHBZ#1074571). +- Fix twice listed files in *-devel. + * Sun Jun 08 2014 Fedora Release Engineering - 4.2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d5159863fa3a515a38367b9c865085e42d14b4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 17 Jul 2014 15:19:31 +0200 Subject: [PATCH 31/33] Reflect upstream URL and Source0 having changed. --- torque.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/torque.spec b/torque.spec index 66df7e2..2e2cdeb 100644 --- a/torque.spec +++ b/torque.spec @@ -71,9 +71,9 @@ Name: torque Version: 4.2.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz +Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png @@ -91,7 +91,7 @@ Patch1: torque-munge-size.patch License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons -URL: http://www.clusterresources.com/products/torque/ +URL: http://www.adaptivecomputing.com/products/open-source/torque/ %if 0%{?el4}%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -791,6 +791,9 @@ fi %endif %changelog +* Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-5 +- Reflect upstream URL and Source0 having changed. + * Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-4 - Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455). From 3499f19984c57e6294f3a4e24362d787b7402907 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:08:48 +0000 Subject: [PATCH 32/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 2e2cdeb..98a759a 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -791,6 +791,9 @@ fi %endif %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 4.2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-5 - Reflect upstream URL and Source0 having changed. From f33844324cb5922c7090ee6bc22b1fe01c68a2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= Date: Mon, 1 Sep 2014 10:24:13 +0200 Subject: [PATCH 33/33] upstream 4.2.8 --- .gitignore | 1 + sources | 2 +- torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 97388d2..581d76a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /torque-3.0.3.tar.gz /torque-3.0.4.tar.gz /torque-4.2.6.1.tar.gz +/torque-4.2.8.tar.gz diff --git a/sources b/sources index d5f8326..eafec14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a87afed9436967cf10468ef76a7e8fcd torque-4.2.6.1.tar.gz +3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz diff --git a/torque.spec b/torque.spec index 98a759a..fde49f6 100644 --- a/torque.spec +++ b/torque.spec @@ -70,8 +70,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 4.2.6.1 -Release: 6%{?dist} +Version: 4.2.8 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -791,6 +791,9 @@ fi %endif %changelog +* Mon Sep 01 2014 Haïkel Guémar - 4.2.8-1 +- upstream 4.2.8 + * Mon Aug 18 2014 Fedora Release Engineering - 4.2.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild