dmlb2000 pushed to torque (el5). "Merge branch 'master' into el5 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 06:06:26 UTC 2015
>From a0ada10b99ba48c5155538330e3f8a25d36fc13d Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Wed, 25 Oct 2006 00:33:38 +0000
Subject: - fixes more regressions from Friday
diff --git a/.cvsignore b/.cvsignore
index fa5518c..85a8732 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.5.tar.gz
+torque-2.1.6.tar.gz
diff --git a/sources b/sources
index f678f4a..7a59130 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88b5a78756414b40d1fdc588b5f2aa6f torque-2.1.5.tar.gz
+abfeb1a3a5aa53f725f975c2b5d98e1e torque-2.1.6.tar.gz
diff --git a/torque.spec b/torque.spec
index 1abd4c9..8bc007f 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,7 +1,7 @@
# comment out snap if building a real release
%define name torque
-%define version 2.1.5
+%define version 2.1.6
#%%define snap 200604251602
%define release 1
@@ -403,6 +403,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
+- fixes more regressions from Friday
+
* Sat Oct 21 2006 Garrick Staples <garrick at usc.edu> 2.1.5-1
- fixes "qsub -o /dev/null" regression
--
cgit v0.10.2
>From 0a2d5f2ddbb2cada1d427899b01df7c1700985d7 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Sat, 3 Feb 2007 05:35:30 +0000
Subject: - rebuild for tcl8.5
diff --git a/torque.spec b/torque.spec
index 8bc007f..1332885 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.6
#%%define snap 200604251602
-%define release 1
+%define release 2
# The following options are supported:
# --with server_name=hostname
@@ -403,6 +403,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Fri Feb 2 2007 Garrick Staples <garrick at usc.edu> 2.1.6-2
+- rebuild for tcl8.5
+
* Tue Oct 24 2006 Garrick Staples <garrick at usc.edu> 2.1.6-1
- fixes more regressions from Friday
--
cgit v0.10.2
>From bcc2a4876ed344a8624f4773642d7364e2b47445 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Sun, 4 Feb 2007 05:14:12 +0000
Subject: - trying to resolve tcl8.5 buildindex issue
diff --git a/torque-2.1.6-show_buildindex_arg.patch b/torque-2.1.6-show_buildindex_arg.patch
new file mode 100644
index 0000000..076215d
--- /dev/null
+++ b/torque-2.1.6-show_buildindex_arg.patch
@@ -0,0 +1,12 @@
+diff -pruN torque-2.1.6_orig/src/tools/xpbsmon/Makefile.in torque-2.1.6/src/tools/xpbsmon/Makefile.in
+--- torque-2.1.6_orig/src/tools/xpbsmon/Makefile.in 2006-10-02 19:27:27.000000000 -0700
++++ torque-2.1.6/src/tools/xpbsmon/Makefile.in 2007-02-03 20:42:04.000000000 -0800
+@@ -417,7 +417,7 @@ buildindex: $(srcdir)/buildindex.src
+
+ tclIndex: $(dist_xpbs_DATA) buildindex
+ @echo Running buildindex \(locally\)
+- @./buildindex $(srcdir) .
++ ./buildindex $(srcdir) .
+
+ install-data-hook:
+ $(INSTALL_SCRIPT) buildindex $(DESTDIR)$(XPBSMON_DIR)/buildindex
diff --git a/torque.spec b/torque.spec
index 1332885..faa3be7 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.6
#%%define snap 200604251602
-%define release 2
+%define release 3
# The following options are supported:
# --with server_name=hostname
@@ -92,6 +92,7 @@ Source4: xpbs.png
Source5: xpbsmon.png
Source6: README-localhost
Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.6-show_buildindex_arg.patch
License: Freely redistributable (See PBS_License.txt)
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -121,6 +122,7 @@ This package holds just a few shared files and directories.
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
%patch1 -p1
+%patch2 -p1
%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
@@ -403,6 +405,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Sat Feb 3 2007 Garrick Staples <garrick at usc.edu> 2.1.6-3
+- trying to resolve tcl8.5 buildindex issue
+
* Fri Feb 2 2007 Garrick Staples <garrick at usc.edu> 2.1.6-2
- rebuild for tcl8.5
--
cgit v0.10.2
>From a5acba4aa12c878004ab49582baa947ceb5fe560 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Tue, 6 Feb 2007 18:41:14 +0000
Subject: - rebuilding with new tcl
diff --git a/torque-2.1.6-show_buildindex_arg.patch b/torque-2.1.6-show_buildindex_arg.patch
deleted file mode 100644
index 076215d..0000000
--- a/torque-2.1.6-show_buildindex_arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pruN torque-2.1.6_orig/src/tools/xpbsmon/Makefile.in torque-2.1.6/src/tools/xpbsmon/Makefile.in
---- torque-2.1.6_orig/src/tools/xpbsmon/Makefile.in 2006-10-02 19:27:27.000000000 -0700
-+++ torque-2.1.6/src/tools/xpbsmon/Makefile.in 2007-02-03 20:42:04.000000000 -0800
-@@ -417,7 +417,7 @@ buildindex: $(srcdir)/buildindex.src
-
- tclIndex: $(dist_xpbs_DATA) buildindex
- @echo Running buildindex \(locally\)
-- @./buildindex $(srcdir) .
-+ ./buildindex $(srcdir) .
-
- install-data-hook:
- $(INSTALL_SCRIPT) buildindex $(DESTDIR)$(XPBSMON_DIR)/buildindex
diff --git a/torque.spec b/torque.spec
index faa3be7..cfb263e 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.6
#%%define snap 200604251602
-%define release 3
+%define release 4
# The following options are supported:
# --with server_name=hostname
@@ -92,7 +92,6 @@ Source4: xpbs.png
Source5: xpbsmon.png
Source6: README-localhost
Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.6-show_buildindex_arg.patch
License: Freely redistributable (See PBS_License.txt)
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -122,7 +121,6 @@ This package holds just a few shared files and directories.
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
%patch1 -p1
-%patch2 -p1
%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
@@ -405,6 +403,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Tue Feb 6 2007 Garrick Staples <garrick at usc.edu> 2.1.6-4
+- rebuilding with new tcl
+
* Sat Feb 3 2007 Garrick Staples <garrick at usc.edu> 2.1.6-3
- trying to resolve tcl8.5 buildindex issue
--
cgit v0.10.2
>From 4376af4b50ef1b3e449bd0ad6785fef0b8b066df Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Wed, 14 Feb 2007 22:55:19 +0000
Subject: - rebuilding because tcl8.5 was downgraded to tcl8.4
diff --git a/torque.spec b/torque.spec
index cfb263e..e990453 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.6
#%%define snap 200604251602
-%define release 4
+%define release 5
# The following options are supported:
# --with server_name=hostname
@@ -403,6 +403,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Wed Feb 14 2007 Garrick Staples <garrick at usc.edu> 2.1.6-5
+- rebuilding because tcl8.5 was downgraded to tcl8.4
+
* Tue Feb 6 2007 Garrick Staples <garrick at usc.edu> 2.1.6-4
- rebuilding with new tcl
--
cgit v0.10.2
>From 591933b6f52ba9706b891ce7c53293d948171605 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Tue, 13 Mar 2007 19:12:01 +0000
Subject: - bump to 2.1.8 - ensure daemons have the correct path to sendmail -
don't need rpath configure patch anymore
diff --git a/.cvsignore b/.cvsignore
index 85a8732..3455aa0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.6.tar.gz
+torque-2.1.8.tar.gz
diff --git a/sources b/sources
index 7a59130..05097ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abfeb1a3a5aa53f725f975c2b5d98e1e torque-2.1.6.tar.gz
+484cdbd5693ac12268405ca1fb6b549d torque-2.1.8.tar.gz
diff --git a/torque-2.1.0-remove-rpath.path b/torque-2.1.0-remove-rpath.path
deleted file mode 100644
index 6887411..0000000
--- a/torque-2.1.0-remove-rpath.path
+++ /dev/null
@@ -1,14 +0,0 @@
-Remove the rpath added by libtool as-per fedora guidelines
-
---- torque-2.1.0p0-snap.200604071240/configure 2006-04-07 15:41:06.000000000 -0400
-+++ ./configure 2006-04-08 15:53:16.000000000 -0400
-@@ -5935,7 +5935,8 @@
-
- if test "$ld_shlibs" = yes; then
- runpath_var=LD_RUN_PATH
-- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+ # hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+ hardcode_libdir_flag_spec=''
- export_dynamic_flag_spec='${wl}--export-dynamic'
- case $host_os in
- cygwin* | mingw* | pw32*)
diff --git a/torque.spec b/torque.spec
index e990453..170c58f 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,9 +1,9 @@
# comment out snap if building a real release
%define name torque
-%define version 2.1.6
+%define version 2.1.8
#%%define snap 200604251602
-%define release 5
+%define release 1
# The following options are supported:
# --with server_name=hostname
@@ -91,7 +91,6 @@ Source3: xpbsmon.desktop
Source4: xpbs.png
Source5: xpbsmon.png
Source6: README-localhost
-Patch1: torque-2.1.0-remove-rpath.path
License: Freely redistributable (See PBS_License.txt)
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@ This package holds just a few shared files and directories.
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch1 -p1
%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
@@ -128,6 +126,7 @@ This package holds just a few shared files and directories.
%build
%configure --includedir=%{_includedir}/torque \
--with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
+ --with-sendmail=/usr/sbin/sendmail \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
%__make %{?_smp_mflags}
@@ -403,6 +402,11 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Tue Mar 13 2007 Garrick Staples <garrick at usc.edu> 2.1.8-1
+- bump to 2.1.8
+- ensure daemons have the correct path to sendmail
+- don't need rpath configure patch anymore
+
* Wed Feb 14 2007 Garrick Staples <garrick at usc.edu> 2.1.6-5
- rebuilding because tcl8.5 was downgraded to tcl8.4
--
cgit v0.10.2
>From 5e45e7460072b9fa5fa289d0604cc58138dcfcfc Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Thu, 16 Aug 2007 05:03:04 +0000
Subject: - correct errors in desktop entry files
diff --git a/torque.spec b/torque.spec
index 170c58f..edb54fa 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.8
#%%define snap 200604251602
-%define release 1
+%define release 2
# The following options are supported:
# --with server_name=hostname
@@ -402,6 +402,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Wed Aug 15 2007 Garrick Staples <garrick at usc.edu> 2.1.8-2
+- correct errors in desktop entry files
+
* Tue Mar 13 2007 Garrick Staples <garrick at usc.edu> 2.1.8-1
- bump to 2.1.8
- ensure daemons have the correct path to sendmail
diff --git a/xpbs.desktop b/xpbs.desktop
index b417428..383b3e0 100644
--- a/xpbs.desktop
+++ b/xpbs.desktop
@@ -1,11 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
-Name=xpbs
+Name=xPBS
GenericName=PBS/TORQUE client
Comment=View job status and submit jobs
Exec=xpbs
Icon=xpbs.png
Terminal=false
Type=Application
-Categories=Application;Other;
-Version=1.1.12
+Categories=Education;Science;ComputerScience;ParallelComputing;
+Version=1.0
diff --git a/xpbsmon.desktop b/xpbsmon.desktop
index 9d6280c..470f103 100644
--- a/xpbsmon.desktop
+++ b/xpbsmon.desktop
@@ -1,11 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
-Name=xpbsmon
+Name=xPBSMon
GenericName=PBS/TORQUE cluster monitor
Comment=View node status
Exec=xpbsmon
Icon=xpbsmon.png
Terminal=false
Type=Application
-Categories=Application;Other;
-Version=2.3
+Categories=Education;Science;ComputerScience;ParallelComputing;
+Version=1.0
--
cgit v0.10.2
>From 7cdc8f9a4ecebd0196663f567fc589cf23161f25 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Fri, 31 Aug 2007 17:13:29 +0000
Subject: - correct License tag
diff --git a/torque.spec b/torque.spec
index edb54fa..35d4faa 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.8
#%%define snap 200604251602
-%define release 2
+%define release 3
# The following options are supported:
# --with server_name=hostname
@@ -91,7 +91,7 @@ Source3: xpbsmon.desktop
Source4: xpbs.png
Source5: xpbsmon.png
Source6: README-localhost
-License: Freely redistributable (See PBS_License.txt)
+License: OpenPBS
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -402,6 +402,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Fri Aug 31 2007 Garrick Staples <garrick at usc.edu> 2.1.8-3
+- correct License tag
+
* Wed Aug 15 2007 Garrick Staples <garrick at usc.edu> 2.1.8-2
- correct errors in desktop entry files
--
cgit v0.10.2
>From e520e8c0ec5d823661c102c76fa5cd86dffcb965 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Wed, 3 Oct 2007 21:47:21 +0000
Subject: - bump to 2.1.9
diff --git a/.cvsignore b/.cvsignore
index 3455aa0..e60c50b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.8.tar.gz
+torque-2.1.9.tar.gz
diff --git a/sources b/sources
index 05097ee..ba90778 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-484cdbd5693ac12268405ca1fb6b549d torque-2.1.8.tar.gz
+88b7998865cf236b7eb42148fa937172 torque-2.1.9.tar.gz
diff --git a/torque.spec b/torque.spec
index 35d4faa..0b08951 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,9 +1,9 @@
# comment out snap if building a real release
%define name torque
-%define version 2.1.8
+%define version 2.1.9
#%%define snap 200604251602
-%define release 3
+%define release 1
# The following options are supported:
# --with server_name=hostname
@@ -402,6 +402,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Wed Oct 3 2007 Garrick Staples <garrick at usc.edu> 2.1.9-1
+- bump to 2.1.9
+
* Fri Aug 31 2007 Garrick Staples <garrick at usc.edu> 2.1.8-3
- correct License tag
--
cgit v0.10.2
>From d9fab02c6f79cb28deb109ab1512a0acc66f11b5 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Thu, 13 Dec 2007 06:43:11 +0000
Subject: - bump to 2.1.10
diff --git a/.cvsignore b/.cvsignore
index e60c50b..1f488fc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.9.tar.gz
+torque-2.1.10.tar.gz
diff --git a/sources b/sources
index ba90778..01baf2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88b7998865cf236b7eb42148fa937172 torque-2.1.9.tar.gz
+298e0ff61028efc74f050425aac79300 torque-2.1.10.tar.gz
diff --git a/torque.spec b/torque.spec
index 0b08951..ac1014b 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,7 +1,7 @@
# comment out snap if building a real release
%define name torque
-%define version 2.1.9
+%define version 2.1.10
#%%define snap 200604251602
%define release 1
@@ -402,6 +402,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Wed Dec 12 2007 Garrick Staples <garrick at usc.edu> 2.1.10-1
+- bump to 2.1.10
+
* Wed Oct 3 2007 Garrick Staples <garrick at usc.edu> 2.1.9-1
- bump to 2.1.9
--
cgit v0.10.2
>From 9b9606ab81fb8774e58911fee627142c8111791b Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Fri, 4 Jan 2008 00:47:39 +0000
Subject: - rebuild because tcl was bumped Thu Dec 13 2007 Garrick Staples
<garrick at usc.edu> 2.1.10-2 - fix multilib conflicts
diff --git a/pbs-config-multilib b/pbs-config-multilib
new file mode 100755
index 0000000..e91a9c1
--- /dev/null
+++ b/pbs-config-multilib
@@ -0,0 +1,103 @@
+#! /bin/sh
+
+package="pbs"
+version="2.1.8"
+
+prefix="/usr"
+exec_prefix="/usr"
+bindir="/usr/bin"
+sbindir="/usr/sbin"
+libexecdir="/usr/libexec"
+datadir="/usr/share"
+sysconfdir="/etc"
+sharedstatedir="/usr/com"
+localstatedir="/var"
+infodir="/usr/share/info"
+mandir="/usr/share/man"
+includedir="/usr/include/torque"
+libs="-ltorque"
+
+if test "$#" -eq 0; then
+ cat <<EOF
+Usage: $package-config OPTIONS
+Options:
+ --prefix=DIR) : \$prefix
+ --package) : \$package
+ --version) : \$version
+ --cflags) : -I\$includedir
+ --libs) : \$libs
+ --help) print all the options (not just these)
+EOF
+fi
+
+o=""
+h=""
+for i in "$@"; do
+ case $i in
+ --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;
+ --prefix) o="$o $prefix" ;;
+ --package) o="$o $package" ;;
+ --version) o="$o $version" ;;
+ --cflags) if test "_$includedir" != "_/usr/include"
+ then o="$o -I$includedir" ; fi
+ ;;
+ --libs) o="$o $libs" ;;
+ --exec_prefix|--eprefix) o="$o $exec_prefix" ;;
+ --bindir) o="$o $bindir" ;;
+ --sbindir) o="$o $sbindir" ;;
+ --libexecdir) o="$o $libexecdir" ;;
+ --datadir) o="$o $datadir" ;;
+ --datainc) o="$o -I$datadir" ;;
+ --datalib) o="$o -L$datadir" ;;
+ --sysconfdir) o="$o $sysconfdir" ;;
+ --sharedstatedir) o="$o $sharedstatedir" ;;
+ --localstatedir) o="$o $localstatedir" ;;
+ --infodir) o="$o $infodir" ;;
+ --mandir) o="$o $mandir" ;;
+ --includedir) o="$o $includedir" ;;
+ --data) o="$o -I$datadir/$package" ;;
+ --pkgdatadir) o="$o $datadir/$package" ;;
+ --pkgdatainc) o="$o -I$datadir/$package" ;;
+ --pkgdatalib) o="$o -L$datadir/$package" ;;
+ --pkglibinc) o="$o -I$libinc/$package" ;;
+ --pkglibadd) o="$o -L$libadd/$package" ;;
+ --pkgincludedir) o="$o $includedir/$package" ;;
+ --help) h="1" ;;
+ -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*)
+ v=`echo $i | sed -e s://:\$:g`
+ v=`eval "echo $v"`
+ o="$o $v" ;;
+ esac
+done
+
+o=`eval "echo $o"`
+o=`eval "echo $o"`
+eval "echo $o"
+
+if test ! -z "$h" ; then
+cat <<EOF
+ --prefix=xxx) (what is that for anyway?)
+ --prefix) \$prefix $prefix
+ --package) \$package $package
+ --version) \$version $version
+ --cflags) -I\$includedir unless it is /usr/include
+ --libs) -l\$PACKAGE \$LIBS
+ --exec_prefix) or...
+ --eprefix) \$exec_prefix $exec_prefix
+ --bindir) \$bindir $bindir
+ --sbindir) \$sbindir $sbindir
+ --libexecdir) \$libexecdir $libexecdir
+ --datadir) \$datadir $datadir
+ --sysconfdir) \$sysconfdir $sysconfdir
+ --sharedstatedir) \$sharedstatedir$sharedstatedir
+ --localstatedir) \$localstatedir $localstatedir
+ --infodir) \$infodir $infodir
+ --mandir) \$mandir $mandir
+ --data) -I\$datadir/\$package
+ --pkgdatadir) \$datadir/\$package
+ --pkgincludedir) \$includedir/\$package
+ --help) generated by ac_create_generic_config.m4
+ -I//varname and other inc-targets like --pkgdatainc supported
+ -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd
+EOF
+fi
diff --git a/torque.spec b/torque.spec
index ac1014b..fbbedb5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.10
#%%define snap 200604251602
-%define release 1
+%define release 3
# The following options are supported:
# --with server_name=hostname
@@ -91,6 +91,7 @@ Source3: xpbsmon.desktop
Source4: xpbs.png
Source5: xpbsmon.png
Source6: README-localhost
+Source7: pbs-config-multilib
License: OpenPBS
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +121,7 @@ This package holds just a few shared files and directories.
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} .
+%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
%build
@@ -129,18 +130,20 @@ This package holds just a few shared files and directories.
--with-sendmail=/usr/sbin/sendmail \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
+%__cp -vf pbs-config-neutered pbs-config
%__make %{?_smp_mflags}
%install
%__rm -rf "$RPM_BUILD_ROOT"
-%__make DESTDIR=$RPM_BUILD_ROOT install
+%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
# remove files we don't need
%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
-%{__rm} -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
+touch -r pbs-config-neutered $RPM_BUILD_ROOT/%{_bindir}/pbs-config
# install initscripts
%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
@@ -402,6 +405,12 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Thu Jan 3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-3
+- rebuild because tcl was bumped
+
+* Thu Dec 13 2007 Garrick Staples <garrick at usc.edu> 2.1.10-2
+- fix multilib conflicts
+
* Wed Dec 12 2007 Garrick Staples <garrick at usc.edu> 2.1.10-1
- bump to 2.1.10
--
cgit v0.10.2
>From 5e7db5f78c84fff50b1a77c3206baf5692ac4f7c Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Fri, 4 Jan 2008 00:56:08 +0000
Subject: - correct pbs-config build typo
diff --git a/torque.spec b/torque.spec
index fbbedb5..ae0c078 100644
--- a/torque.spec
+++ b/torque.spec
@@ -130,7 +130,7 @@ This package holds just a few shared files and directories.
--with-sendmail=/usr/sbin/sendmail \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
-%__cp -vf pbs-config-neutered pbs-config
+%__cp -vf pbs-config-multilib pbs-config
%__make %{?_smp_mflags}
@@ -143,7 +143,7 @@ This package holds just a few shared files and directories.
%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
-touch -r pbs-config-neutered $RPM_BUILD_ROOT/%{_bindir}/pbs-config
+touch -r pbs-config-multilib $RPM_BUILD_ROOT/%{_bindir}/pbs-config
# install initscripts
%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
@@ -405,6 +405,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Thu Jan 3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-4
+- correct pbs-config build typo
+
* Thu Jan 3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-3
- rebuild because tcl was bumped
--
cgit v0.10.2
>From 6eb2c6dc8f642416739bd7bb00aaa24d3df2fa0e Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Fri, 4 Jan 2008 00:58:00 +0000
Subject: sigh, forgot to bump release
diff --git a/torque.spec b/torque.spec
index ae0c078..bd8a9b1 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.10
#%%define snap 200604251602
-%define release 3
+%define release 4
# The following options are supported:
# --with server_name=hostname
--
cgit v0.10.2
>From ed9df90e24e95510fb94a250c234a7e75ba24cf3 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Thu, 14 Feb 2008 21:14:23 +0000
Subject: - fix missing NI_MAXSERV on fedora9
diff --git a/torque-2.1.10-NI_MAXSERV.patch b/torque-2.1.10-NI_MAXSERV.patch
new file mode 100644
index 0000000..a6df41f
--- /dev/null
+++ b/torque-2.1.10-NI_MAXSERV.patch
@@ -0,0 +1,14 @@
+diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h
+--- torque-2.1.10_orig/src/include/port_forwarding.h 2006-10-13 11:25:37.000000000 -0700
++++ torque-2.1.10/src/include/port_forwarding.h 2008-02-14 13:08:05.000000000 -0800
+@@ -16,6 +16,10 @@
+ # endif
+ #endif /* X_UNIX_PATH */
+
++#ifndef NI_MAXSERV
++# define NI_MAXSERV 32
++#endif /* !NI_MAXSERV */
++
+
+ struct pfwdsock {
+ int sock;
diff --git a/torque.spec b/torque.spec
index bd8a9b1..a0ff68c 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.10
#%%define snap 200604251602
-%define release 4
+%define release 5
# The following options are supported:
# --with server_name=hostname
@@ -101,6 +101,8 @@ BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-dev
Conflicts: pbspro, openpbs, openpbs-oscar
Obsoletes: torque-localhost
+Patch0: torque-2.1.10-NI_MAXSERV.patch
+
%if %use_tcl
BuildRequires: tcl-devel
%endif
@@ -120,6 +122,7 @@ This package holds just a few shared files and directories.
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
+%patch0 -p1
%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
@@ -405,6 +408,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 2.1.10-5
+- fix missing NI_MAXSERV on fedora9
+
* Thu Jan 3 2008 Garrick Staples <garrick at usc.edu> 2.1.10-4
- correct pbs-config build typo
--
cgit v0.10.2
>From b61642d3f78c52891b56baf7b3d5db1ada0ce798 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick at fedoraproject.org>
Date: Thu, 17 Apr 2008 05:33:24 +0000
Subject: - add alternatives system
diff --git a/torque.spec b/torque.spec
index a0ff68c..ca30dc0 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.10
#%%define snap 200604251602
-%define release 5
+%define release 6
# The following options are supported:
# --with server_name=hostname
@@ -98,6 +98,8 @@ URL: http://www.clusterresources.com/products/torque/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: pbs
BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
+Requires(posttrans): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
Conflicts: pbspro, openpbs, openpbs-oscar
Obsoletes: torque-localhost
@@ -177,6 +179,15 @@ desktop-file-install --vendor fedora \
%endif
+# alternatives stuff
+for bin in qalter qdel qhold qrls qselect qstat qsub
+do
+ mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-torque
+ mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-torque.1
+done
+
+
%clean
%__rm -rf "$RPM_BUILD_ROOT"
@@ -222,6 +233,13 @@ This package holds the documentation files.
%defattr(-, root, root)
%doc doc/admin_guide.ps
%{_mandir}/man*/*
+%exclude %{_mandir}/man1/qsub-torque.1.gz
+%exclude %{_mandir}/man1/qalter-torque.1.gz
+%exclude %{_mandir}/man1/qdel-torque.1.gz
+%exclude %{_mandir}/man1/qhold-torque.1.gz
+%exclude %{_mandir}/man1/qrls-torque.1.gz
+%exclude %{_mandir}/man1/qselect-torque.1.gz
+%exclude %{_mandir}/man1/qstat-torque.1.gz
%package scheduler
@@ -318,6 +336,34 @@ Provides: pbs-client
%shared_description
This package holds the command-line client programs.
+%posttrans client
+/usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
+ --slave %{_mandir}/man1/qsub.1.gz qsub-man \
+ %{_mandir}/man1/qsub-torque.1.gz \
+ --slave %{_bindir}/qalter qalter %{_bindir}/qalter-torque \
+ --slave %{_mandir}/man1/qalter.1.gz qalter-man \
+ %{_mandir}/man1/qalter-torque.1.gz \
+ --slave %{_bindir}/qdel qdel %{_bindir}/qdel-torque \
+ --slave %{_mandir}/man1/qdel.1.gz qdel-man \
+ %{_mandir}/man1/qdel-torque.1.gz \
+ --slave %{_bindir}/qhold qhold %{_bindir}/qhold-torque \
+ --slave %{_mandir}/man1/qhold.1.gz qhold-man \
+ %{_mandir}/man1/qhold-torque.1.gz \
+ --slave %{_bindir}/qrls qrls %{_bindir}/qrls-torque \
+ --slave %{_mandir}/man1/qrls.1.gz qrls-man \
+ %{_mandir}/man1/qrls-torque.1.gz \
+ --slave %{_bindir}/qselect qselect %{_bindir}/qselect-torque \
+ --slave %{_mandir}/man1/qselect.1.gz qselect-man \
+ %{_mandir}/man1/qselect-torque.1.gz \
+ --slave %{_bindir}/qstat qstat %{_bindir}/qstat-torque \
+ --slave %{_mandir}/man1/qstat.1.gz qstat-man \
+ %{_mandir}/man1/qstat-torque.1.gz
+
+%preun client
+if [ $1 -eq 0 ]; then
+ /usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
+fi
+
%files client
%defattr(-, root, root)
%{_bindir}/q*
@@ -334,6 +380,14 @@ This package holds the command-line client programs.
%if %use_tcl
%{_bindir}/pbs_tclsh
%endif
+%{_mandir}/man1/qsub-torque.1.gz
+%{_mandir}/man1/qalter-torque.1.gz
+%{_mandir}/man1/qdel-torque.1.gz
+%{_mandir}/man1/qhold-torque.1.gz
+%{_mandir}/man1/qrls-torque.1.gz
+%{_mandir}/man1/qselect-torque.1.gz
+%{_mandir}/man1/qstat-torque.1.gz
+
%package gui
Group: Applications/System
@@ -408,6 +462,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Mon Apr 16 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
+- add alternatives system
+
* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 2.1.10-5
- fix missing NI_MAXSERV on fedora9
--
cgit v0.10.2
>From a903a4627c5764c116d1630c7ecb47567e6bdb38 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Wed, 25 Feb 2009 21:25:07 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/torque.spec b/torque.spec
index ca30dc0..ef15820 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.10
#%%define snap 200604251602
-%define release 6
+%define release 7
# The following options are supported:
# --with server_name=hostname
@@ -462,6 +462,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Mon Apr 16 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
- add alternatives system
--
cgit v0.10.2
>From 4dddb89e3d0e7222b6d40eb0644fcc876b2ce9e2 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Mon, 27 Jul 2009 06:08:04 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/torque.spec b/torque.spec
index ef15820..9b73fba 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.10
#%%define snap 200604251602
-%define release 7
+%define release 8
# The following options are supported:
# --with server_name=hostname
@@ -462,6 +462,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--
cgit v0.10.2
>From 3016aa906cce3a8f82974258f42d93d4fb755d94 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 22:52:25 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
diff --git a/Makefile b/Makefile
index 266183f..2ba24c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: torque
-# $Id$
+# $Id: Makefile,v 1.1 2006/04/18 02:09:21 garrick Exp $
NAME := torque
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
--
cgit v0.10.2
>From 3a4d5db332a64081a6ab2b81391a0ae50da62e4a Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Thu, 26 Nov 2009 01:31:36 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
diff --git a/Makefile b/Makefile
index 266183f..2ba24c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: torque
-# $Id$
+# $Id: Makefile,v 1.1 2006/04/18 02:09:21 garrick Exp $
NAME := torque
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
--
cgit v0.10.2
>From 0e8053028a8a2a56cec7bc573e15f09865363bcf Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil at fedoraproject.org>
Date: Sat, 8 May 2010 02:25:44 +0000
Subject: Initialize branch EL-6 for torque
diff --git a/branch b/branch
new file mode 100644
index 0000000..46381b9
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-6
--
cgit v0.10.2
>From a7e63a0384887b1e6d3d1f9c93b6c60512c0e928 Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Mon, 10 May 2010 10:50:40 +0000
Subject: Hand branch EL5 into EL6.
diff --git a/sources b/sources
index 01baf2e..06832f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-298e0ff61028efc74f050425aac79300 torque-2.1.10.tar.gz
+30d3366432ad3506278f884ba797e2b2 torque-2.3.10.tar.gz
diff --git a/torque-2.1.10-NI_MAXSERV.patch b/torque-2.1.10-NI_MAXSERV.patch
deleted file mode 100644
index a6df41f..0000000
--- a/torque-2.1.10-NI_MAXSERV.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h
---- torque-2.1.10_orig/src/include/port_forwarding.h 2006-10-13 11:25:37.000000000 -0700
-+++ torque-2.1.10/src/include/port_forwarding.h 2008-02-14 13:08:05.000000000 -0800
-@@ -16,6 +16,10 @@
- # endif
- #endif /* X_UNIX_PATH */
-
-+#ifndef NI_MAXSERV
-+# define NI_MAXSERV 32
-+#endif /* !NI_MAXSERV */
-+
-
- struct pfwdsock {
- int sock;
diff --git a/torque.spec b/torque.spec
index 9b73fba..4ab6002 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,9 +1,9 @@
# comment out snap if building a real release
%define name torque
-%define version 2.1.10
+%define version 2.3.10
#%%define snap 200604251602
-%define release 8
+%define release 1
# The following options are supported:
# --with server_name=hostname
@@ -103,8 +103,6 @@ Requires(preun): /usr/sbin/alternatives
Conflicts: pbspro, openpbs, openpbs-oscar
Obsoletes: torque-localhost
-Patch0: torque-2.1.10-NI_MAXSERV.patch
-
%if %use_tcl
BuildRequires: tcl-devel
%endif
@@ -124,13 +122,13 @@ This package holds just a few shared files and directories.
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch0 -p1
%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
%build
-%configure --includedir=%{_includedir}/torque \
+%configure --disable-gcc-warnings \
+ --includedir=%{_includedir}/torque \
--with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
--with-sendmail=/usr/sbin/sendmail \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
@@ -197,16 +195,16 @@ if %__grep -q "PBS services" /etc/services;then
: PBS services already installed
else
cat<<-__EOF__>>/etc/services
- # Standard PBS services
- pbs 15001/tcp # pbs server (pbs_server)
- pbs 15001/udp # pbs server (pbs_server)
- pbs_mom 15002/tcp # mom to/from server
- pbs_mom 15002/udp # mom to/from server
- pbs_resmom 15003/tcp # mom resource management requests
- pbs_resmom 15003/udp # mom resource management requests
- pbs_sched 15004/tcp # scheduler
- pbs_sched 15004/udp # scheduler
- __EOF__
+# Standard PBS services
+pbs 15001/tcp # pbs server (pbs_server)
+pbs 15001/udp # pbs server (pbs_server)
+pbs_mom 15002/tcp # mom to/from server
+pbs_mom 15002/udp # mom to/from server
+pbs_resmom 15003/tcp # mom resource management requests
+pbs_resmom 15003/udp # mom resource management requests
+pbs_sched 15004/tcp # scheduler
+pbs_sched 15004/udp # scheduler
+__EOF__
fi
@@ -254,6 +252,7 @@ This package holds the fifo C scheduler.
%files scheduler
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_sched
+%attr(0755, root, root) %{_sbindir}/qschedd
%{_initrddir}/pbs_sched
%dir %{torquehomedir}/sched_priv
%config(noreplace) %{torquehomedir}/sched_priv/*
@@ -281,6 +280,7 @@ This package holds the server.
%files server
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_server
+%attr(0755, root, root) %{_sbindir}/qserverd
%attr(0755, root, root) %{_sbindir}/momctl
%{_initrddir}/pbs_server
%{torquehomedir}/server_logs
@@ -308,6 +308,8 @@ This package holds the execute daemon required on every node.
%files mom
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_mom
+%attr(0755, root, root) %{_sbindir}/qnoded
+%attr(0755, root, root) %{_bindir}/pbs_track
%{_initrddir}/pbs_mom
%if %{use_rcp}
%attr(4755 root root) %{_sbindir}/pbs_rcp
@@ -374,6 +376,7 @@ fi
%{_bindir}/pbsnodes
%{_bindir}/printjob
%{_bindir}/printtracking
+%{_bindir}/printserverdb
%{_bindir}/tracejob
%attr(4755 root root) %{_sbindir}/pbs_iff
%{_sbindir}/pbs_demux
@@ -462,6 +465,21 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
%changelog
+* Fri Feb 12 2010 Steve Traylen <steve.traylen at cern.ch> - 2.3.10-1
+- New upstream 2.3.10
+
+* Tue Jan 19 2010 Steve Traylen <steve.traylen at cern.ch> - 2.3.9-1
+- New upstream 2.3.9
+* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> - 2.3.8-1
+- Updated to upstream 2.3.8
+- First EPEL build.
+- Add new commands to package.
+ /usr/bin/pbs_track
+ /usr/bin/printserverdb
+ /usr/sbin/qnoded
+ /usr/sbin/qschedd
+ /usr/sbin/qserverd
+- Remove torque-2.1.10-NI_MAXSERV.patch as not needed any more.
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
cgit v0.10.2
>From fff80ad0683b851864aa0de0e12604319d1a8a03 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 2 Jun 2010 15:14:37 +0000
Subject: update to 2.4.8, drop static libs, cleanup spec file
diff --git a/.cvsignore b/.cvsignore
index 1f488fc..273924f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.10.tar.gz
+torque-2.4.8.tar.gz
diff --git a/sources b/sources
index 01baf2e..c202166 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-298e0ff61028efc74f050425aac79300 torque-2.1.10.tar.gz
+56170b7fce63fed9ed0cc83ee5bd3e3a torque-2.4.8.tar.gz
diff --git a/torque.spec b/torque.spec
index 9b73fba..5bdf4cb 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,10 +1,3 @@
-
-# comment out snap if building a real release
-%define name torque
-%define version 2.1.10
-#%%define snap 200604251602
-%define release 8
-
# The following options are supported:
# --with server_name=hostname
# --with homedir=directory
@@ -12,26 +5,22 @@
# --with[out] gui
# --with[out] tcl
-
# Hrm, should we default to the name of the buildhost? That seems only
# slightly better than picking a hostname at random. This is exactly the kind
# of compile-time default that doesn't work well with distributable packages.
# Let's force the issue with the non-sensical "localhost".
-#
+#
# Note that "localhost" doesn't actually work. You must either define the
# correct hostname here, pass '--with server_name=foo' to rpmbuild, or be sure
# that $PBS_SERVER_HOME/server_name contains the correct hostname.
-%define server_name localhost
+%global server_name localhost
-# change as you wish
-%define use_rcp 0
-%define use_tcl 1
-%define build_gui 1
+%global use_rcp 0
+%global use_tcl 1
+%global build_gui 1
# these are non-defaults, but fit better into most RPM-based systems
-%define torquehomedir %_localstatedir/torque
-
-
+%global torquehomedir %{_localstatedir}/torque
# --with/--without processing
# first, error if conflicting options are used
@@ -40,160 +29,241 @@
%{?_with_gui: %{?_without_gui: %{error: both _with_gui and _without_gui}}}
# did we find any --with options?
-%{?_with_rcp: %define use_rcp 1}
-%{?_with_tcl: %define use_tcl 1}
-%{?_with_gui: %define build_gui 1}
+%{?_with_rcp: %global use_rcp 1}
+%{?_with_tcl: %global use_tcl 1}
+%{?_with_gui: %global build_gui 1}
-%{?_with_server_name:%define server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_homedir:%define torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_server_name:%global server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_homedir:%global torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}
# did we find any --without options?
-%{?_without_rcp: %define use_rcp 0}
-%{?_without_tcl: %define use_tcl 0}
-%{?_without_gui: %define build_gui 0}
+%{?_without_rcp: %global use_rcp 0}
+%{?_without_tcl: %global use_tcl 0}
+%{?_without_gui: %global build_gui 0}
# Set up all options as disabled
-%define rcpflags --with-rcp=/usr/bin/scp
-%define tclflags --without-tcl
-%define guiflags --disable-gui
+%global rcpflags --with-rcp=/usr/bin/scp
+%global tclflags --without-tcl
+%global guiflags --disable-gui
# Enable options that we want
-%if %use_rcp
-%define rcpflags --with-rcp=mom_rcp
+%if %{use_rcp}
+%global rcpflags --with-rcp=mom_rcp
%endif
-%if %build_gui
-%define guiflags --enable-gui
+%if %{build_gui}
+%global guiflags --enable-gui
%endif
-%if %use_tcl
-%if %build_gui
-%define tclflags --with-tcl --with-tk
+%if %{use_tcl}
+%if %{build_gui}
+%global tclflags --with-tcl --with-tk
%else
-%define tclflags --with-tcl --without-tk
+%global tclflags --with-tcl --without-tk
%endif
%endif
# finish up the configs...
-%define server_nameflags --with-default-server=%{server_name}
-
-
-%define shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes. \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n %{server_nameflags}\\n %{tclflags}\\n %{guiflags}\\n %{rcpflags}\\n")
-
-
-Summary: Tera-scale Open-source Resource and QUEue manager
-Name: %{name}
-Version: %{version}
-Release: %{?snap:0.%{release}.%{snap}cvs}%{!?snap:%{release}}%{?dist}
-Source: torque-%{version}%{?snap:-snap.%snap}.tar.gz
-Source2: xpbs.desktop
-Source3: xpbsmon.desktop
-Source4: xpbs.png
-Source5: xpbsmon.png
-Source6: README-localhost
-Source7: pbs-config-multilib
-License: OpenPBS
-Group: System Environment/Daemons
-URL: http://www.clusterresources.com/products/torque/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
-Requires(posttrans): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Conflicts: pbspro, openpbs, openpbs-oscar
-Obsoletes: torque-localhost
-
-Patch0: torque-2.1.10-NI_MAXSERV.patch
-
-%if %use_tcl
-BuildRequires: tcl-devel
+%global server_nameflags --with-default-server=%{server_name}
+%global shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes. \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n %{server_nameflags}\\n %{tclflags}\\n %{guiflags}\\n %{rcpflags}\\n")
+
+Name: torque
+Version: 2.4.8
+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
+Source3: xpbsmon.desktop
+Source4: xpbs.png
+Source5: xpbsmon.png
+Source6: README-localhost
+Source7: pbs-config-multilib
+License: OpenPBS
+Group: System Environment/Daemons
+URL: http://www.clusterresources.com/products/torque/
+Provides: pbs = %{version}-%{release}
+BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
+Conflicts: pbspro, openpbs, openpbs-oscar
+Obsoletes: torque-localhost
+%if %{use_tcl}
+BuildRequires: tcl-devel
%endif
-%if %build_gui
-BuildRequires: tk-devel
+%if %{build_gui}
+BuildRequires: tk-devel
%else
-Obsoletes: torque-gui
+Obsoletes: torque-gui
%endif
-%if ! %use_rcp
-Requires: openssh-clients
+%if ! %{use_rcp}
+Requires: openssh-clients
%endif
%description
-%shared_description
+%{shared_description}
This package holds just a few shared files and directories.
+%package client
+Group: Applications/System
+Summary: Client part of TORQUE
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(posttrans): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
+Provides: pbs-client = %{version}-%{release}
-%prep
-%setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch0 -p1
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%description client
+%{shared_description}
+This package holds the command-line client programs.
+
+%package docs
+Group: Documentation
+Summary: Documentation files for TORQUE
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: pbs-docs = %{version}-%{release}
+
+%description docs
+%{shared_description}
+This package holds the documentation files.
+
+%package gui
+Group: Applications/System
+Summary: Graphical clients for TORQUE
+Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: xpbs = %{version}-%{release}
+Provides: xpbsmon = %{version}-%{release}
+Provides: %{name}-x11tools = %{version}-%{release}
+
+%description gui
+%{shared_description}
+This package holds the graphical clients.
+
+%package -n lib%{name}
+Summary: Run-time libs for programs which will use the %{name} library
+Group: Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n lib%{name}
+%{shared_description}
+This package includes the shared libraries necessary for running TORQUE
+programs.
+%package -n lib%{name}-devel
+Summary: Development tools for programs which will use the %{name} library
+Group: Development/Libraries
+Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n lib%{name}-devel
+%{shared_description}
+This package includes the header files and static libraries
+necessary for developing programs which will use %{name}.
+
+%package mom
+Group: System Environment/Daemons
+Summary: Node execution daemon for TORQUE
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: pbs-mom = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+
+%description mom
+%{shared_description}
+This package holds the execute daemon required on every node.
+
+%package pam
+Summary: PAM module for TORQUE MOM nodes
+Group: System Environment/Base
+
+%description pam
+%{shared_description}
+A simple PAM module to authorize users on PBS MOM nodes with a running job.
+
+%package scheduler
+Group: System Environment/Daemons
+Summary: Simple fifo scheduler for TORQUE
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: pbs-scheduler = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+
+%description scheduler
+%{shared_description}
+This package holds the fifo C scheduler.
+
+%package server
+Group: System Environment/Daemons
+Summary: The main part of TORQUE
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: pbs-server = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+
+%description server
+%shared_description
+This package holds the server.
+
+%prep
+%setup -q -n torque-%{version}%{?snap:-snap.%snap}
+install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
%build
+CFLAGS="%{optflags} -Wno-overlength-strings"
%configure --includedir=%{_includedir}/torque \
--with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
- --with-sendmail=/usr/sbin/sendmail \
+ --with-sendmail=%{_sbindir}/sendmail --disable-static \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
-%__cp -vf pbs-config-multilib pbs-config
-%__make %{?_smp_mflags}
-
-
+cp -vf pbs-config-multilib pbs-config
+make %{?_smp_mflags}
%install
-%__rm -rf "$RPM_BUILD_ROOT"
-%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+make DESTDIR=%{buildroot} INSTALL="install -p" install
# remove files we don't need
-%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
-%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
-%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
-touch -r pbs-config-multilib $RPM_BUILD_ROOT/%{_bindir}/pbs-config
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*/buildindex
+rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la}
+mkdir -p %{buildroot}%{_bindir}
+touch -r pbs-config-multilib %{buildroot}%{_bindir}/pbs-config
# install initscripts
-%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p %{buildroot}%{_initrddir}
for daemon in pbs_mom pbs_sched pbs_server; do
- %__sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
- -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
- -e 's|chkconfig: 345|chkconfig: -|' \
- < contrib/init.d/$daemon > $RPM_BUILD_ROOT%{_initrddir}/$daemon
- %__chmod 755 $RPM_BUILD_ROOT%{_initrddir}/$daemon
+ sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
+ -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
+ -e 's|chkconfig: 345|chkconfig: -|' \
+ < contrib/init.d/$daemon > %{buildroot}%{_initrddir}/$daemon
+ chmod 755 %{buildroot}%{_initrddir}/$daemon
done
%if %{build_gui}
# This is really trivial, but cleans up an rpmlint warning
-%__sed -i -e 's|%_lib/../||' $RPM_BUILD_ROOT%{_bindir}/xpbs
+sed -i -e 's|%{_lib}/../||' %{buildroot}%{_bindir}/xpbs
# install .desktop files and my ugly icons
-desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- xpbs.desktop
-desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- xpbsmon.desktop
-%__install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%__install -p -m0644 xpbs.png xpbsmon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
+desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbs.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbsmon.desktop
+install -d %{buildroot}%{_datadir}/pixmaps
+install -p -m0644 xpbs.png xpbsmon.png %{buildroot}%{_datadir}/pixmaps
%endif
-
# alternatives stuff
for bin in qalter qdel qhold qrls qselect qstat qsub
do
- mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-torque
- mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 \
- $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-torque.1
+ mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/${bin}-torque
+ mv %{buildroot}%{_mandir}/man1/${bin}.1 \
+ %{buildroot}%{_mandir}/man1/${bin}-torque.1
done
-
%clean
-%__rm -rf "$RPM_BUILD_ROOT"
-
+rm -rf %{buildroot}
%post
-if %__grep -q "PBS services" /etc/services;then
+if grep -q "PBS services" /etc/services;then
: PBS services already installed
else
cat<<-__EOF__>>/etc/services
@@ -209,133 +279,6 @@ else
__EOF__
fi
-
-%files
-%defattr(-, root, root)
-%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
-%config(noreplace) %{torquehomedir}/pbs_environment
-%config(noreplace) %{torquehomedir}/server_name
-%dir %{torquehomedir}
-%{torquehomedir}/aux
-%{torquehomedir}/spool
-
-
-%package docs
-Group: Documentation
-Summary: Documentation files for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-docs
-%description docs
-%shared_description
-This package holds the documentation files.
-
-%files docs
-%defattr(-, root, root)
-%doc doc/admin_guide.ps
-%{_mandir}/man*/*
-%exclude %{_mandir}/man1/qsub-torque.1.gz
-%exclude %{_mandir}/man1/qalter-torque.1.gz
-%exclude %{_mandir}/man1/qdel-torque.1.gz
-%exclude %{_mandir}/man1/qhold-torque.1.gz
-%exclude %{_mandir}/man1/qrls-torque.1.gz
-%exclude %{_mandir}/man1/qselect-torque.1.gz
-%exclude %{_mandir}/man1/qstat-torque.1.gz
-
-
-%package scheduler
-Group: System Environment/Daemons
-Summary: Simple fifo scheduler for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-scheduler
-%description scheduler
-%shared_description
-This package holds the fifo C scheduler.
-
-%files scheduler
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_sched
-%{_initrddir}/pbs_sched
-%dir %{torquehomedir}/sched_priv
-%config(noreplace) %{torquehomedir}/sched_priv/*
-%{torquehomedir}/sched_logs
-
-%post scheduler
-/sbin/chkconfig --add pbs_sched
-
-%preun scheduler
-if [ $1 -eq 0 ]; then
- /sbin/service pbs_sched stop
- /sbin/chkconfig --del pbs_sched
-fi
-
-
-%package server
-Group: System Environment/Daemons
-Summary: The main part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-server
-%description server
-%shared_description
-This package holds the server.
-
-%files server
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_server
-%attr(0755, root, root) %{_sbindir}/momctl
-%{_initrddir}/pbs_server
-%{torquehomedir}/server_logs
-%{torquehomedir}/server_priv
-
-%post server
-/sbin/chkconfig --add pbs_server
-
-%preun server
-if [ $1 -eq 0 ]; then
- /sbin/service pbs_server stop
- /sbin/chkconfig --del pbs_server
-fi
-
-
-%package mom
-Group: System Environment/Daemons
-Summary: Node execution daemon for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-mom
-%description mom
-%shared_description
-This package holds the execute daemon required on every node.
-
-%files mom
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_mom
-%{_initrddir}/pbs_mom
-%if %{use_rcp}
-%attr(4755 root root) %{_sbindir}/pbs_rcp
-%endif
-%{torquehomedir}/mom_priv
-%{torquehomedir}/mom_logs
-%{torquehomedir}/checkpoint
-%{torquehomedir}/undelivered
-
-%post mom
-/sbin/chkconfig --add pbs_mom
-
-%preun mom
-if [ $1 -eq 0 ]; then
- /sbin/service pbs_mom stop
- /sbin/chkconfig --del pbs_mom
-fi
-
-
-%package client
-Group: Applications/System
-Summary: Client part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-client
-%description client
-%shared_description
-This package holds the command-line client programs.
-
%posttrans client
/usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
--slave %{_mandir}/man1/qsub.1.gz qsub-man \
@@ -364,8 +307,47 @@ if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
fi
+%post -n lib%{name} -p /sbin/ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
+
+%post mom
+/sbin/chkconfig --add pbs_mom
+
+%preun mom
+if [ $1 -eq 0 ]; then
+ /sbin/service pbs_mom stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_mom
+fi
+
+%post scheduler
+/sbin/chkconfig --add pbs_sched
+
+%preun scheduler
+if [ $1 -eq 0 ]; then
+ /sbin/service pbs_sched stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_sched
+fi
+
+%post server
+/sbin/chkconfig --add pbs_server
+
+%preun server
+if [ $1 -eq 0 ]; then
+ /sbin/service pbs_server stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_server
+fi
+
+%files
+%defattr(-, root, root, -)
+%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
+%config(noreplace) %{torquehomedir}/pbs_environment
+%config(noreplace) %{torquehomedir}/server_name
+%dir %{torquehomedir}
+%{torquehomedir}/aux
+%{torquehomedir}/spool
+
%files client
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%{_bindir}/q*
%{_bindir}/chk_tree
%{_bindir}/hostn
@@ -373,11 +355,13 @@ fi
%{_bindir}/pbsdsh
%{_bindir}/pbsnodes
%{_bindir}/printjob
+%{_bindir}/printserverdb
%{_bindir}/printtracking
%{_bindir}/tracejob
-%attr(4755 root root) %{_sbindir}/pbs_iff
+%{_sbindir}/momctl
+%attr(4755, root, root) %{_sbindir}/pbs_iff
%{_sbindir}/pbs_demux
-%if %use_tcl
+%if %{use_tcl}
%{_bindir}/pbs_tclsh
%endif
%{_mandir}/man1/qsub-torque.1.gz
@@ -388,21 +372,21 @@ fi
%{_mandir}/man1/qselect-torque.1.gz
%{_mandir}/man1/qstat-torque.1.gz
-
-%package gui
-Group: Applications/System
-Summary: Graphical clients for TORQUE
-Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: xpbs xpbsmon
-Provides: %{name}-x11tools
-%description gui
-%shared_description
-This package holds the graphical clients.
-
+%files docs
+%defattr(-, root, root, -)
+%doc doc/admin_guide.ps
+%{_mandir}/man*/*
+%exclude %{_mandir}/man1/qsub-torque.1.gz
+%exclude %{_mandir}/man1/qalter-torque.1.gz
+%exclude %{_mandir}/man1/qdel-torque.1.gz
+%exclude %{_mandir}/man1/qhold-torque.1.gz
+%exclude %{_mandir}/man1/qrls-torque.1.gz
+%exclude %{_mandir}/man1/qselect-torque.1.gz
+%exclude %{_mandir}/man1/qstat-torque.1.gz
%if %{build_gui}
%files gui
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%{_bindir}/pbs_wish
%{_bindir}/xpbs
%{_bindir}/xpbsmon
@@ -412,56 +396,60 @@ This package holds the graphical clients.
%{_datadir}/pixmaps/*.png
%endif
-
-%package -n lib%{name}
-Summary: Run-time libs for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n lib%{name}
-%shared_description
-This package includes the shared libraries
-necessary for running TORQUE programs.
-
%files -n lib%{name}
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%{_libdir}/*.so.*
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
-
-%package -n lib%{name}-devel
-Summary: Development tools for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n lib%{name}-devel
-%shared_description
-This package includes the header files and static libraries
-necessary for developing programs which will use %{name}.
-
%files -n lib%{name}-devel
-%defattr(-, root, root)
-%{_libdir}/*.a
+%defattr(-, root, root, -)
%{_libdir}/*.so
%{_includedir}/torque
%{_bindir}/pbs-config
-%package pam
-Summary: PAM module for TORQUE MOM nodes
-Group: System Environment/Base
-
-%description pam
-%shared_description
-A simple PAM module to authorize users on PBS MOM nodes with a running job.
+%files mom
+%defattr(-, root, root, -)
+%{_sbindir}/pbs_mom
+%{_sbindir}/qnoded
+%{_sbindir}/pbs_demux
+%{_bindir}/pbs_track
+%{_initrddir}/pbs_mom
+%if %{use_rcp}
+%attr(4755, root, root) %{_sbindir}/pbs_rcp
+%endif
+%{torquehomedir}/mom_priv/
+%{torquehomedir}/mom_logs
+%{torquehomedir}/checkpoint
+%{torquehomedir}/undelivered
%files pam
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%doc src/pam/README.pam
/%{_lib}/security/pam_pbssimpleauth.so
+%files scheduler
+%defattr(-, root, root, -)
+%attr(0755, root, root) %{_sbindir}/pbs_sched
+%{_sbindir}/qschedd
+%{_initrddir}/pbs_sched
+%dir %{torquehomedir}/sched_priv
+%config(noreplace) %{torquehomedir}/sched_priv/*
+%{torquehomedir}/sched_logs
+
+%files server
+%defattr(-, root, root, -)
+%attr(0755, root, root) %{_sbindir}/pbs_server
+%attr(0755, root, root) %{_sbindir}/momctl
+%{_sbindir}/qserverd
+%{_initrddir}/pbs_server
+%{torquehomedir}/server_logs
+%{torquehomedir}/server_priv
%changelog
+* Wed Jun 2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.8-1
+- update to 2.4.8
+- drop static libs
+- cleanup spec file
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
cgit v0.10.2
>From f828f75cc31bb64c4f36818121124cdafaedc2c0 Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Wed, 14 Jul 2010 21:11:28 +0000
Subject: Something at least approching package guidelines.
diff --git a/README-localhost b/README-localhost
deleted file mode 100644
index c63a012..0000000
--- a/README-localhost
+++ /dev/null
@@ -1,20 +0,0 @@
-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:
-
-/sbin/chkconfig pbs_mom on
-/sbin/chkconfig pbs_server on
-/sbin/chkconfig pbs_sched on
-/bin/hostname --long > %{torquehomedir}/server_priv/nodes
-/bin/hostname --long > %{torquehomedir}/server_name
-service pbs_server start
-qmgr -c "s s scheduling=true"
-qmgr -c "c q batch queue_type=execution"
-qmgr -c "s q batch started=true"
-qmgr -c "s q batch enabled=true"
-qmgr -c "s q batch resources_default.nodes=1"
-qmgr -c "s q batch resources_default.walltime=3600"
-qmgr -c "s s default_queue=batch"
-service pbs_mom restart
-service pbs_sched restart
-
diff --git a/README.Fedora b/README.Fedora
new file mode 100644
index 0000000..0d82a1c
--- /dev/null
+++ b/README.Fedora
@@ -0,0 +1,71 @@
+This README describes how to get the most basic working
+torque service on a single host.
+
+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:
+
+
+1) Get your full hostname with
+
+# /bin/hostname --long
+
+e.g myhost.example.org
+
+2) Edit /etc/torque/server_name
+to contain the single line
+
+myhost.example.org
+
+3) Edit /etc/torque/mom/config
+to contain the single line
+
+$pbsserver myhost.example.org
+
+4) Create a torque serverdb file.
+# /usr/sbin/pbs_server -D -t create
+
+Warning this will remove any existing serverdb
+file located at /var/lib/torque/server_priv/serverdb
+
+You will have to Ctrl^C the pbs_server command, it will
+only take a moment to create this file.
+
+5) Start the pbs_server and configure it.
+service pbs_server start
+# qmgr -c "s s scheduling=true"
+# qmgr -c "c q batch queue_type=execution"
+# qmgr -c "s q batch started=true"
+# qmgr -c "s q batch enabled=true"
+# qmgr -c "s q batch resources_default.nodes=1"
+# qmgr -c "s q batch resources_default.walltime=3600"
+# qmgr -c "s s default_queue=batch"
+
+6) Add one batch worker to your pbs_server.
+
+# qmgr -c "c n myhost.example.org"
+
+7) Start the pbs_mom and pbs_sched deamons.
+
+# service pbs_mom start
+# service pbs_sched start
+
+8) Use chkconfig to start the services at boot time.
+
+# /sbin/chkconfig pbs_mom on
+# /sbin/chkconfig pbs_server on
+# /sbin/chkconfig pbs_sched on
+
+9) Submit a test job.
+As a user not as root run the following
+
+$ qsub <<EOF
+hostname
+echo "Hi I am a batch job running in torque"
+EOF
+
+
+
+
+
+
diff --git a/config b/config
new file mode 100644
index 0000000..3fae39d
--- /dev/null
+++ b/config
@@ -0,0 +1,2 @@
+# Configuration for pbs_mom.
+$pbsserver localhost
diff --git a/torque.spec b/torque.spec
index 5bdf4cb..6e22258 100644
--- a/torque.spec
+++ b/torque.spec
@@ -20,7 +20,7 @@
%global build_gui 1
# these are non-defaults, but fit better into most RPM-based systems
-%global torquehomedir %{_localstatedir}/torque
+%global torquehomedir %{_localstatedir}/lib/torque
# --with/--without processing
# first, error if conflicting options are used
@@ -65,150 +65,209 @@
# finish up the configs...
%global server_nameflags --with-default-server=%{server_name}
-%global shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes. \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n %{server_nameflags}\\n %{tclflags}\\n %{guiflags}\\n %{rcpflags}\\n")
-
-Name: torque
-Version: 2.4.8
-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
-Source3: xpbsmon.desktop
-Source4: xpbs.png
-Source5: xpbsmon.png
-Source6: README-localhost
-Source7: pbs-config-multilib
-License: OpenPBS
-Group: System Environment/Daemons
-URL: http://www.clusterresources.com/products/torque/
-Provides: pbs = %{version}-%{release}
-BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
-Conflicts: pbspro, openpbs, openpbs-oscar
-Obsoletes: torque-localhost
+
+Name: torque
+Version: 2.4.8
+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
+Source3: xpbsmon.desktop
+Source4: xpbs.png
+Source5: xpbsmon.png
+Source6: README.Fedora
+Source7: pbs-config-multilib
+Source8: config
+License: OpenPBS
+Group: System Environment/Daemons
+URL: http://www.clusterresources.com/products/torque/
+BuildRequires: desktop-file-utils
+BuildRequires: pam-devel
+BuildRequires: xauth
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
%if %{use_tcl}
-BuildRequires: tcl-devel
+BuildRequires: tcl-devel
%endif
%if %{build_gui}
-BuildRequires: tk-devel
-%else
-Obsoletes: torque-gui
-%endif
-%if ! %{use_rcp}
-Requires: openssh-clients
+BuildRequires: tk-devel
%endif
%description
-%{shared_description}
-This package holds just a few shared files and directories.
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
-%package client
-Group: Applications/System
-Summary: Client part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(posttrans): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Provides: pbs-client = %{version}-%{release}
+This package holds just a few shared files and directories.
+%package client
+Group: Applications/System
+Summary: Client part of TORQUE
+Requires: %{name}-libs = %{version}-%{release}
+Requires(posttrans): chkconfig
+Requires(preun): chkconfig
%description client
-%{shared_description}
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds the command-line client programs.
%package docs
-Group: Documentation
-Summary: Documentation files for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-docs = %{version}-%{release}
+Group: Documentation
+Summary: Documentation files for TORQUE
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description docs
-%{shared_description}
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds the documentation files.
%package gui
-Group: Applications/System
-Summary: Graphical clients for TORQUE
-Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: xpbs = %{version}-%{release}
-Provides: xpbsmon = %{version}-%{release}
-Provides: %{name}-x11tools = %{version}-%{release}
+Group: Applications/System
+Summary: Graphical clients for TORQUE
+Requires: torque-client = %{version}-%{release}
%description gui
-%{shared_description}
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds the graphical clients.
-%package -n lib%{name}
-Summary: Run-time libs for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%package libs
+Summary: Run-time libs for programs which will use the %{name} library
+Group: Development/Libraries
+Requires: torque = %{version}-%{release}
+Obsoletes: libtorque < 2.4.8-2
+Provides: libtorque = %{version}-%{release}
+
+%description libs
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
-%description -n lib%{name}
-%{shared_description}
This package includes the shared libraries necessary for running TORQUE
programs.
-%package -n lib%{name}-devel
-Summary: Development tools for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%package devel
+Summary: Development tools for programs which will use the %{name} library
+Group: Development/Libraries
+Requires: torque-libs = %{version}-%{release}
+Obsoletes: libtorque-devel < 2.4.8-2
+Provides: libtorque-devel = %{version}-%{release}
+
+%description devel
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
-%description -n lib%{name}-devel
-%{shared_description}
This package includes the header files and static libraries
necessary for developing programs which will use %{name}.
%package mom
-Group: System Environment/Daemons
-Summary: Node execution daemon for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-mom = %{version}-%{release}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
+Group: System Environment/Daemons
+Summary: Node execution daemon for TORQUE
+Requires: torque-libs = %{version}-%{release}
+%if ! %{use_rcp}
+Requires: openssh-clients
+%endif
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
%description mom
-%{shared_description}
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds the execute daemon required on every node.
%package pam
-Summary: PAM module for TORQUE MOM nodes
-Group: System Environment/Base
+Summary: PAM module for TORQUE MOM nodes
+Group: System Environment/Base
%description pam
-%{shared_description}
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
A simple PAM module to authorize users on PBS MOM nodes with a running job.
%package scheduler
-Group: System Environment/Daemons
-Summary: Simple fifo scheduler for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-scheduler = %{version}-%{release}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
+Group: System Environment/Daemons
+Summary: Simple fifo scheduler for TORQUE
+Requires: torque-libs = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
%description scheduler
-%{shared_description}
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds the fifo C scheduler.
%package server
-Group: System Environment/Daemons
-Summary: The main part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-server = %{version}-%{release}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
+Group: System Environment/Daemons
+Summary: The main part of TORQUE
+Requires: torque-libs = %{version}-%{release}
+%if ! %{use_rcp}
+Requires: openssh-server
+%endif
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
%description server
-%shared_description
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds the server.
%prep
-%setup -q -n torque-%{version}%{?snap:-snap.%snap}
-install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%setup -q
+install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
+ %{SOURCE6} %{SOURCE7} %{SOURCE8} .
+# rm x bit on some documentation.
+chmod 644 torque.setup
%build
CFLAGS="%{optflags} -Wno-overlength-strings"
@@ -217,9 +276,18 @@ CFLAGS="%{optflags} -Wno-overlength-strings"
--with-sendmail=%{_sbindir}/sendmail --disable-static \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
+
cp -vf pbs-config-multilib pbs-config
make %{?_smp_mflags}
+for daemon in pbs_mom pbs_sched pbs_server
+do
+sed -i -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
+ -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
+ -e 's|chkconfig: 345|chkconfig: -|' \
+ contrib/init.d/$daemon
+done
+
%install
make DESTDIR=%{buildroot} INSTALL="install -p" install
@@ -232,19 +300,14 @@ touch -r pbs-config-multilib %{buildroot}%{_bindir}/pbs-config
# install initscripts
mkdir -p %{buildroot}%{_initrddir}
-for daemon in pbs_mom pbs_sched pbs_server; do
- sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
- -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
- -e 's|chkconfig: 345|chkconfig: -|' \
- < contrib/init.d/$daemon > %{buildroot}%{_initrddir}/$daemon
- chmod 755 %{buildroot}%{_initrddir}/$daemon
-done
+install -p -m 755 contrib/init.d/pbs_mom %{buildroot}%{_initrddir}/pbs_mom
+install -p -m 755 contrib/init.d/pbs_sched %{buildroot}%{_initrddir}/pbs_sched
+install -p -m 755 contrib/init.d/pbs_server %{buildroot}%{_initrddir}/pbs_server
%if %{build_gui}
# This is really trivial, but cleans up an rpmlint warning
sed -i -e 's|%{_lib}/../||' %{buildroot}%{_bindir}/xpbs
-# install .desktop files and my ugly icons
desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbs.desktop
desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbsmon.desktop
install -d %{buildroot}%{_datadir}/pixmaps
@@ -259,6 +322,51 @@ do
%{buildroot}%{_mandir}/man1/${bin}-torque.1
done
+# Relocate configuration files.
+mkdir -p %{buildroot}%{_sysconfdir}/torque
+pushd %{buildroot}%{torquehomedir}
+mv pbs_environment %{buildroot}%{_sysconfdir}/torque
+mv server_name %{buildroot}%{_sysconfdir}/torque
+ln -s %{_sysconfdir}/torque/pbs_environment .
+ln -s %{_sysconfdir}/torque/server_name .
+popd
+
+# Relocate mom_logs to /var/log
+mkdir -p %{buildroot}%{_var}/log/torque
+pushd %{buildroot}%{torquehomedir}
+mv mom_logs %{buildroot}%{_var}/log/torque
+ln -s %{_var}/log/torque/mom_logs .
+popd
+
+# Install mom_priv/config file to /etc/torque/mom
+mkdir -p %{buildroot}%{_sysconfdir}/torque/mom
+install -p -m 644 config %{buildroot}%{_sysconfdir}/torque/mom/config
+pushd %{buildroot}%{torquehomedir}/mom_priv
+ln -s %{_sysconfdir}/torque/mom/config .
+popd
+
+# Install sched_config files to /etc/torque/sched
+mkdir -p %{buildroot}%{_sysconfdir}/torque/sched
+pushd %{buildroot}%{torquehomedir}/sched_priv
+for CONFIG in dedicated_time holidays resource_group sched_config ; do
+ mv $CONFIG %{buildroot}%{_sysconfdir}/torque/sched/.
+ ln -s %{_sysconfdir}/torque/sched/$CONFIG .
+done
+popd
+
+# Relocate sched_logs to /var/log
+pushd %{buildroot}%{torquehomedir}
+mv sched_logs %{buildroot}%{_var}/log/torque
+ln -s %{_var}/log/torque/sched_logs .
+popd
+
+# Relocate server_logs to /var/log
+pushd %{buildroot}%{torquehomedir}
+mv server_logs %{buildroot}%{_var}/log/torque
+ln -s %{_var}/log/torque/server_logs .
+popd
+
+
%clean
rm -rf %{buildroot}
@@ -266,17 +374,17 @@ rm -rf %{buildroot}
if grep -q "PBS services" /etc/services;then
: PBS services already installed
else
- cat<<-__EOF__>>/etc/services
- # Standard PBS services
- pbs 15001/tcp # pbs server (pbs_server)
- pbs 15001/udp # pbs server (pbs_server)
- pbs_mom 15002/tcp # mom to/from server
- pbs_mom 15002/udp # mom to/from server
- pbs_resmom 15003/tcp # mom resource management requests
- pbs_resmom 15003/udp # mom resource management requests
- pbs_sched 15004/tcp # scheduler
- pbs_sched 15004/udp # scheduler
- __EOF__
+ cat<<__EOF__>>/etc/services
+# Standard PBS services
+pbs 15001/tcp # pbs server (pbs_server)
+pbs 15001/udp # pbs server (pbs_server)
+pbs_mom 15002/tcp # mom to/from server
+pbs_mom 15002/udp # mom to/from server
+pbs_resmom 15003/tcp # mom resource management requests
+pbs_resmom 15003/udp # mom resource management requests
+pbs_sched 15004/tcp # scheduler
+pbs_sched 15004/udp # scheduler
+__EOF__
fi
%posttrans client
@@ -307,8 +415,8 @@ if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
fi
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post mom
/sbin/chkconfig --add pbs_mom
@@ -339,12 +447,17 @@ fi
%files
%defattr(-, root, root, -)
-%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
-%config(noreplace) %{torquehomedir}/pbs_environment
-%config(noreplace) %{torquehomedir}/server_name
-%dir %{torquehomedir}
-%{torquehomedir}/aux
-%{torquehomedir}/spool
+%doc README.torque torque.setup Release_Notes
+%doc CHANGELOG PBS_License.txt README.Fedora
+%dir %{torquehomedir}
+%dir %{torquehomedir}/aux
+%dir %{torquehomedir}/spool
+%dir %{torquehomedir}/undelivered
+%{torquehomedir}/pbs_environment
+%{torquehomedir}/server_name
+%config(noreplace) %{_sysconfdir}/torque/pbs_environment
+%config(noreplace) %{_sysconfdir}/torque/server_name
+
%files client
%defattr(-, root, root, -)
@@ -364,25 +477,97 @@ fi
%if %{use_tcl}
%{_bindir}/pbs_tclsh
%endif
-%{_mandir}/man1/qsub-torque.1.gz
-%{_mandir}/man1/qalter-torque.1.gz
-%{_mandir}/man1/qdel-torque.1.gz
-%{_mandir}/man1/qhold-torque.1.gz
-%{_mandir}/man1/qrls-torque.1.gz
-%{_mandir}/man1/qselect-torque.1.gz
-%{_mandir}/man1/qstat-torque.1.gz
+%{_mandir}/man1/qsub-torque.1.*
+%{_mandir}/man1/qalter-torque.1.*
+%{_mandir}/man1/qdel-torque.1.*
+%{_mandir}/man1/qhold-torque.1.*
+%{_mandir}/man1/qrls-torque.1.*
+%{_mandir}/man1/qselect-torque.1.*
+%{_mandir}/man1/qstat-torque.1.*
+
%files docs
%defattr(-, root, root, -)
%doc doc/admin_guide.ps
-%{_mandir}/man*/*
-%exclude %{_mandir}/man1/qsub-torque.1.gz
-%exclude %{_mandir}/man1/qalter-torque.1.gz
-%exclude %{_mandir}/man1/qdel-torque.1.gz
-%exclude %{_mandir}/man1/qhold-torque.1.gz
-%exclude %{_mandir}/man1/qrls-torque.1.gz
-%exclude %{_mandir}/man1/qselect-torque.1.gz
-%exclude %{_mandir}/man1/qstat-torque.1.gz
+%{_mandir}/man1/basl2c.1.*
+%{_mandir}/man1/nqs2pbs.1.*
+%{_mandir}/man1/pbs.1.*
+%{_mandir}/man1/pbsdsh.1.*
+%{_mandir}/man1/qchkpt.1.*
+%{_mandir}/man1/qmgr.1.*
+%{_mandir}/man1/qmove.1.*
+%{_mandir}/man1/qmsg.1.*
+%{_mandir}/man1/qorder.1.*
+%{_mandir}/man1/qrerun.1.*
+%{_mandir}/man1/qsig.1.*
+%{_mandir}/man1/xpbs.1.*
+%{_mandir}/man1/xpbsmon.1.*
+%{_mandir}/man3/pbs_alterjob.3.*
+%{_mandir}/man3/pbs_connect.3.*
+%{_mandir}/man3/pbs_default.3.*
+%{_mandir}/man3/pbs_deljob.3.*
+%{_mandir}/man3/pbs_disconnect.3.*
+%{_mandir}/man3/pbs_geterrmsg.3.*
+%{_mandir}/man3/pbs_holdjob.3.*
+%{_mandir}/man3/pbs_locate.3.*
+%{_mandir}/man3/pbs_manager.3.*
+%{_mandir}/man3/pbs_movejob.3.*
+%{_mandir}/man3/pbs_msgjob.3.*
+%{_mandir}/man3/pbs_orderjob.3.*
+%{_mandir}/man3/pbs_rerunjob.3.*
+%{_mandir}/man3/pbs_rescquery.3.*
+%{_mandir}/man3/pbs_rescreserve.3.*
+%{_mandir}/man3/pbs_rlsjob.3.*
+%{_mandir}/man3/pbs_runjob.3.*
+%{_mandir}/man3/pbs_selectjob.3.*
+%{_mandir}/man3/pbs_selstat.3.*
+%{_mandir}/man3/pbs_sigjob.3.*
+%{_mandir}/man3/pbs_stagein.3.*
+%{_mandir}/man3/pbs_statjob.3.*
+%{_mandir}/man3/pbs_statnode.3.*
+%{_mandir}/man3/pbs_statque.3.*
+%{_mandir}/man3/pbs_statserver.3.*
+%{_mandir}/man3/pbs_submit.3.*
+%{_mandir}/man3/pbs_terminate.3.*
+%{_mandir}/man3/rpp.3.*
+%{_mandir}/man3/tm.3.*
+%{_mandir}/man7/pbs_job_attributes.7.*
+%{_mandir}/man7/pbs_queue_attributes.7.*
+%{_mandir}/man7/pbs_resources.7.*
+%{_mandir}/man7/pbs_resources_aix4.7.*
+%{_mandir}/man7/pbs_resources_aix5.7.*
+%{_mandir}/man7/pbs_resources_darwin.7.*
+%{_mandir}/man7/pbs_resources_digitalunix.7.*
+%{_mandir}/man7/pbs_resources_freebsd.7.*
+%{_mandir}/man7/pbs_resources_fujitsu.7.*
+%{_mandir}/man7/pbs_resources_hpux10.7.*
+%{_mandir}/man7/pbs_resources_hpux11.7.*
+%{_mandir}/man7/pbs_resources_irix5.7.*
+%{_mandir}/man7/pbs_resources_irix6.7.*
+%{_mandir}/man7/pbs_resources_irix6array.7.*
+%{_mandir}/man7/pbs_resources_linux.7.*
+%{_mandir}/man7/pbs_resources_netbsd.7.*
+%{_mandir}/man7/pbs_resources_solaris5.7.*
+%{_mandir}/man7/pbs_resources_solaris7.7.*
+%{_mandir}/man7/pbs_resources_sp2.7.*
+%{_mandir}/man7/pbs_resources_sunos4.7.*
+%{_mandir}/man7/pbs_resources_unicos8.7.*
+%{_mandir}/man7/pbs_resources_unicosmk2.7.*
+%{_mandir}/man7/pbs_server_attributes.7.*
+%{_mandir}/man8/pbs_mom.8.*
+%{_mandir}/man8/pbs_sched.8.*
+%{_mandir}/man8/pbs_sched_basl.8.*
+%{_mandir}/man8/pbs_sched_cc.8.*
+%{_mandir}/man8/pbs_sched_tcl.8.*
+%{_mandir}/man8/pbs_server.8.*
+%{_mandir}/man8/pbsnodes.8.*
+%{_mandir}/man8/qdisable.8.*
+%{_mandir}/man8/qenable.8.*
+%{_mandir}/man8/qrun.8.*
+%{_mandir}/man8/qstart.8.*
+%{_mandir}/man8/qstop.8.*
+%{_mandir}/man8/qterm.8.*
+
%if %{build_gui}
%files gui
@@ -396,11 +581,11 @@ fi
%{_datadir}/pixmaps/*.png
%endif
-%files -n lib%{name}
+%files libs
%defattr(-, root, root, -)
%{_libdir}/*.so.*
-%files -n lib%{name}-devel
+%files devel
%defattr(-, root, root, -)
%{_libdir}/*.so
%{_includedir}/torque
@@ -416,10 +601,14 @@ fi
%if %{use_rcp}
%attr(4755, root, root) %{_sbindir}/pbs_rcp
%endif
-%{torquehomedir}/mom_priv/
+%{torquehomedir}/mom_priv
%{torquehomedir}/mom_logs
%{torquehomedir}/checkpoint
%{torquehomedir}/undelivered
+%dir %{_var}/log/torque
+%dir %{_var}/log/torque/mom_logs
+%dir %{_sysconfdir}/torque/mom
+%config(noreplace) %{_sysconfdir}/torque/mom/config
%files pam
%defattr(-, root, root, -)
@@ -434,6 +623,12 @@ fi
%dir %{torquehomedir}/sched_priv
%config(noreplace) %{torquehomedir}/sched_priv/*
%{torquehomedir}/sched_logs
+%dir %{_var}/log/torque/sched_logs
+%dir %{_sysconfdir}/torque/sched
+%config(noreplace) %{_sysconfdir}/torque/sched/dedicated_time
+%config(noreplace) %{_sysconfdir}/torque/sched/holidays
+%config(noreplace) %{_sysconfdir}/torque/sched/resource_group
+%config(noreplace) %{_sysconfdir}/torque/sched/sched_config
%files server
%defattr(-, root, root, -)
@@ -441,10 +636,29 @@ fi
%attr(0755, root, root) %{_sbindir}/momctl
%{_sbindir}/qserverd
%{_initrddir}/pbs_server
+%dir %{_var}/log/torque/server_logs
%{torquehomedir}/server_logs
%{torquehomedir}/server_priv
+
%changelog
+* Thu Jul 1 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-2
+- Set torquehome to /var/lib/torque rather than /var/torque
+- Drop provides and obsoletes since never present in Fedora/EPEL.
+- Don't use a variable for the description.
+- Split install of init.d scripts to build and install sections
+ as appropriate.
+- Mark docs subpackage as noarch.
+- Rename libtorque package to more normal torque-libs package.
+- Rename libtorque-devel package to more normal torque-devel package.
+- Remove the unused epoch and snapshot variables.
+- Have mom requires openssh-clients and server openssh-server
+- Have mom, sched and server log to /var/log/torque and symlinks
+- Move configurtion files to /etc/torque and symlink in expected.
+- Be more explicit about man page in the files section.
+- Rename README-localhost to README.Fedora to make it more obvious
+ it's related to this package.
+
* Wed Jun 2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.8-1
- update to 2.4.8
- drop static libs
--
cgit v0.10.2
>From 34762c2c8f3649f2e0284979531214aca5ab186f Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Wed, 14 Jul 2010 21:11:28 +0000
Subject: Something at least approching package guidelines.
diff --git a/.cvsignore b/.cvsignore
index 1f488fc..273924f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-torque-2.1.10.tar.gz
+torque-2.4.8.tar.gz
diff --git a/README-localhost b/README-localhost
deleted file mode 100644
index c63a012..0000000
--- a/README-localhost
+++ /dev/null
@@ -1,20 +0,0 @@
-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:
-
-/sbin/chkconfig pbs_mom on
-/sbin/chkconfig pbs_server on
-/sbin/chkconfig pbs_sched on
-/bin/hostname --long > %{torquehomedir}/server_priv/nodes
-/bin/hostname --long > %{torquehomedir}/server_name
-service pbs_server start
-qmgr -c "s s scheduling=true"
-qmgr -c "c q batch queue_type=execution"
-qmgr -c "s q batch started=true"
-qmgr -c "s q batch enabled=true"
-qmgr -c "s q batch resources_default.nodes=1"
-qmgr -c "s q batch resources_default.walltime=3600"
-qmgr -c "s s default_queue=batch"
-service pbs_mom restart
-service pbs_sched restart
-
diff --git a/README.Fedora b/README.Fedora
new file mode 100644
index 0000000..0d82a1c
--- /dev/null
+++ b/README.Fedora
@@ -0,0 +1,71 @@
+This README describes how to get the most basic working
+torque service on a single host.
+
+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:
+
+
+1) Get your full hostname with
+
+# /bin/hostname --long
+
+e.g myhost.example.org
+
+2) Edit /etc/torque/server_name
+to contain the single line
+
+myhost.example.org
+
+3) Edit /etc/torque/mom/config
+to contain the single line
+
+$pbsserver myhost.example.org
+
+4) Create a torque serverdb file.
+# /usr/sbin/pbs_server -D -t create
+
+Warning this will remove any existing serverdb
+file located at /var/lib/torque/server_priv/serverdb
+
+You will have to Ctrl^C the pbs_server command, it will
+only take a moment to create this file.
+
+5) Start the pbs_server and configure it.
+service pbs_server start
+# qmgr -c "s s scheduling=true"
+# qmgr -c "c q batch queue_type=execution"
+# qmgr -c "s q batch started=true"
+# qmgr -c "s q batch enabled=true"
+# qmgr -c "s q batch resources_default.nodes=1"
+# qmgr -c "s q batch resources_default.walltime=3600"
+# qmgr -c "s s default_queue=batch"
+
+6) Add one batch worker to your pbs_server.
+
+# qmgr -c "c n myhost.example.org"
+
+7) Start the pbs_mom and pbs_sched deamons.
+
+# service pbs_mom start
+# service pbs_sched start
+
+8) Use chkconfig to start the services at boot time.
+
+# /sbin/chkconfig pbs_mom on
+# /sbin/chkconfig pbs_server on
+# /sbin/chkconfig pbs_sched on
+
+9) Submit a test job.
+As a user not as root run the following
+
+$ qsub <<EOF
+hostname
+echo "Hi I am a batch job running in torque"
+EOF
+
+
+
+
+
+
diff --git a/sources b/sources
index 06832f8..c202166 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30d3366432ad3506278f884ba797e2b2 torque-2.3.10.tar.gz
+56170b7fce63fed9ed0cc83ee5bd3e3a torque-2.4.8.tar.gz
diff --git a/torque.spec b/torque.spec
index 4ab6002..6e22258 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,10 +1,3 @@
-
-# comment out snap if building a real release
-%define name torque
-%define version 2.3.10
-#%%define snap 200604251602
-%define release 1
-
# The following options are supported:
# --with server_name=hostname
# --with homedir=directory
@@ -12,26 +5,22 @@
# --with[out] gui
# --with[out] tcl
-
# Hrm, should we default to the name of the buildhost? That seems only
# slightly better than picking a hostname at random. This is exactly the kind
# of compile-time default that doesn't work well with distributable packages.
# Let's force the issue with the non-sensical "localhost".
-#
+#
# Note that "localhost" doesn't actually work. You must either define the
# correct hostname here, pass '--with server_name=foo' to rpmbuild, or be sure
# that $PBS_SERVER_HOME/server_name contains the correct hostname.
-%define server_name localhost
+%global server_name localhost
-# change as you wish
-%define use_rcp 0
-%define use_tcl 1
-%define build_gui 1
+%global use_rcp 0
+%global use_tcl 1
+%global build_gui 1
# these are non-defaults, but fit better into most RPM-based systems
-%define torquehomedir %_localstatedir/torque
-
-
+%global torquehomedir %{_localstatedir}/lib/torque
# --with/--without processing
# first, error if conflicting options are used
@@ -40,161 +29,352 @@
%{?_with_gui: %{?_without_gui: %{error: both _with_gui and _without_gui}}}
# did we find any --with options?
-%{?_with_rcp: %define use_rcp 1}
-%{?_with_tcl: %define use_tcl 1}
-%{?_with_gui: %define build_gui 1}
+%{?_with_rcp: %global use_rcp 1}
+%{?_with_tcl: %global use_tcl 1}
+%{?_with_gui: %global build_gui 1}
-%{?_with_server_name:%define server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_homedir:%define torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_server_name:%global server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_homedir:%global torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}
# did we find any --without options?
-%{?_without_rcp: %define use_rcp 0}
-%{?_without_tcl: %define use_tcl 0}
-%{?_without_gui: %define build_gui 0}
+%{?_without_rcp: %global use_rcp 0}
+%{?_without_tcl: %global use_tcl 0}
+%{?_without_gui: %global build_gui 0}
# Set up all options as disabled
-%define rcpflags --with-rcp=/usr/bin/scp
-%define tclflags --without-tcl
-%define guiflags --disable-gui
+%global rcpflags --with-rcp=/usr/bin/scp
+%global tclflags --without-tcl
+%global guiflags --disable-gui
# Enable options that we want
-%if %use_rcp
-%define rcpflags --with-rcp=mom_rcp
+%if %{use_rcp}
+%global rcpflags --with-rcp=mom_rcp
%endif
-%if %build_gui
-%define guiflags --enable-gui
+%if %{build_gui}
+%global guiflags --enable-gui
%endif
-%if %use_tcl
-%if %build_gui
-%define tclflags --with-tcl --with-tk
+%if %{use_tcl}
+%if %{build_gui}
+%global tclflags --with-tcl --with-tk
%else
-%define tclflags --with-tcl --without-tk
+%global tclflags --with-tcl --without-tk
%endif
%endif
# finish up the configs...
-%define server_nameflags --with-default-server=%{server_name}
-
-
-%define shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes. \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n %{server_nameflags}\\n %{tclflags}\\n %{guiflags}\\n %{rcpflags}\\n")
-
-
-Summary: Tera-scale Open-source Resource and QUEue manager
-Name: %{name}
-Version: %{version}
-Release: %{?snap:0.%{release}.%{snap}cvs}%{!?snap:%{release}}%{?dist}
-Source: torque-%{version}%{?snap:-snap.%snap}.tar.gz
-Source2: xpbs.desktop
-Source3: xpbsmon.desktop
-Source4: xpbs.png
-Source5: xpbsmon.png
-Source6: README-localhost
-Source7: pbs-config-multilib
-License: OpenPBS
-Group: System Environment/Daemons
-URL: http://www.clusterresources.com/products/torque/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: pbs
-BuildRequires: desktop-file-utils, pam-devel, xauth, readline-devel, ncurses-devel
-Requires(posttrans): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Conflicts: pbspro, openpbs, openpbs-oscar
-Obsoletes: torque-localhost
-
-%if %use_tcl
+%global server_nameflags --with-default-server=%{server_name}
+
+Name: torque
+Version: 2.4.8
+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
+Source3: xpbsmon.desktop
+Source4: xpbs.png
+Source5: xpbsmon.png
+Source6: README.Fedora
+Source7: pbs-config-multilib
+Source8: config
+License: OpenPBS
+Group: System Environment/Daemons
+URL: http://www.clusterresources.com/products/torque/
+BuildRequires: desktop-file-utils
+BuildRequires: pam-devel
+BuildRequires: xauth
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
+%if %{use_tcl}
BuildRequires: tcl-devel
%endif
-%if %build_gui
+%if %{build_gui}
BuildRequires: tk-devel
-%else
-Obsoletes: torque-gui
-%endif
-%if ! %use_rcp
-Requires: openssh-clients
%endif
%description
-%shared_description
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
This package holds just a few shared files and directories.
+%package client
+Group: Applications/System
+Summary: Client part of TORQUE
+Requires: %{name}-libs = %{version}-%{release}
+Requires(posttrans): chkconfig
+Requires(preun): chkconfig
-%prep
-%setup -q -n torque-%{version}%{?snap:-snap.%snap}
+%description client
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package holds the command-line client programs.
+
+%package docs
+Group: Documentation
+Summary: Documentation files for TORQUE
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description docs
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package holds the documentation files.
+
+%package gui
+Group: Applications/System
+Summary: Graphical clients for TORQUE
+Requires: torque-client = %{version}-%{release}
+
+%description gui
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package holds the graphical clients.
-%__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%package libs
+Summary: Run-time libs for programs which will use the %{name} library
+Group: Development/Libraries
+Requires: torque = %{version}-%{release}
+Obsoletes: libtorque < 2.4.8-2
+Provides: libtorque = %{version}-%{release}
+
+%description libs
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package includes the shared libraries necessary for running TORQUE
+programs.
+
+%package devel
+Summary: Development tools for programs which will use the %{name} library
+Group: Development/Libraries
+Requires: torque-libs = %{version}-%{release}
+Obsoletes: libtorque-devel < 2.4.8-2
+Provides: libtorque-devel = %{version}-%{release}
+
+%description devel
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+This package includes the header files and static libraries
+necessary for developing programs which will use %{name}.
+
+%package mom
+Group: System Environment/Daemons
+Summary: Node execution daemon for TORQUE
+Requires: torque-libs = %{version}-%{release}
+%if ! %{use_rcp}
+Requires: openssh-clients
+%endif
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+
+%description mom
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package holds the execute daemon required on every node.
+
+%package pam
+Summary: PAM module for TORQUE MOM nodes
+Group: System Environment/Base
+
+%description pam
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+A simple PAM module to authorize users on PBS MOM nodes with a running job.
+
+%package scheduler
+Group: System Environment/Daemons
+Summary: Simple fifo scheduler for TORQUE
+Requires: torque-libs = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+%description scheduler
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package holds the fifo C scheduler.
+
+%package server
+Group: System Environment/Daemons
+Summary: The main part of TORQUE
+Requires: torque-libs = %{version}-%{release}
+%if ! %{use_rcp}
+Requires: openssh-server
+%endif
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+%description server
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+This package holds the server.
+
+%prep
+%setup -q
+install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
+ %{SOURCE6} %{SOURCE7} %{SOURCE8} .
+# rm x bit on some documentation.
+chmod 644 torque.setup
%build
-%configure --disable-gcc-warnings \
- --includedir=%{_includedir}/torque \
+CFLAGS="%{optflags} -Wno-overlength-strings"
+%configure --includedir=%{_includedir}/torque \
--with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
- --with-sendmail=/usr/sbin/sendmail \
+ --with-sendmail=%{_sbindir}/sendmail --disable-static \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
-%__cp -vf pbs-config-multilib pbs-config
-%__make %{?_smp_mflags}
-
+cp -vf pbs-config-multilib pbs-config
+make %{?_smp_mflags}
+
+for daemon in pbs_mom pbs_sched pbs_server
+do
+sed -i -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
+ -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
+ -e 's|chkconfig: 345|chkconfig: -|' \
+ contrib/init.d/$daemon
+done
%install
-%__rm -rf "$RPM_BUILD_ROOT"
-%__make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+make DESTDIR=%{buildroot} INSTALL="install -p" install
# remove files we don't need
-%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
-%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex
-%__rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_pbssimpleauth.{a,la}
-touch -r pbs-config-multilib $RPM_BUILD_ROOT/%{_bindir}/pbs-config
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*/buildindex
+rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la}
+mkdir -p %{buildroot}%{_bindir}
+touch -r pbs-config-multilib %{buildroot}%{_bindir}/pbs-config
# install initscripts
-%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
-for daemon in pbs_mom pbs_sched pbs_server; do
- %__sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
- -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
- -e 's|chkconfig: 345|chkconfig: -|' \
- < contrib/init.d/$daemon > $RPM_BUILD_ROOT%{_initrddir}/$daemon
- %__chmod 755 $RPM_BUILD_ROOT%{_initrddir}/$daemon
-done
+mkdir -p %{buildroot}%{_initrddir}
+install -p -m 755 contrib/init.d/pbs_mom %{buildroot}%{_initrddir}/pbs_mom
+install -p -m 755 contrib/init.d/pbs_sched %{buildroot}%{_initrddir}/pbs_sched
+install -p -m 755 contrib/init.d/pbs_server %{buildroot}%{_initrddir}/pbs_server
%if %{build_gui}
# This is really trivial, but cleans up an rpmlint warning
-%__sed -i -e 's|%_lib/../||' $RPM_BUILD_ROOT%{_bindir}/xpbs
-
-# install .desktop files and my ugly icons
-desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- xpbs.desktop
-desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- xpbsmon.desktop
-%__install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%__install -p -m0644 xpbs.png xpbsmon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+sed -i -e 's|%{_lib}/../||' %{buildroot}%{_bindir}/xpbs
+desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbs.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications xpbsmon.desktop
+install -d %{buildroot}%{_datadir}/pixmaps
+install -p -m0644 xpbs.png xpbsmon.png %{buildroot}%{_datadir}/pixmaps
%endif
-
# alternatives stuff
for bin in qalter qdel qhold qrls qselect qstat qsub
do
- mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-torque
- mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 \
- $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-torque.1
+ mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/${bin}-torque
+ mv %{buildroot}%{_mandir}/man1/${bin}.1 \
+ %{buildroot}%{_mandir}/man1/${bin}-torque.1
done
+# Relocate configuration files.
+mkdir -p %{buildroot}%{_sysconfdir}/torque
+pushd %{buildroot}%{torquehomedir}
+mv pbs_environment %{buildroot}%{_sysconfdir}/torque
+mv server_name %{buildroot}%{_sysconfdir}/torque
+ln -s %{_sysconfdir}/torque/pbs_environment .
+ln -s %{_sysconfdir}/torque/server_name .
+popd
+
+# Relocate mom_logs to /var/log
+mkdir -p %{buildroot}%{_var}/log/torque
+pushd %{buildroot}%{torquehomedir}
+mv mom_logs %{buildroot}%{_var}/log/torque
+ln -s %{_var}/log/torque/mom_logs .
+popd
+
+# Install mom_priv/config file to /etc/torque/mom
+mkdir -p %{buildroot}%{_sysconfdir}/torque/mom
+install -p -m 644 config %{buildroot}%{_sysconfdir}/torque/mom/config
+pushd %{buildroot}%{torquehomedir}/mom_priv
+ln -s %{_sysconfdir}/torque/mom/config .
+popd
+
+# Install sched_config files to /etc/torque/sched
+mkdir -p %{buildroot}%{_sysconfdir}/torque/sched
+pushd %{buildroot}%{torquehomedir}/sched_priv
+for CONFIG in dedicated_time holidays resource_group sched_config ; do
+ mv $CONFIG %{buildroot}%{_sysconfdir}/torque/sched/.
+ ln -s %{_sysconfdir}/torque/sched/$CONFIG .
+done
+popd
-%clean
-%__rm -rf "$RPM_BUILD_ROOT"
+# Relocate sched_logs to /var/log
+pushd %{buildroot}%{torquehomedir}
+mv sched_logs %{buildroot}%{_var}/log/torque
+ln -s %{_var}/log/torque/sched_logs .
+popd
+# Relocate server_logs to /var/log
+pushd %{buildroot}%{torquehomedir}
+mv server_logs %{buildroot}%{_var}/log/torque
+ln -s %{_var}/log/torque/server_logs .
+popd
+
+
+%clean
+rm -rf %{buildroot}
%post
-if %__grep -q "PBS services" /etc/services;then
+if grep -q "PBS services" /etc/services;then
: PBS services already installed
else
- cat<<-__EOF__>>/etc/services
+ cat<<__EOF__>>/etc/services
# Standard PBS services
pbs 15001/tcp # pbs server (pbs_server)
pbs 15001/udp # pbs server (pbs_server)
@@ -207,137 +387,6 @@ pbs_sched 15004/udp # scheduler
__EOF__
fi
-
-%files
-%defattr(-, root, root)
-%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
-%config(noreplace) %{torquehomedir}/pbs_environment
-%config(noreplace) %{torquehomedir}/server_name
-%dir %{torquehomedir}
-%{torquehomedir}/aux
-%{torquehomedir}/spool
-
-
-%package docs
-Group: Documentation
-Summary: Documentation files for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-docs
-%description docs
-%shared_description
-This package holds the documentation files.
-
-%files docs
-%defattr(-, root, root)
-%doc doc/admin_guide.ps
-%{_mandir}/man*/*
-%exclude %{_mandir}/man1/qsub-torque.1.gz
-%exclude %{_mandir}/man1/qalter-torque.1.gz
-%exclude %{_mandir}/man1/qdel-torque.1.gz
-%exclude %{_mandir}/man1/qhold-torque.1.gz
-%exclude %{_mandir}/man1/qrls-torque.1.gz
-%exclude %{_mandir}/man1/qselect-torque.1.gz
-%exclude %{_mandir}/man1/qstat-torque.1.gz
-
-
-%package scheduler
-Group: System Environment/Daemons
-Summary: Simple fifo scheduler for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-scheduler
-%description scheduler
-%shared_description
-This package holds the fifo C scheduler.
-
-%files scheduler
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_sched
-%attr(0755, root, root) %{_sbindir}/qschedd
-%{_initrddir}/pbs_sched
-%dir %{torquehomedir}/sched_priv
-%config(noreplace) %{torquehomedir}/sched_priv/*
-%{torquehomedir}/sched_logs
-
-%post scheduler
-/sbin/chkconfig --add pbs_sched
-
-%preun scheduler
-if [ $1 -eq 0 ]; then
- /sbin/service pbs_sched stop
- /sbin/chkconfig --del pbs_sched
-fi
-
-
-%package server
-Group: System Environment/Daemons
-Summary: The main part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-server
-%description server
-%shared_description
-This package holds the server.
-
-%files server
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_server
-%attr(0755, root, root) %{_sbindir}/qserverd
-%attr(0755, root, root) %{_sbindir}/momctl
-%{_initrddir}/pbs_server
-%{torquehomedir}/server_logs
-%{torquehomedir}/server_priv
-
-%post server
-/sbin/chkconfig --add pbs_server
-
-%preun server
-if [ $1 -eq 0 ]; then
- /sbin/service pbs_server stop
- /sbin/chkconfig --del pbs_server
-fi
-
-
-%package mom
-Group: System Environment/Daemons
-Summary: Node execution daemon for TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-mom
-%description mom
-%shared_description
-This package holds the execute daemon required on every node.
-
-%files mom
-%defattr(-, root, root)
-%attr(0755, root, root) %{_sbindir}/pbs_mom
-%attr(0755, root, root) %{_sbindir}/qnoded
-%attr(0755, root, root) %{_bindir}/pbs_track
-%{_initrddir}/pbs_mom
-%if %{use_rcp}
-%attr(4755 root root) %{_sbindir}/pbs_rcp
-%endif
-%{torquehomedir}/mom_priv
-%{torquehomedir}/mom_logs
-%{torquehomedir}/checkpoint
-%{torquehomedir}/undelivered
-
-%post mom
-/sbin/chkconfig --add pbs_mom
-
-%preun mom
-if [ $1 -eq 0 ]; then
- /sbin/service pbs_mom stop
- /sbin/chkconfig --del pbs_mom
-fi
-
-
-%package client
-Group: Applications/System
-Summary: Client part of TORQUE
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: pbs-client
-%description client
-%shared_description
-This package holds the command-line client programs.
-
%posttrans client
/usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
--slave %{_mandir}/man1/qsub.1.gz qsub-man \
@@ -366,8 +415,52 @@ if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
fi
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%post mom
+/sbin/chkconfig --add pbs_mom
+
+%preun mom
+if [ $1 -eq 0 ]; then
+ /sbin/service pbs_mom stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_mom
+fi
+
+%post scheduler
+/sbin/chkconfig --add pbs_sched
+
+%preun scheduler
+if [ $1 -eq 0 ]; then
+ /sbin/service pbs_sched stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_sched
+fi
+
+%post server
+/sbin/chkconfig --add pbs_server
+
+%preun server
+if [ $1 -eq 0 ]; then
+ /sbin/service pbs_server stop >/dev/null 2>&1
+ /sbin/chkconfig --del pbs_server
+fi
+
+%files
+%defattr(-, root, root, -)
+%doc README.torque torque.setup Release_Notes
+%doc CHANGELOG PBS_License.txt README.Fedora
+%dir %{torquehomedir}
+%dir %{torquehomedir}/aux
+%dir %{torquehomedir}/spool
+%dir %{torquehomedir}/undelivered
+%{torquehomedir}/pbs_environment
+%{torquehomedir}/server_name
+%config(noreplace) %{_sysconfdir}/torque/pbs_environment
+%config(noreplace) %{_sysconfdir}/torque/server_name
+
+
%files client
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%{_bindir}/q*
%{_bindir}/chk_tree
%{_bindir}/hostn
@@ -375,37 +468,110 @@ fi
%{_bindir}/pbsdsh
%{_bindir}/pbsnodes
%{_bindir}/printjob
-%{_bindir}/printtracking
%{_bindir}/printserverdb
+%{_bindir}/printtracking
%{_bindir}/tracejob
-%attr(4755 root root) %{_sbindir}/pbs_iff
+%{_sbindir}/momctl
+%attr(4755, root, root) %{_sbindir}/pbs_iff
%{_sbindir}/pbs_demux
-%if %use_tcl
+%if %{use_tcl}
%{_bindir}/pbs_tclsh
%endif
-%{_mandir}/man1/qsub-torque.1.gz
-%{_mandir}/man1/qalter-torque.1.gz
-%{_mandir}/man1/qdel-torque.1.gz
-%{_mandir}/man1/qhold-torque.1.gz
-%{_mandir}/man1/qrls-torque.1.gz
-%{_mandir}/man1/qselect-torque.1.gz
-%{_mandir}/man1/qstat-torque.1.gz
+%{_mandir}/man1/qsub-torque.1.*
+%{_mandir}/man1/qalter-torque.1.*
+%{_mandir}/man1/qdel-torque.1.*
+%{_mandir}/man1/qhold-torque.1.*
+%{_mandir}/man1/qrls-torque.1.*
+%{_mandir}/man1/qselect-torque.1.*
+%{_mandir}/man1/qstat-torque.1.*
-%package gui
-Group: Applications/System
-Summary: Graphical clients for TORQUE
-Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: xpbs xpbsmon
-Provides: %{name}-x11tools
-%description gui
-%shared_description
-This package holds the graphical clients.
+%files docs
+%defattr(-, root, root, -)
+%doc doc/admin_guide.ps
+%{_mandir}/man1/basl2c.1.*
+%{_mandir}/man1/nqs2pbs.1.*
+%{_mandir}/man1/pbs.1.*
+%{_mandir}/man1/pbsdsh.1.*
+%{_mandir}/man1/qchkpt.1.*
+%{_mandir}/man1/qmgr.1.*
+%{_mandir}/man1/qmove.1.*
+%{_mandir}/man1/qmsg.1.*
+%{_mandir}/man1/qorder.1.*
+%{_mandir}/man1/qrerun.1.*
+%{_mandir}/man1/qsig.1.*
+%{_mandir}/man1/xpbs.1.*
+%{_mandir}/man1/xpbsmon.1.*
+%{_mandir}/man3/pbs_alterjob.3.*
+%{_mandir}/man3/pbs_connect.3.*
+%{_mandir}/man3/pbs_default.3.*
+%{_mandir}/man3/pbs_deljob.3.*
+%{_mandir}/man3/pbs_disconnect.3.*
+%{_mandir}/man3/pbs_geterrmsg.3.*
+%{_mandir}/man3/pbs_holdjob.3.*
+%{_mandir}/man3/pbs_locate.3.*
+%{_mandir}/man3/pbs_manager.3.*
+%{_mandir}/man3/pbs_movejob.3.*
+%{_mandir}/man3/pbs_msgjob.3.*
+%{_mandir}/man3/pbs_orderjob.3.*
+%{_mandir}/man3/pbs_rerunjob.3.*
+%{_mandir}/man3/pbs_rescquery.3.*
+%{_mandir}/man3/pbs_rescreserve.3.*
+%{_mandir}/man3/pbs_rlsjob.3.*
+%{_mandir}/man3/pbs_runjob.3.*
+%{_mandir}/man3/pbs_selectjob.3.*
+%{_mandir}/man3/pbs_selstat.3.*
+%{_mandir}/man3/pbs_sigjob.3.*
+%{_mandir}/man3/pbs_stagein.3.*
+%{_mandir}/man3/pbs_statjob.3.*
+%{_mandir}/man3/pbs_statnode.3.*
+%{_mandir}/man3/pbs_statque.3.*
+%{_mandir}/man3/pbs_statserver.3.*
+%{_mandir}/man3/pbs_submit.3.*
+%{_mandir}/man3/pbs_terminate.3.*
+%{_mandir}/man3/rpp.3.*
+%{_mandir}/man3/tm.3.*
+%{_mandir}/man7/pbs_job_attributes.7.*
+%{_mandir}/man7/pbs_queue_attributes.7.*
+%{_mandir}/man7/pbs_resources.7.*
+%{_mandir}/man7/pbs_resources_aix4.7.*
+%{_mandir}/man7/pbs_resources_aix5.7.*
+%{_mandir}/man7/pbs_resources_darwin.7.*
+%{_mandir}/man7/pbs_resources_digitalunix.7.*
+%{_mandir}/man7/pbs_resources_freebsd.7.*
+%{_mandir}/man7/pbs_resources_fujitsu.7.*
+%{_mandir}/man7/pbs_resources_hpux10.7.*
+%{_mandir}/man7/pbs_resources_hpux11.7.*
+%{_mandir}/man7/pbs_resources_irix5.7.*
+%{_mandir}/man7/pbs_resources_irix6.7.*
+%{_mandir}/man7/pbs_resources_irix6array.7.*
+%{_mandir}/man7/pbs_resources_linux.7.*
+%{_mandir}/man7/pbs_resources_netbsd.7.*
+%{_mandir}/man7/pbs_resources_solaris5.7.*
+%{_mandir}/man7/pbs_resources_solaris7.7.*
+%{_mandir}/man7/pbs_resources_sp2.7.*
+%{_mandir}/man7/pbs_resources_sunos4.7.*
+%{_mandir}/man7/pbs_resources_unicos8.7.*
+%{_mandir}/man7/pbs_resources_unicosmk2.7.*
+%{_mandir}/man7/pbs_server_attributes.7.*
+%{_mandir}/man8/pbs_mom.8.*
+%{_mandir}/man8/pbs_sched.8.*
+%{_mandir}/man8/pbs_sched_basl.8.*
+%{_mandir}/man8/pbs_sched_cc.8.*
+%{_mandir}/man8/pbs_sched_tcl.8.*
+%{_mandir}/man8/pbs_server.8.*
+%{_mandir}/man8/pbsnodes.8.*
+%{_mandir}/man8/qdisable.8.*
+%{_mandir}/man8/qenable.8.*
+%{_mandir}/man8/qrun.8.*
+%{_mandir}/man8/qstart.8.*
+%{_mandir}/man8/qstop.8.*
+%{_mandir}/man8/qterm.8.*
%if %{build_gui}
%files gui
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%{_bindir}/pbs_wish
%{_bindir}/xpbs
%{_bindir}/xpbsmon
@@ -415,71 +581,89 @@ This package holds the graphical clients.
%{_datadir}/pixmaps/*.png
%endif
-
-%package -n lib%{name}
-Summary: Run-time libs for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n lib%{name}
-%shared_description
-This package includes the shared libraries
-necessary for running TORQUE programs.
-
-%files -n lib%{name}
-%defattr(-, root, root)
+%files libs
+%defattr(-, root, root, -)
%{_libdir}/*.so.*
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
-
-%package -n lib%{name}-devel
-Summary: Development tools for programs which will use the %{name} library
-Group: Development/Libraries
-Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n lib%{name}-devel
-%shared_description
-This package includes the header files and static libraries
-necessary for developing programs which will use %{name}.
-
-%files -n lib%{name}-devel
-%defattr(-, root, root)
-%{_libdir}/*.a
+%files devel
+%defattr(-, root, root, -)
%{_libdir}/*.so
%{_includedir}/torque
%{_bindir}/pbs-config
-%package pam
-Summary: PAM module for TORQUE MOM nodes
-Group: System Environment/Base
-
-%description pam
-%shared_description
-A simple PAM module to authorize users on PBS MOM nodes with a running job.
+%files mom
+%defattr(-, root, root, -)
+%{_sbindir}/pbs_mom
+%{_sbindir}/qnoded
+%{_sbindir}/pbs_demux
+%{_bindir}/pbs_track
+%{_initrddir}/pbs_mom
+%if %{use_rcp}
+%attr(4755, root, root) %{_sbindir}/pbs_rcp
+%endif
+%{torquehomedir}/mom_priv
+%{torquehomedir}/mom_logs
+%{torquehomedir}/checkpoint
+%{torquehomedir}/undelivered
+%dir %{_var}/log/torque
+%dir %{_var}/log/torque/mom_logs
+%dir %{_sysconfdir}/torque/mom
+%config(noreplace) %{_sysconfdir}/torque/mom/config
%files pam
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%doc src/pam/README.pam
/%{_lib}/security/pam_pbssimpleauth.so
+%files scheduler
+%defattr(-, root, root, -)
+%attr(0755, root, root) %{_sbindir}/pbs_sched
+%{_sbindir}/qschedd
+%{_initrddir}/pbs_sched
+%dir %{torquehomedir}/sched_priv
+%config(noreplace) %{torquehomedir}/sched_priv/*
+%{torquehomedir}/sched_logs
+%dir %{_var}/log/torque/sched_logs
+%dir %{_sysconfdir}/torque/sched
+%config(noreplace) %{_sysconfdir}/torque/sched/dedicated_time
+%config(noreplace) %{_sysconfdir}/torque/sched/holidays
+%config(noreplace) %{_sysconfdir}/torque/sched/resource_group
+%config(noreplace) %{_sysconfdir}/torque/sched/sched_config
+
+%files server
+%defattr(-, root, root, -)
+%attr(0755, root, root) %{_sbindir}/pbs_server
+%attr(0755, root, root) %{_sbindir}/momctl
+%{_sbindir}/qserverd
+%{_initrddir}/pbs_server
+%dir %{_var}/log/torque/server_logs
+%{torquehomedir}/server_logs
+%{torquehomedir}/server_priv
+
%changelog
-* Fri Feb 12 2010 Steve Traylen <steve.traylen at cern.ch> - 2.3.10-1
-- New upstream 2.3.10
-
-* Tue Jan 19 2010 Steve Traylen <steve.traylen at cern.ch> - 2.3.9-1
-- New upstream 2.3.9
-* Thu Dec 3 2009 Steve Traylen <steve.traylen at cern.ch> - 2.3.8-1
-- Updated to upstream 2.3.8
-- First EPEL build.
-- Add new commands to package.
- /usr/bin/pbs_track
- /usr/bin/printserverdb
- /usr/sbin/qnoded
- /usr/sbin/qschedd
- /usr/sbin/qserverd
-- Remove torque-2.1.10-NI_MAXSERV.patch as not needed any more.
+* Thu Jul 1 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-2
+- Set torquehome to /var/lib/torque rather than /var/torque
+- Drop provides and obsoletes since never present in Fedora/EPEL.
+- Don't use a variable for the description.
+- Split install of init.d scripts to build and install sections
+ as appropriate.
+- Mark docs subpackage as noarch.
+- Rename libtorque package to more normal torque-libs package.
+- Rename libtorque-devel package to more normal torque-devel package.
+- Remove the unused epoch and snapshot variables.
+- Have mom requires openssh-clients and server openssh-server
+- Have mom, sched and server log to /var/log/torque and symlinks
+- Move configurtion files to /etc/torque and symlink in expected.
+- Be more explicit about man page in the files section.
+- Rename README-localhost to README.Fedora to make it more obvious
+ it's related to this package.
+
+* Wed Jun 2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.8-1
+- update to 2.4.8
+- drop static libs
+- cleanup spec file
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.10-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
cgit v0.10.2
>From bb8d3f2f830edf7ac3063f2f6d1b093903d150c1 Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Wed, 14 Jul 2010 21:18:58 +0000
Subject: forgot to add config on EL-6 branch.
diff --git a/torque.spec b/torque.spec
index 6e22258..702920d 100644
--- a/torque.spec
+++ b/torque.spec
@@ -642,6 +642,9 @@ fi
%changelog
+* Wed Jul 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-3
+- Rebuild for cvs mistake.
+
* Thu Jul 1 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-2
- Set torquehome to /var/lib/torque rather than /var/torque
- Drop provides and obsoletes since never present in Fedora/EPEL.
--
cgit v0.10.2
>From e2529dbda68a3c04ff7617bec391aba1b73e68e9 Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Wed, 14 Jul 2010 21:18:58 +0000
Subject: forgot to add config on EL-6 branch.
diff --git a/config b/config
new file mode 100644
index 0000000..3fae39d
--- /dev/null
+++ b/config
@@ -0,0 +1,2 @@
+# Configuration for pbs_mom.
+$pbsserver localhost
diff --git a/torque.spec b/torque.spec
index 6e22258..702920d 100644
--- a/torque.spec
+++ b/torque.spec
@@ -642,6 +642,9 @@ fi
%changelog
+* Wed Jul 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-3
+- Rebuild for cvs mistake.
+
* Thu Jul 1 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-2
- Set torquehome to /var/lib/torque rather than /var/torque
- Drop provides and obsoletes since never present in Fedora/EPEL.
--
cgit v0.10.2
>From b7d723f9085ca1d109d2793e64d78a4df8777700 Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Wed, 14 Jul 2010 21:20:31 +0000
Subject: and up release
diff --git a/torque.spec b/torque.spec
index 702920d..e29beae 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.4.8
-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
--
cgit v0.10.2
>From df36db9efe94d5125cd714531668b6e748e95030 Mon Sep 17 00:00:00 2001
From: stevetraylen <stevetraylen at fedoraproject.org>
Date: Wed, 14 Jul 2010 21:20:31 +0000
Subject: and up release
diff --git a/torque.spec b/torque.spec
index 702920d..e29beae 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.4.8
-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
--
cgit v0.10.2
>From 1b1b6350e86992c3ad98625483d47e2643d9e244 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:22:22 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 273924f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-torque-2.4.8.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..273924f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+torque-2.4.8.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2ba24c0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: torque
-# $Id: Makefile,v 1.1 2006/04/18 02:09:21 garrick Exp $
-NAME := torque
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--
cgit v0.10.2
>From 6a65143cf4bc66eeafd12b1b721342aeb52a8502 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:22:25 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 273924f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-torque-2.4.8.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..273924f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+torque-2.4.8.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2ba24c0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: torque
-# $Id: Makefile,v 1.1 2006/04/18 02:09:21 garrick Exp $
-NAME := torque
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 46381b9..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-6
--
cgit v0.10.2
>From e8c42a64f43c457cef7752df4231683a42d38a91 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 10 Aug 2010 20:30:03 +0200
Subject: Upsteam to 2.5.1
diff --git a/.gitignore b/.gitignore
index 273924f..7b9e28e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
torque-2.4.8.tar.gz
+torque-2.5.1.tar.gz
diff --git a/sources b/sources
index c202166..f5495ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56170b7fce63fed9ed0cc83ee5bd3e3a torque-2.4.8.tar.gz
+65024d3ea5090bd15fefca67d5db6278 torque-2.5.1.tar.gz
diff --git a/torque.spec b/torque.spec
index e29beae..1d9304b 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,8 +67,8 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.4.8
-Release: 3%{?dist}
+Version: 2.5.1
+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
@@ -642,6 +642,9 @@ fi
%changelog
+* Tue Aug 10 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.1-1
+- New upstream 2.5.1
+
* Wed Jul 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-3
- Rebuild for cvs mistake.
--
cgit v0.10.2
>From ed14f85a25276c46f303e3b822da5b15fd53aa0b Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 7 Sep 2010 10:35:46 +0200
Subject: Version 2.5.2.
diff --git a/.gitignore b/.gitignore
index 7b9e28e..118843b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-torque-2.4.8.tar.gz
-torque-2.5.1.tar.gz
+/torque-2.5.2.tar.gz
diff --git a/sources b/sources
index f5495ab..55cdca7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65024d3ea5090bd15fefca67d5db6278 torque-2.5.1.tar.gz
+7d4a541b5ad16a8c0dcebafe0930dc1f torque-2.5.2.tar.gz
diff --git a/torque.spec b/torque.spec
index 1d9304b..2f9cd2d 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,7 +67,7 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.5.1
+Version: 2.5.2
Release: 1%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -642,6 +642,9 @@ fi
%changelog
+* Tue Sep 7 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-1
+- New upstream 2.5.2
+
* Tue Aug 10 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.1-1
- New upstream 2.5.1
--
cgit v0.10.2
>From 5348140f1489309b6072ab877b8343462f978c4e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 7 Sep 2010 11:02:52 +0200
Subject: 3 new man pages.
diff --git a/torque.spec b/torque.spec
index 2f9cd2d..cd2ec92 100644
--- a/torque.spec
+++ b/torque.spec
@@ -531,6 +531,9 @@ fi
%{_mandir}/man3/pbs_terminate.3.*
%{_mandir}/man3/rpp.3.*
%{_mandir}/man3/tm.3.*
+%{_mandir}/man3/pbs_checkpointjob.3.gz
+%{_mandir}/man3/pbs_fbserver.3.gz
+%{_mandir}/man3/pbs_get_server_list.3.gz
%{_mandir}/man7/pbs_job_attributes.7.*
%{_mandir}/man7/pbs_queue_attributes.7.*
%{_mandir}/man7/pbs_resources.7.*
@@ -644,6 +647,7 @@ fi
%changelog
* Tue Sep 7 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-1
- New upstream 2.5.2
+- Three new man pages added to file listing.
* Tue Aug 10 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.1-1
- New upstream 2.5.1
--
cgit v0.10.2
>From c212e51cda010113a70512d4b26ad562bda1cf7e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 7 Sep 2010 11:36:37 +0200
Subject: To 2.4.10.
diff --git a/.gitignore b/.gitignore
index 273924f..d0f8a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
torque-2.4.8.tar.gz
+/torque-2.4.10.tar.gz
diff --git a/sources b/sources
index c202166..1da91bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56170b7fce63fed9ed0cc83ee5bd3e3a torque-2.4.8.tar.gz
+02d9dd08d89d937d047a999b5d31f8a1 torque-2.4.10.tar.gz
diff --git a/torque.spec b/torque.spec
index e29beae..aaaca20 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,8 +67,8 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.4.8
-Release: 3%{?dist}
+Version: 2.4.10
+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
@@ -531,6 +531,9 @@ fi
%{_mandir}/man3/pbs_terminate.3.*
%{_mandir}/man3/rpp.3.*
%{_mandir}/man3/tm.3.*
+%{_mandir}/man3/pbs_checkpointjob.3.gz
+%{_mandir}/man3/pbs_fbserver.3.gz
+%{_mandir}/man3/pbs_get_server_list.3.gz
%{_mandir}/man7/pbs_job_attributes.7.*
%{_mandir}/man7/pbs_queue_attributes.7.*
%{_mandir}/man7/pbs_resources.7.*
@@ -642,6 +645,10 @@ fi
%changelog
+* Tue Sep 7 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.10-1
+- New upstream 2.4.10.
+- Add 3 new man pages to file listing.
+
* Wed Jul 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-3
- Rebuild for cvs mistake.
--
cgit v0.10.2
>From 0d968f7a1f36adfe1872dfe916e6ff33f67a1458 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 7 Sep 2010 11:58:53 +0200
Subject: 2.4.10.
diff --git a/.gitignore b/.gitignore
index 273924f..bea7feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-torque-2.4.8.tar.gz
+torque-2.4.10.tar.gz
diff --git a/sources b/sources
index c202166..1da91bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56170b7fce63fed9ed0cc83ee5bd3e3a torque-2.4.8.tar.gz
+02d9dd08d89d937d047a999b5d31f8a1 torque-2.4.10.tar.gz
diff --git a/torque.spec b/torque.spec
index e29beae..66d58d5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,8 +67,8 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.4.8
-Release: 3%{?dist}
+Version: 2.4.10
+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
@@ -531,6 +531,9 @@ fi
%{_mandir}/man3/pbs_terminate.3.*
%{_mandir}/man3/rpp.3.*
%{_mandir}/man3/tm.3.*
+%{_mandir}/man3/pbs_checkpointjob.3.gz
+%{_mandir}/man3/pbs_fbserver.3.gz
+%{_mandir}/man3/pbs_get_server_list.3.gz
%{_mandir}/man7/pbs_job_attributes.7.*
%{_mandir}/man7/pbs_queue_attributes.7.*
%{_mandir}/man7/pbs_resources.7.*
@@ -642,6 +645,10 @@ fi
%changelog
+* Tue Sep 7 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.10-1
+- New version for 2.4.10-1.
+- Three new man pages.
+
* Wed Jul 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.8-3
- Rebuild for cvs mistake.
--
cgit v0.10.2
>From b211bba7ab12771a4c5aedccf96985fbc8af9194 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 14 Oct 2010 20:55:49 +0200
Subject: Not needed.
diff --git a/torque-2.1.10-NI_MAXSERV.patch b/torque-2.1.10-NI_MAXSERV.patch
deleted file mode 100644
index a6df41f..0000000
--- a/torque-2.1.10-NI_MAXSERV.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h
---- torque-2.1.10_orig/src/include/port_forwarding.h 2006-10-13 11:25:37.000000000 -0700
-+++ torque-2.1.10/src/include/port_forwarding.h 2008-02-14 13:08:05.000000000 -0800
-@@ -16,6 +16,10 @@
- # endif
- #endif /* X_UNIX_PATH */
-
-+#ifndef NI_MAXSERV
-+# define NI_MAXSERV 32
-+#endif /* !NI_MAXSERV */
-+
-
- struct pfwdsock {
- int sock;
--
cgit v0.10.2
>From 36a82535ca3879cb0d45a66215d27e11c807cd57 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 14 Oct 2010 21:59:29 +0200
Subject: rhbz#528060
diff --git a/torque-cond-touch.patch b/torque-cond-touch.patch
new file mode 100644
index 0000000..9fb0834
--- /dev/null
+++ b/torque-cond-touch.patch
@@ -0,0 +1,45 @@
+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)
--
cgit v0.10.2
>From ce18607da43d5147f6ec6b6f0d13a39bdcb9d9f7 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 14 Oct 2010 22:06:14 +0200
Subject: rhbz#528060
diff --git a/torque.spec b/torque.spec
index cd2ec92..53c30ac 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.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
@@ -78,6 +78,8 @@ Source5: xpbsmon.png
Source6: README.Fedora
Source7: pbs-config-multilib
Source8: config
+# https://bugzilla.redhat.com/show_bug.cgi?id=528060
+Patch0: torque-cond-touch.patch
License: OpenPBS
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -264,6 +266,7 @@ This package holds the server.
%prep
%setup -q
+%patch0 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE7} %{SOURCE8} .
# rm x bit on some documentation.
@@ -645,6 +648,10 @@ fi
%changelog
+* Thu Oct 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-2
+- rhbz#58060, add torque-cond-touch.spec to only touch files
+ when service actually starts.
+
* Tue Sep 7 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-1
- New upstream 2.5.2
- Three new man pages added to file listing.
--
cgit v0.10.2
>From 42a804b6959caae1c20a2ae726a5f52079675f6e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 14 Oct 2010 23:02:55 +0200
Subject: - rhbz#631256 Only create db if asked to.
diff --git a/torque-create-request.patch b/torque-create-request.patch
new file mode 100644
index 0000000..86a9851
--- /dev/null
+++ b/torque-create-request.patch
@@ -0,0 +1,42 @@
+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 22:16:32.978386147 +0200
++++ torque-2.5.2/contrib/init.d/pbs_server 2010-10-14 23:01:59.911917744 +0200
+@@ -25,11 +25,29 @@
+ then
+ daemon $PBS_DAEMON -d $PBS_HOME
+ else
++ echo -n "use \"service pbs_server create\"" && failure && echo && exit 5
++ fi
++ RET=$?
++ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server
++ echo
++ ;;
++ create)
++ echo -n "Creating Torque Server Database:... "
++ if [ -r $PBS_HOME/server_priv/serverdb ]
++ then
++ echo -n "serverdb file allready exists?" && failure && echo && exit 5
++ else
+ daemon $PBS_DAEMON -t create -d $PBS_HOME
+ fi
+ RET=$?
+ [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server
+ echo
++ sleep 3
++ echo -n "Shutting down TORQUE Server: "
++ killproc pbs_server
++ RET=$?
++ rm -f /var/lock/subsys/pbs_server
++ echo
+ ;;
+ stop)
+ echo -n "Shutting down TORQUE Server: "
+@@ -53,7 +71,7 @@
+ echo
+ ;;
+ *)
+- echo "Usage: pbs_server {start|stop|restart|status|reload}"
++ echo "Usage: pbs_server {start|stop|restart|status|reload|create}"
+ exit 1
+ esac
+ exit $RET
diff --git a/torque.spec b/torque.spec
index 53c30ac..a25f302 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.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
@@ -80,6 +80,8 @@ Source7: pbs-config-multilib
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
License: OpenPBS
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -267,6 +269,7 @@ This package holds the server.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE7} %{SOURCE8} .
# rm x bit on some documentation.
@@ -648,6 +651,9 @@ fi
%changelog
+* Thu Oct 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-3
+- rhbz#631256 Only create db if asked to.
+
* Thu Oct 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-2
- rhbz#58060, add torque-cond-touch.spec to only touch files
when service actually starts.
--
cgit v0.10.2
>From 60b7bb5897f0caf5729ded1ba56b8a4424cc8719 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 14 Oct 2010 23:47:23 +0200
Subject: - rhbz#643194, stop a stoped service, start a start service return
codes now fixed.
diff --git a/torque-start-start.patch b/torque-start-start.patch
new file mode 100644
index 0000000..66a9841
--- /dev/null
+++ b/torque-start-start.patch
@@ -0,0 +1,71 @@
+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 a25f302..31a0396 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.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
@@ -82,6 +82,8 @@ Source8: config
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/
@@ -270,6 +272,7 @@ This package holds the server.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE7} %{SOURCE8} .
# rm x bit on some documentation.
@@ -651,6 +654,10 @@ fi
%changelog
+* Thu Oct 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-4
+- rhbz#643194, stop a stoped service, start a start service
+ return codes now fixed.
+
* Thu Oct 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-3
- rhbz#631256 Only create db if asked to.
--
cgit v0.10.2
>From b3e030203590ae79aa731e82a04ff903bd614794 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 18 Nov 2010 21:23:21 +0100
Subject: - Upstream to 2.5.3.
diff --git a/.gitignore b/.gitignore
index 118843b..808b65c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/torque-2.5.2.tar.gz
+/torque-2.5.3.tar.gz
diff --git a/sources b/sources
index 55cdca7..4175e51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d4a541b5ad16a8c0dcebafe0930dc1f torque-2.5.2.tar.gz
+b7868cf95582e20f2725651f97266947 torque-2.5.3.tar.gz
diff --git a/torque.spec b/torque.spec
index 31a0396..c7138ea 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,8 +67,8 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.5.2
-Release: 4%{?dist}
+Version: 2.5.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
@@ -654,6 +654,9 @@ fi
%changelog
+* Thu Nov 18 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-1
+- Upstream to 2.5.3.
+
* Thu Oct 14 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.2-4
- rhbz#643194, stop a stoped service, start a start service
return codes now fixed.
--
cgit v0.10.2
>From 7dde4188c70baaef3463e49b2d03f8f18b6b2ad9 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 18 Nov 2010 21:44:31 +0100
Subject: - New upstream 2.4.11.
diff --git a/.gitignore b/.gitignore
index d0f8a0e..dfed874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
torque-2.4.8.tar.gz
/torque-2.4.10.tar.gz
+/torque-2.4.11.tar.gz
diff --git a/sources b/sources
index 1da91bc..d307a89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02d9dd08d89d937d047a999b5d31f8a1 torque-2.4.10.tar.gz
+797eb4a80b75fb76ec99c75efd76e781 torque-2.4.11.tar.gz
diff --git a/torque.spec b/torque.spec
index aaaca20..a84be5b 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,7 +67,7 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.4.10
+Version: 2.4.11
Release: 1%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -645,6 +645,9 @@ fi
%changelog
+* Thu Nov 18 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.11-1
+- New upstream 2.4.11.
+
* Tue Sep 7 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.10-1
- New upstream 2.4.10.
- Add 3 new man pages to file listing.
--
cgit v0.10.2
>From 6c894efef86dcf78cbcb1c8e4ddbabec5a1c07c1 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 18 Nov 2010 21:48:33 +0100
Subject: Patch not used anymore.
diff --git a/torque-2.1.10-NI_MAXSERV.patch b/torque-2.1.10-NI_MAXSERV.patch
deleted file mode 100644
index a6df41f..0000000
--- a/torque-2.1.10-NI_MAXSERV.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h
---- torque-2.1.10_orig/src/include/port_forwarding.h 2006-10-13 11:25:37.000000000 -0700
-+++ torque-2.1.10/src/include/port_forwarding.h 2008-02-14 13:08:05.000000000 -0800
-@@ -16,6 +16,10 @@
- # endif
- #endif /* X_UNIX_PATH */
-
-+#ifndef NI_MAXSERV
-+# define NI_MAXSERV 32
-+#endif /* !NI_MAXSERV */
-+
-
- struct pfwdsock {
- int sock;
--
cgit v0.10.2
>From a112f5965647ebe49cf626be5afbc32aa42b423c Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 8 Dec 2010 12:35:42 +0100
Subject: - Only build a noarch doc package for EPEL6 or more. #659723
diff --git a/torque.spec b/torque.spec
index a84be5b..5060298 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.4.11
-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
@@ -124,7 +124,9 @@ This package holds the command-line client programs.
Group: Documentation
Summary: Documentation files for TORQUE
Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
BuildArch: noarch
+%endif
%description docs
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@@ -645,6 +647,9 @@ fi
%changelog
+* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.11-2
+- Only build a noarch doc package for EPEL6 or more. #659723
+
* Thu Nov 18 2010 Steve Traylen <steve.traylen at cern.ch> - 2.4.11-1
- New upstream 2.4.11.
--
cgit v0.10.2
>From 65af9ebffff1ea0e66285c6090e3a34b1f4f835d Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 8 Dec 2010 12:45:08 +0100
Subject: - Only build noarch doc package on RHEL6 or Fedora10. #659723
diff --git a/torque.spec b/torque.spec
index c7138ea..8479e34 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.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
@@ -130,7 +130,9 @@ This package holds the command-line client programs.
Group: Documentation
Summary: Documentation files for TORQUE
Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
BuildArch: noarch
+%endif
%description docs
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@@ -654,6 +656,9 @@ fi
%changelog
+* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-2
+- Only build noarch doc package on RHEL6 or Fedora10. #659723
+
* Thu Nov 18 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-1
- Upstream to 2.5.3.
--
cgit v0.10.2
>From aaa5a2233d84c0de9503d317dd4179f6a7102de0 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 9 Dec 2010 21:43:38 +0100
Subject: - Enable drmaa support and add drmaa sub packages.
diff --git a/torque.spec b/torque.spec
index 8479e34..4360bd9 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.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
@@ -87,6 +87,9 @@ Patch2: torque-start-start.patch
License: OpenPBS
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
+%if 0%{?el4}%{?el5}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
BuildRequires: desktop-file-utils
BuildRequires: pam-devel
BuildRequires: xauth
@@ -99,6 +102,30 @@ 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
+BuildRequires: doxygen
+%if "%{?rhel}" == "5"
+BuildRequires: graphviz-gd
+%endif
+%if %{?fedora}%{!?fedora:0} >= 9
+BuildRequires: tex(latex)
+%else
+%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires: tex(latex)
+%else
+BuildRequires: tetex-latex
+%endif
+%endif
+%endif
+
%description
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
manager providing control over batch jobs and distributed compute nodes.
@@ -270,6 +297,41 @@ other leading edge HPC organizations.
This package holds the server.
+%package drmaa
+Group: System Environment/Daemons
+Summary: Runtime files for the drmaa interface.
+Requires: torque-libs = %{version}-%{release}
+
+%description drmaa
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+Runtime files for working the DRMAA interface to torque.
+DRMAA is "Distributed Resource Management Application API"
+
+
+%package drmaa-devel
+Group: System Environment/Daemons
+Summary: Development files for the drmaa interface.
+Requires: torque-drmaa = %{version}-%{release}
+Requires: torque-devel = %{version}-%{release}
+
+%description drmaa-devel
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+Developement files for working the DRMAA interface to torque.
+DRMAA is "Distributed Resource Management Application API"
+
+
%prep
%setup -q
%patch0 -p1
@@ -285,6 +347,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 \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
@@ -378,6 +441,17 @@ ln -s %{_var}/log/torque/server_logs .
popd
+# Move drmaa man pages to correct place
+# and delete the three copies of the same documentation.
+
+%if 0%{?doxydoc}
+mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{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.
+rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf
+%endif
+
%clean
rm -rf %{buildroot}
@@ -426,8 +500,11 @@ if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
fi
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%post drmaa -p /sbin/ldconfig
+%postun drmaa -p /sbin/ldconfig
+
%post mom
/sbin/chkconfig --add pbs_mom
@@ -500,6 +577,7 @@ fi
%files docs
%defattr(-, root, root, -)
%doc doc/admin_guide.ps
+%doc src/drmaa/drmaa.pdf
%{_mandir}/man1/basl2c.1.*
%{_mandir}/man1/nqs2pbs.1.*
%{_mandir}/man1/pbs.1.*
@@ -597,12 +675,19 @@ fi
%files libs
%defattr(-, root, root, -)
-%{_libdir}/*.so.*
+%{_libdir}/libtorque.so.*
%files devel
%defattr(-, root, root, -)
-%{_libdir}/*.so
-%{_includedir}/torque
+%{_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
+
%{_bindir}/pbs-config
%files mom
@@ -654,8 +739,43 @@ fi
%{torquehomedir}/server_logs
%{torquehomedir}/server_priv
+%files drmaa
+%defattr(-, root, root, -)
+%{_libdir}/libdrmaa.so.*
+
+%files drmaa-devel
+%defattr(-, root, root, -)
+%{_libdir}/libdrmaa.so
+%{_includedir}/torque/drmaa.h
+%if 0%{?doxydoc}
+%{_mandir}/man3/compat.h.3.*
+%{_mandir}/man3/drmaa.3.*
+%{_mandir}/man3/drmaa.h.3.*
+%{_mandir}/man3/drmaa_attr_names_s.3.*
+%{_mandir}/man3/drmaa_attr_values_s.3.*
+%{_mandir}/man3/drmaa_attrib.3.*
+%{_mandir}/man3/drmaa_attrib_info_s.3.*
+%{_mandir}/man3/drmaa_def_attr_s.3.*
+%{_mandir}/man3/drmaa_job_ids_s.3.*
+%{_mandir}/man3/drmaa_job_iter_s.3.*
+%{_mandir}/man3/drmaa_job_s.3.*
+%{_mandir}/man3/drmaa_job_template_s.3.*
+%{_mandir}/man3/drmaa_jobt.3.*
+%{_mandir}/man3/drmaa_session.3.*
+%{_mandir}/man3/drmaa_session_s.3.*
+%{_mandir}/man3/drmaa_submission_context_s.3.*
+%{_mandir}/man3/drmaa_viter.3.*
+%{_mandir}/man3/error.h.3.*
+%{_mandir}/man3/jobs.3.*
+%{_mandir}/man3/jobs.h.3.*
+%{_mandir}/man3/lookup3.h.3.*
+%{_mandir}/man3/pbs_attrib.3.*
+%endif
%changelog
+* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-3
+- Enable drmaa support and add drmaa sub packages.
+
* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-2
- Only build noarch doc package on RHEL6 or Fedora10. #659723
--
cgit v0.10.2
>From 673d84fb61c20f0bb465a87b19ad5ac88f77083e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 9 Dec 2010 22:33:53 +0100
Subject: - Enable drmaa support and add drmaa sub packages.
diff --git a/torque.spec b/torque.spec
index 4360bd9..7e79c9f 100644
--- a/torque.spec
+++ b/torque.spec
@@ -299,7 +299,7 @@ This package holds the server.
%package drmaa
Group: System Environment/Daemons
-Summary: Runtime files for the drmaa interface.
+Summary: Run time files for the drmaa interface
Requires: torque-libs = %{version}-%{release}
%description drmaa
@@ -310,7 +310,7 @@ fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
other leading edge HPC organizations.
-Runtime files for working the DRMAA interface to torque.
+Run time files for working the DRMAA interface to torque.
DRMAA is "Distributed Resource Management Application API"
@@ -646,20 +646,23 @@ fi
%{_mandir}/man7/pbs_resources_unicos8.7.*
%{_mandir}/man7/pbs_resources_unicosmk2.7.*
%{_mandir}/man7/pbs_server_attributes.7.*
-%{_mandir}/man8/pbs_mom.8.*
-%{_mandir}/man8/pbs_sched.8.*
-%{_mandir}/man8/pbs_sched_basl.8.*
-%{_mandir}/man8/pbs_sched_cc.8.*
-%{_mandir}/man8/pbs_sched_tcl.8.*
-%{_mandir}/man8/pbs_server.8.*
-%{_mandir}/man8/pbsnodes.8.*
-%{_mandir}/man8/qdisable.8.*
-%{_mandir}/man8/qenable.8.*
-%{_mandir}/man8/qrun.8.*
-%{_mandir}/man8/qstart.8.*
-%{_mandir}/man8/qstop.8.*
-%{_mandir}/man8/qterm.8.*
+# And the following are alternative managed ones.
+%{_mandir}/man1/qsub-torque.1.*
+%{_mandir}/man1/qalter-torque.1.*
+%{_mandir}/man1/qdel-torque.1.*
+%{_mandir}/man1/qhold-torque.1.*
+%{_mandir}/man1/qrls-torque.1.*
+%{_mandir}/man1/qselect-torque.1.*
+%{_mandir}/man1/qstat-torque.1.*
+
+
+%files docs
+%defattr(-, root, root, -)
+%doc doc/admin_guide.ps
+%if 0%{?doxydoc}
+%doc src/drmaa/drmaa.pdf
+%endif
%if %{build_gui}
%files gui
--
cgit v0.10.2
>From 27b007d689e5b548c450b1fcae5be6b70a3d5ee6 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 9 Dec 2010 22:35:58 +0100
Subject: - Move man pages from doc subpackage to relavent sub package.
diff --git a/torque.spec b/torque.spec
index 7e79c9f..c985533 100644
--- a/torque.spec
+++ b/torque.spec
@@ -452,6 +452,9 @@ rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/*
rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf
%endif
+#Remove man page for binary that is not included.
+rm %{buildroot}%{_mandir}/man1/basl2c.1
+
%clean
rm -rf %{buildroot}
@@ -545,7 +548,7 @@ fi
%{torquehomedir}/server_name
%config(noreplace) %{_sysconfdir}/torque/pbs_environment
%config(noreplace) %{_sysconfdir}/torque/server_name
-
+%{_mandir}/man1/pbs.1.*
%files client
%defattr(-, root, root, -)
@@ -565,22 +568,7 @@ fi
%if %{use_tcl}
%{_bindir}/pbs_tclsh
%endif
-%{_mandir}/man1/qsub-torque.1.*
-%{_mandir}/man1/qalter-torque.1.*
-%{_mandir}/man1/qdel-torque.1.*
-%{_mandir}/man1/qhold-torque.1.*
-%{_mandir}/man1/qrls-torque.1.*
-%{_mandir}/man1/qselect-torque.1.*
-%{_mandir}/man1/qstat-torque.1.*
-
-
-%files docs
-%defattr(-, root, root, -)
-%doc doc/admin_guide.ps
-%doc src/drmaa/drmaa.pdf
-%{_mandir}/man1/basl2c.1.*
%{_mandir}/man1/nqs2pbs.1.*
-%{_mandir}/man1/pbs.1.*
%{_mandir}/man1/pbsdsh.1.*
%{_mandir}/man1/qchkpt.1.*
%{_mandir}/man1/qmgr.1.*
@@ -589,40 +577,13 @@ fi
%{_mandir}/man1/qorder.1.*
%{_mandir}/man1/qrerun.1.*
%{_mandir}/man1/qsig.1.*
-%{_mandir}/man1/xpbs.1.*
-%{_mandir}/man1/xpbsmon.1.*
-%{_mandir}/man3/pbs_alterjob.3.*
-%{_mandir}/man3/pbs_connect.3.*
-%{_mandir}/man3/pbs_default.3.*
-%{_mandir}/man3/pbs_deljob.3.*
-%{_mandir}/man3/pbs_disconnect.3.*
-%{_mandir}/man3/pbs_geterrmsg.3.*
-%{_mandir}/man3/pbs_holdjob.3.*
-%{_mandir}/man3/pbs_locate.3.*
-%{_mandir}/man3/pbs_manager.3.*
-%{_mandir}/man3/pbs_movejob.3.*
-%{_mandir}/man3/pbs_msgjob.3.*
-%{_mandir}/man3/pbs_orderjob.3.*
-%{_mandir}/man3/pbs_rerunjob.3.*
-%{_mandir}/man3/pbs_rescquery.3.*
-%{_mandir}/man3/pbs_rescreserve.3.*
-%{_mandir}/man3/pbs_rlsjob.3.*
-%{_mandir}/man3/pbs_runjob.3.*
-%{_mandir}/man3/pbs_selectjob.3.*
-%{_mandir}/man3/pbs_selstat.3.*
-%{_mandir}/man3/pbs_sigjob.3.*
-%{_mandir}/man3/pbs_stagein.3.*
-%{_mandir}/man3/pbs_statjob.3.*
-%{_mandir}/man3/pbs_statnode.3.*
-%{_mandir}/man3/pbs_statque.3.*
-%{_mandir}/man3/pbs_statserver.3.*
-%{_mandir}/man3/pbs_submit.3.*
-%{_mandir}/man3/pbs_terminate.3.*
-%{_mandir}/man3/rpp.3.*
-%{_mandir}/man3/tm.3.*
-%{_mandir}/man3/pbs_checkpointjob.3.gz
-%{_mandir}/man3/pbs_fbserver.3.gz
-%{_mandir}/man3/pbs_get_server_list.3.gz
+%{_mandir}/man8/pbsnodes.8.*
+%{_mandir}/man8/qdisable.8.*
+%{_mandir}/man8/qenable.8.*
+%{_mandir}/man8/qrun.8.*
+%{_mandir}/man8/qstart.8.*
+%{_mandir}/man8/qstop.8.*
+%{_mandir}/man8/qterm.8.*
%{_mandir}/man7/pbs_job_attributes.7.*
%{_mandir}/man7/pbs_queue_attributes.7.*
%{_mandir}/man7/pbs_resources.7.*
@@ -674,6 +635,8 @@ fi
%{_libdir}/xpbsmon
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
+%{_mandir}/man1/xpbs.1.*
+%{_mandir}/man1/xpbsmon.1.*
%endif
%files libs
@@ -690,8 +653,40 @@ fi
%{_includedir}/torque/rpp.h
%{_includedir}/torque/tm.h
%{_includedir}/torque/tm_.h
-
%{_bindir}/pbs-config
+%{_mandir}/man3/pbs_alterjob.3.*
+%{_mandir}/man3/pbs_connect.3.*
+%{_mandir}/man3/pbs_default.3.*
+%{_mandir}/man3/pbs_deljob.3.*
+%{_mandir}/man3/pbs_disconnect.3.*
+%{_mandir}/man3/pbs_geterrmsg.3.*
+%{_mandir}/man3/pbs_holdjob.3.*
+%{_mandir}/man3/pbs_locate.3.*
+%{_mandir}/man3/pbs_manager.3.*
+%{_mandir}/man3/pbs_movejob.3.*
+%{_mandir}/man3/pbs_msgjob.3.*
+%{_mandir}/man3/pbs_orderjob.3.*
+%{_mandir}/man3/pbs_rerunjob.3.*
+%{_mandir}/man3/pbs_rescquery.3.*
+%{_mandir}/man3/pbs_rescreserve.3.*
+%{_mandir}/man3/pbs_rlsjob.3.*
+%{_mandir}/man3/pbs_runjob.3.*
+%{_mandir}/man3/pbs_selectjob.3.*
+%{_mandir}/man3/pbs_selstat.3.*
+%{_mandir}/man3/pbs_sigjob.3.*
+%{_mandir}/man3/pbs_stagein.3.*
+%{_mandir}/man3/pbs_statjob.3.*
+%{_mandir}/man3/pbs_statnode.3.*
+%{_mandir}/man3/pbs_statque.3.*
+%{_mandir}/man3/pbs_statserver.3.*
+%{_mandir}/man3/pbs_submit.3.*
+%{_mandir}/man3/pbs_terminate.3.*
+%{_mandir}/man3/pbs_checkpointjob.3.gz
+%{_mandir}/man3/pbs_fbserver.3.gz
+%{_mandir}/man3/pbs_get_server_list.3.gz
+%{_mandir}/man3/rpp.3.*
+%{_mandir}/man3/tm.3.*
+
%files mom
%defattr(-, root, root, -)
@@ -710,6 +705,7 @@ fi
%dir %{_var}/log/torque
%dir %{_var}/log/torque/mom_logs
%dir %{_sysconfdir}/torque/mom
+%{_mandir}/man8/pbs_mom.8.*
%config(noreplace) %{_sysconfdir}/torque/mom/config
%files pam
@@ -727,6 +723,10 @@ fi
%{torquehomedir}/sched_logs
%dir %{_var}/log/torque/sched_logs
%dir %{_sysconfdir}/torque/sched
+%{_mandir}/man8/pbs_sched.8.*
+%{_mandir}/man8/pbs_sched_basl.8.*
+%{_mandir}/man8/pbs_sched_cc.8.*
+%{_mandir}/man8/pbs_sched_tcl.8.*
%config(noreplace) %{_sysconfdir}/torque/sched/dedicated_time
%config(noreplace) %{_sysconfdir}/torque/sched/holidays
%config(noreplace) %{_sysconfdir}/torque/sched/resource_group
@@ -741,6 +741,7 @@ fi
%dir %{_var}/log/torque/server_logs
%{torquehomedir}/server_logs
%{torquehomedir}/server_priv
+%{_mandir}/man8/pbs_server.8.*
%files drmaa
%defattr(-, root, root, -)
@@ -777,6 +778,7 @@ fi
%changelog
* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-3
+- Move man pages from doc subpackage to relavent sub package.
- Enable drmaa support and add drmaa sub packages.
* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-2
--
cgit v0.10.2
>From d57d73d65069148418921f6c612c925a58118834 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 9 Dec 2010 22:54:47 +0100
Subject: - Remove own copy of pbs-config. #657027
diff --git a/pbs-config-multilib b/pbs-config-multilib
deleted file mode 100755
index e91a9c1..0000000
--- a/pbs-config-multilib
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh
-
-package="pbs"
-version="2.1.8"
-
-prefix="/usr"
-exec_prefix="/usr"
-bindir="/usr/bin"
-sbindir="/usr/sbin"
-libexecdir="/usr/libexec"
-datadir="/usr/share"
-sysconfdir="/etc"
-sharedstatedir="/usr/com"
-localstatedir="/var"
-infodir="/usr/share/info"
-mandir="/usr/share/man"
-includedir="/usr/include/torque"
-libs="-ltorque"
-
-if test "$#" -eq 0; then
- cat <<EOF
-Usage: $package-config OPTIONS
-Options:
- --prefix=DIR) : \$prefix
- --package) : \$package
- --version) : \$version
- --cflags) : -I\$includedir
- --libs) : \$libs
- --help) print all the options (not just these)
-EOF
-fi
-
-o=""
-h=""
-for i in "$@"; do
- case $i in
- --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;
- --prefix) o="$o $prefix" ;;
- --package) o="$o $package" ;;
- --version) o="$o $version" ;;
- --cflags) if test "_$includedir" != "_/usr/include"
- then o="$o -I$includedir" ; fi
- ;;
- --libs) o="$o $libs" ;;
- --exec_prefix|--eprefix) o="$o $exec_prefix" ;;
- --bindir) o="$o $bindir" ;;
- --sbindir) o="$o $sbindir" ;;
- --libexecdir) o="$o $libexecdir" ;;
- --datadir) o="$o $datadir" ;;
- --datainc) o="$o -I$datadir" ;;
- --datalib) o="$o -L$datadir" ;;
- --sysconfdir) o="$o $sysconfdir" ;;
- --sharedstatedir) o="$o $sharedstatedir" ;;
- --localstatedir) o="$o $localstatedir" ;;
- --infodir) o="$o $infodir" ;;
- --mandir) o="$o $mandir" ;;
- --includedir) o="$o $includedir" ;;
- --data) o="$o -I$datadir/$package" ;;
- --pkgdatadir) o="$o $datadir/$package" ;;
- --pkgdatainc) o="$o -I$datadir/$package" ;;
- --pkgdatalib) o="$o -L$datadir/$package" ;;
- --pkglibinc) o="$o -I$libinc/$package" ;;
- --pkglibadd) o="$o -L$libadd/$package" ;;
- --pkgincludedir) o="$o $includedir/$package" ;;
- --help) h="1" ;;
- -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*)
- v=`echo $i | sed -e s://:\$:g`
- v=`eval "echo $v"`
- o="$o $v" ;;
- esac
-done
-
-o=`eval "echo $o"`
-o=`eval "echo $o"`
-eval "echo $o"
-
-if test ! -z "$h" ; then
-cat <<EOF
- --prefix=xxx) (what is that for anyway?)
- --prefix) \$prefix $prefix
- --package) \$package $package
- --version) \$version $version
- --cflags) -I\$includedir unless it is /usr/include
- --libs) -l\$PACKAGE \$LIBS
- --exec_prefix) or...
- --eprefix) \$exec_prefix $exec_prefix
- --bindir) \$bindir $bindir
- --sbindir) \$sbindir $sbindir
- --libexecdir) \$libexecdir $libexecdir
- --datadir) \$datadir $datadir
- --sysconfdir) \$sysconfdir $sysconfdir
- --sharedstatedir) \$sharedstatedir$sharedstatedir
- --localstatedir) \$localstatedir $localstatedir
- --infodir) \$infodir $infodir
- --mandir) \$mandir $mandir
- --data) -I\$datadir/\$package
- --pkgdatadir) \$datadir/\$package
- --pkgincludedir) \$includedir/\$package
- --help) generated by ac_create_generic_config.m4
- -I//varname and other inc-targets like --pkgdatainc supported
- -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd
-EOF
-fi
diff --git a/torque.spec b/torque.spec
index c985533..8a60e10 100644
--- a/torque.spec
+++ b/torque.spec
@@ -76,7 +76,6 @@ Source3: xpbsmon.desktop
Source4: xpbs.png
Source5: xpbsmon.png
Source6: README.Fedora
-Source7: pbs-config-multilib
Source8: config
# https://bugzilla.redhat.com/show_bug.cgi?id=528060
Patch0: torque-cond-touch.patch
@@ -338,7 +337,7 @@ DRMAA is "Distributed Resource Management Application API"
%patch1 -p1
%patch2 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
- %{SOURCE6} %{SOURCE7} %{SOURCE8} .
+ %{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
chmod 644 torque.setup
@@ -351,7 +350,6 @@ CFLAGS="%{optflags} -Wno-overlength-strings"
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
-cp -vf pbs-config-multilib pbs-config
make %{?_smp_mflags}
for daemon in pbs_mom pbs_sched pbs_server
@@ -778,6 +776,7 @@ fi
%changelog
* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-3
+- Remove own copy of pbs-config. #657027
- Move man pages from doc subpackage to relavent sub package.
- Enable drmaa support and add drmaa sub packages.
--
cgit v0.10.2
>From 1f9abac0bccb4814a4f4ef367a2196f53a9aca0d Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 9 Dec 2010 23:02:00 +0100
Subject: - Remove own copy of pbs-config. #657027
diff --git a/torque.spec b/torque.spec
index 8a60e10..97deef1 100644
--- a/torque.spec
+++ b/torque.spec
@@ -368,7 +368,6 @@ rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/*/buildindex
rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la}
mkdir -p %{buildroot}%{_bindir}
-touch -r pbs-config-multilib %{buildroot}%{_bindir}/pbs-config
# install initscripts
mkdir -p %{buildroot}%{_initrddir}
--
cgit v0.10.2
>From 098bdfe696a5931356c7386d07e727648d402030 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 9 Dec 2010 23:58:26 +0100
Subject: - New upstream 3.0.0. Drop patches torque-cond-touch.patch and
torque-start-start.patch since both upstream now.
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 <steve.traylen at cern.ch> - 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 <steve.traylen at cern.ch> - 2.5.3-3
- Remove own copy of pbs-config. #657027
- Move man pages from doc subpackage to relavent sub package.
--
cgit v0.10.2
>From 95be658a764f941c1d7b35532411fffef52f099a Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Fri, 10 Dec 2010 20:36:38 +0100
Subject: - Enable or rather force munge support.
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 <steve.traylen at cern.ch> - 3.0.0-2
+- Enable or rather force munge support.
+
* Thu Dec 9 2010 Steve Traylen <steve.traylen at cern.ch> - 3.0.0-1
- New upstream 3.0.0. Drop patches torque-cond-touch.patch and
torque-start-start.patch since both upstream now.
--
cgit v0.10.2
>From d3a5d23cde713b8f4bf62ca7ca0e8db77a75895e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 9 Jan 2011 22:27:46 +0100
Subject: - New upstream 2.5.4 Drop patches: torque-cond-touch.patch
rhbz#528060 and torque-start-start.patch rhbz#643194 since both upstream.
diff --git a/.gitignore b/.gitignore
index 808b65c..50b70e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/torque-2.5.2.tar.gz
/torque-2.5.3.tar.gz
+/torque-2.5.4.tar.gz
diff --git a/sources b/sources
index 4175e51..39aa1b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7868cf95582e20f2725651f97266947 torque-2.5.3.tar.gz
+6fa9e06ec7edc949bc6e005c9b3e7256 torque-2.5.4.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..9578ff0 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: 2.5.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
@@ -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,11 @@ fi
%endif
%changelog
+* Sun Jan 9 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.4-1
+- New upstream 2.5.4
+ Drop patches: torque-cond-touch.patch rhbz#528060 and
+ torque-start-start.patch rhbz#643194 since both upstream.
+
* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-3
- Remove own copy of pbs-config. #657027
- Move man pages from doc subpackage to relavent sub package.
--
cgit v0.10.2
>From c97c2e1f9e236319ddbd0f7fce86a693ab914849 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 2 Feb 2011 21:22:17 +0100
Subject: - Update to 3.0.0-snap.201102011355-1. - Drop
torque-create-request.patch since upstream.
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 <steve.traylen at cern.ch> - 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 <steve.traylen at cern.ch> - 3.0.0-2
- Enable or rather force munge support.
--
cgit v0.10.2
>From afe1e000673c95e9e7dd9247bc0441aca06aa8f8 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 3 Feb 2011 19:31:00 +0100
Subject: - License change to "OpenPBS and TORQUEv1.1" from OpenPBS.
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 <steve.traylen at cern.ch> - 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 <steve.traylen at cern.ch> - 3.0.0-2
- Enable or rather force munge support.
--
cgit v0.10.2
>From 7c3de4376fbc8a29d835b670d1d4591fc37f36cb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Wed, 9 Feb 2011 14:17:05 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 3.0.0_snap.201102011355-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Fri Dec 10 2010 Steve Traylen <steve.traylen at cern.ch> - 3.0.0-snap.201102011355-1
- Update to 3.0.0-snap.201102011355-1.
- Drop torque-create-request.patch since upstream.
--
cgit v0.10.2
>From f463b40067b32fc8542112b0835fdc43cb832692 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 8 Mar 2011 20:00:03 +0100
Subject: New upstream 2.5.5 Drop torque-create-request.patch since fixed
upstream. Torque License change, PBS_License.txt now
contrib/PBS_License2.3.txt New additional license file PBS_License_2.5.txt
License field changed from OpenPBS to "OpenPBS and TORQUEv1.1"
diff --git a/.gitignore b/.gitignore
index 50b70e2..0634122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/torque-2.5.2.tar.gz
/torque-2.5.3.tar.gz
/torque-2.5.4.tar.gz
+/torque-2.5.5.tar.gz
diff --git a/sources b/sources
index 39aa1b2..144f48f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6fa9e06ec7edc949bc6e005c9b3e7256 torque-2.5.4.tar.gz
+8c986704b0cfedc474ec236a100ab9b6 torque-2.5.5.tar.gz
diff --git a/torque.spec b/torque.spec
index 9578ff0..9f2d483 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,7 +67,7 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.5.4
+Version: 2.5.5
Release: 1%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -77,9 +77,8 @@ 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
+
+License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
%if 0%{?el4}%{?el5}
@@ -329,7 +328,6 @@ DRMAA is "Distributed Resource Management Application API"
%prep
%setup -q
-%patch1 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -530,7 +528,8 @@ 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
+%doc contrib/PBS_License_2.3.txt
%dir %{torquehomedir}
%dir %{torquehomedir}/aux
%dir %{torquehomedir}/spool
@@ -768,6 +767,14 @@ fi
%endif
%changelog
+* Tue Mar 8 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-1
+- New upstream 2.5.5
+ Drop torque-create-request.patch since fixed upstream.
+- Torque License change,
+ PBS_License.txt now contrib/PBS_License2.3.txt
+ New additional license file PBS_License_2.5.txt
+ License field changed from OpenPBS to "OpenPBS and TORQUEv1.1"
+
* Sun Jan 9 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.4-1
- New upstream 2.5.4
Drop patches: torque-cond-touch.patch rhbz#528060 and
--
cgit v0.10.2
>From 48c939bc5d58dda652e07e877028aced8f107f20 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 21 Apr 2011 22:19:53 +0200
Subject: Update to 3.0.1. License file name change.
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 <steve.traylen at cern.ch> - 3.0.1-1
+- Update to 3.0.1.
+ License file name change.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0_snap.201102011355-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
cgit v0.10.2
>From 08215d161318c6be20243b3a54929409d08c50c3 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 21 Apr 2011 22:54:36 +0200
Subject: Renable doxygen documentation for drmaa.
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 <steve.traylen at cern.ch> - 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 <rel-eng at lists.fedoraproject.org> - 3.0.0_snap.201102011355-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
cgit v0.10.2
>From 5a5d6ce543f40bd610e430c75eeb9f6860ec34b4 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 8 Jun 2011 16:37:54 +0200
Subject: Add torque-buffer-overrun.patch patch, rhbz#711463
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 <steve.traylen at cern.ch> - 3.0.1-2
+- Add torque-buffer-overrun.patch patch, rhbz#711463
+
* Thu Apr 21 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-1
- Update to 3.0.1.
License file name change.
--
cgit v0.10.2
>From ef7485e5d68c3616b400ef359077ecf07b1d7344 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 8 Jun 2011 19:10:05 +0200
Subject: Add torque-buffer-overrun.patch rhbz#711463
diff --git a/torque-buffer-overrun-2.5.5.patch b/torque-buffer-overrun-2.5.5.patch
new file mode 100644
index 0000000..9098b5c
--- /dev/null
+++ b/torque-buffer-overrun-2.5.5.patch
@@ -0,0 +1,173 @@
+diff -uNr torque-2.5.5.ORIG/src/lib/Libnet/get_hostaddr.c torque-2.5.5/src/lib/Libnet/get_hostaddr.c
+--- torque-2.5.5.ORIG/src/lib/Libnet/get_hostaddr.c 2011-06-08 18:40:00.251913002 +0200
++++ torque-2.5.5/src/lib/Libnet/get_hostaddr.c 2011-06-08 18:41:06.651911946 +0200
+@@ -147,7 +147,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 -uNr torque-2.5.5.ORIG/src/server/req_quejob.c torque-2.5.5/src/server/req_quejob.c
+--- torque-2.5.5.ORIG/src/server/req_quejob.c 2011-06-08 18:40:00.315913002 +0200
++++ torque-2.5.5/src/server/req_quejob.c 2011-06-08 18:49:36.449912391 +0200
+@@ -1053,17 +1053,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);
+@@ -1264,9 +1266,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,
+@@ -1382,9 +1385,11 @@
+ {
+ 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);
+
+@@ -1408,9 +1413,11 @@
+ {
+ /* 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);
+
+@@ -1700,11 +1707,12 @@
+
+ /* need to format message first, before request goes away */
+
+- sprintf(log_buffer, msg_jobnew,
+- preq->rq_user, preq->rq_host,
+- pj->ji_wattr[(int)JOB_ATR_job_owner].at_val.at_str,
+- pj->ji_wattr[(int)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 */
+
+@@ -1739,8 +1747,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,
+@@ -1861,7 +1871,7 @@
+
+ if (!user_account_read_user(arguser))
+ {
+- sprintf(log_buffer, "user_account_verify(%s, %s) -> USER NOT FOUND",
++ snprintf(log_buffer,sizeof(log_buffer), "user_account_verify(%s, %s) -> USER NOT FOUND",
+ arguser,
+ argaccount);
+
+@@ -1872,7 +1882,7 @@
+ {
+ if (strcmp(argaccount, UserAcct.ActAdr[i]) == 0)
+ {
+- sprintf(log_buffer, "user_account_verify(%s, %s) -> SUCCESS",
++ snprintf(log_buffer,sizeof(log_buffer), "user_account_verify(%s, %s) -> SUCCESS",
+ arguser,
+ argaccount);
+
+@@ -1882,7 +1892,7 @@
+ }
+ } /* END for (i) */
+
+- sprintf(log_buffer, "user_account_verify(%s, %s) -> FAILED",
++ snprintf(log_buffer, sizeof(log_buffer) "user_account_verify(%s, %s) -> FAILED",
+ arguser,
+ argaccount);
+
+@@ -1909,7 +1919,7 @@
+
+ if (!user_account_read_user(arguser))
+ {
+- sprintf(log_buffer, "user_account_default(%s) = USER NOT FOUND",
++ snprintf(log_buffer,sizeof(log_buffer), "user_account_default(%s) = USER NOT FOUND",
+ arguser);
+
+ goto user_account_default_done;
+@@ -1917,7 +1927,7 @@
+
+ if (UserAcct.ActCnt < 1)
+ {
+- sprintf(log_buffer, "user_account_default(%s) = NO PROJECT FOUND",
++ snprintf(log_buffer, sizeof(log_buffer), "user_account_default(%s) = NO PROJECT FOUND",
+ arguser);
+
+ goto user_account_default_done;
+@@ -1925,7 +1935,7 @@
+
+ rc = UserAcct.ActAdr[0];
+
+- sprintf(log_buffer, "user_account_default(%s) = %s",
++ snprintf(log_buffer, sizeof(log_buffer), "user_account_default(%s) = %s",
+ arguser,
+ rc);
+
diff --git a/torque.spec b/torque.spec
index 9f2d483..26c8aa5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.5
-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
@@ -77,6 +77,8 @@ Source4: xpbs.png
Source5: xpbsmon.png
Source6: README.Fedora
Source8: config
+# https://bugzilla.redhat.com/show_bug.cgi?id=711463
+Patch0: torque-buffer-overrun-2.5.5.patch
License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
@@ -328,6 +330,7 @@ DRMAA is "Distributed Resource Management Application API"
%prep
%setup -q
+%%patch0 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -767,6 +770,9 @@ fi
%endif
%changelog
+* Wed Jun 11 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-2
+- Add torque-buffer-overrun.patch rhbz#711463
+
* Tue Mar 8 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-1
- New upstream 2.5.5
Drop torque-create-request.patch since fixed upstream.
--
cgit v0.10.2
>From 5409298eac07b4112d8f2143c63614fbb79c816e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Fri, 17 Jun 2011 19:28:36 +0200
Subject: Add torque-munge-size.patch, rhbz#713996
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 <steve.traylen at cern.ch> - 3.0.1-3
+- Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky
+
* Wed Jun 8 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-2
- Add torque-buffer-overrun.patch patch, rhbz#711463
--
cgit v0.10.2
>From e3aa6e0cf9dc5244cc99a232d34f73aa891cfb45 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 26 Jun 2011 18:21:02 +0200
Subject: Removes nodes database file from package rhbz#716659
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 <steve.traylen at cern.ch> - 3.0.1-4
+- Removes nodes database file from package rhbz#716659
+
* Fri Jun 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-3
- Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky
--
cgit v0.10.2
>From 9b76c3d0737818724318bf9ab0251004ddb89dde Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 26 Jun 2011 18:21:02 +0200
Subject: Removes nodes database file from package rhbz#716659 (cherry picked
from commit e3aa6e0cf9dc5244cc99a232d34f73aa891cfb45)
Conflicts:
torque.spec
diff --git a/torque.spec b/torque.spec
index 26c8aa5..6084625 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.5
-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
@@ -388,6 +388,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}
@@ -770,6 +774,9 @@ fi
%endif
%changelog
+* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-3
+- Removes nodes database file from package rhbz#716659
+
* Wed Jun 11 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-2
- Add torque-buffer-overrun.patch rhbz#711463
--
cgit v0.10.2
>From 189f58021f22d5850fa99594c125593e4d087b35 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 28 Jun 2011 06:49:10 +0200
Subject: Update to 3.0.2. Remove torque-buffer-overrun since upstream now.
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 <steve.traylen at cern.ch> - 3.0.2-1
+- Update to 3.0.2.
+- Remove torque-buffer-overrun since upstream now.
+
* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-4
- Removes nodes database file from package rhbz#716659
--
cgit v0.10.2
>From 8a0677c235858fb1b33f6a38b0485a55818a9183 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 26 Jul 2011 00:43:57 +0200
Subject: Update to 2.5.7, drop torque-buffer-overrun-2.5.5.patch, Add man
pages for: qgpumod, qgpureset, pbs_gpumode and pbs_gpureset.
diff --git a/.gitignore b/.gitignore
index 0634122..2c5bf89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/torque-2.5.3.tar.gz
/torque-2.5.4.tar.gz
/torque-2.5.5.tar.gz
+/torque-2.5.7.tar.gz
diff --git a/sources b/sources
index 144f48f..bc4a88c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c986704b0cfedc474ec236a100ab9b6 torque-2.5.5.tar.gz
+aa033adc22df8ab333e5014dd93754b6 torque-2.5.7.tar.gz
diff --git a/torque.spec b/torque.spec
index 6084625..21d7172 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,8 +67,8 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 2.5.5
-Release: 3%{?dist}
+Version: 2.5.7
+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,8 +77,6 @@ Source4: xpbs.png
Source5: xpbsmon.png
Source6: README.Fedora
Source8: config
-# https://bugzilla.redhat.com/show_bug.cgi?id=711463
-Patch0: torque-buffer-overrun-2.5.5.patch
License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
@@ -330,7 +328,6 @@ DRMAA is "Distributed Resource Management Application API"
%prep
%setup -q
-%%patch0 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -574,6 +571,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.*
@@ -683,6 +682,8 @@ fi
%{_mandir}/man3/pbs_get_server_list.3.gz
%{_mandir}/man3/rpp.3.*
%{_mandir}/man3/tm.3.*
+%{_mandir}/man3/pbs_gpumode.3.gz
+%{_mandir}/man3/pbs_gpureset.3.gz
%files mom
@@ -774,6 +775,11 @@ fi
%endif
%changelog
+* Tue Jul 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-1
+- Update to 2.5.7, drop torque-buffer-overrun-2.5.5.patch,
+ Add man pages for: qgpumod, qgpureset, pbs_gpumode and
+ pbs_gpureset.
+
* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-3
- Removes nodes database file from package rhbz#716659
--
cgit v0.10.2
>From 65809ab2f712df3603ed3f60c93a84ff7be80c9e Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Tue, 26 Jul 2011 01:01:39 +0200
Subject: Add or rather force munge support, Add 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 21d7172..07186e4 100644
--- a/torque.spec
+++ b/torque.spec
@@ -78,6 +78,9 @@ Source5: xpbsmon.png
Source6: README.Fedora
Source8: config
+# https://bugzilla.redhat.com/show_bug.cgi?id=713996
+Patch0: torque-munge-size.patch
+
License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -136,6 +139,7 @@ Summary: Client part of TORQUE
Requires: %{name}-libs = %{version}-%{release}
Requires(posttrans): chkconfig
Requires(preun): chkconfig
+Requires: munge
%description client
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@@ -186,6 +190,7 @@ Group: Development/Libraries
Requires: torque = %{version}-%{release}
Obsoletes: libtorque < 2.4.8-2
Provides: libtorque = %{version}-%{release}
+Requires: munge
%description libs
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@@ -220,6 +225,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
@@ -228,6 +234,7 @@ Requires(preun): chkconfig
Requires(preun): initscripts
+
%description mom
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
manager providing control over batch jobs and distributed compute nodes.
@@ -274,6 +281,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
@@ -328,6 +336,7 @@ DRMAA is "Distributed Resource Management Application API"
%prep
%setup -q
+%patch0 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -338,6 +347,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-munge-auth \
--enable-drmaa \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
@@ -779,6 +789,7 @@ fi
- Update to 2.5.7, drop torque-buffer-overrun-2.5.5.patch,
Add man pages for: qgpumod, qgpureset, pbs_gpumode and
pbs_gpureset.
+- Add or rather force munge support, Add torque-munge-size.patch.
* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-3
- Removes nodes database file from package rhbz#716659
--
cgit v0.10.2
>From 094dd388193565f48bc263b0d139c34737ca6d67 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 31 Aug 2011 20:11:00 +0200
Subject: Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
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 <steve.traylen at cern.ch> - 3.0.2-2
+- Move checkpoint directory from torque-mom to torque package.
+ rhbz#734878.
+
* Mon Jun 27 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-1
- Update to 3.0.2.
- Remove torque-buffer-overrun since upstream now.
--
cgit v0.10.2
>From 125e4c605f20dcc7dcd8f4c2ee491788a05666f4 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 31 Aug 2011 20:11:00 +0200
Subject: Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
Conflicts:
torque.spec
diff --git a/torque.spec b/torque.spec
index 07186e4..2d5dfc5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-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 <steve.traylen at cern.ch> - 2.5.7-2
+- Move checkpoint directory from torque-mom to torque package.
+ rhbz#734878.
+
* Tue Jul 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-1
- Update to 2.5.7, drop torque-buffer-overrun-2.5.5.patch,
Add man pages for: qgpumod, qgpureset, pbs_gpumode and
--
cgit v0.10.2
>From 82418b9603543277ba102aa031eef2f62baa9fa7 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 18 Sep 2011 20:26:43 +0200
Subject: Add --with-tcp-retry-limit=2 to build, rhbz#738576.
Conflicts:
torque.spec
diff --git a/torque.spec b/torque.spec
index 2d5dfc5..4f85d71 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-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
@@ -347,8 +347,8 @@ CFLAGS="%{optflags} -Wno-overlength-strings"
%configure --includedir=%{_includedir}/torque \
--with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
--with-sendmail=%{_sbindir}/sendmail --disable-static \
- --enable-munge-auth \
- --enable-drmaa \
+ --with-tcp-retry-limit=2 \
+ --enable-drmaa --enable-munge-auth \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
@@ -785,6 +785,9 @@ fi
%endif
%changelog
+* Mon Sep 19 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-3
+- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
+
* Wed Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-2
- Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
--
cgit v0.10.2
>From 1a17a8fd8f8c7aa9702af3041741e995872ca53d Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 18 Sep 2011 20:26:43 +0200
Subject: Add --with-tcp-retry-limit=2 to build, rhbz#738576.
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 <steve.traylen at cern.ch> - 3.0.2-3
+- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
+
* Wed Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-2
- Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
--
cgit v0.10.2
>From cb579b8d8b0ac6a45071945c08d9f008c6e54c35 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 9 Oct 2011 00:16:39 +0200
Subject: Add patch 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 <steve.traylen at cern.ch> - 3.0.2-4
+- Add patch torque-initd-hangs-rhbz-744138.patch
+
* Mon Sep 19 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
--
cgit v0.10.2
>From a302d11f21857552794c70f6b7920953a1d6a5c7 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 9 Oct 2011 00:16:39 +0200
Subject: Add patch torque-initd-hangs-rhbz-744138.patch
Conflicts:
torque.spec
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 4f85d71..9caf9e0 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-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
@@ -81,6 +81,9 @@ Source8: config
# https://bugzilla.redhat.com/show_bug.cgi?id=713996
Patch0: 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/
@@ -336,7 +339,8 @@ DRMAA is "Distributed Resource Management Application API"
%prep
%setup -q
-%patch0 -p1
+%patch0 -p 1
+%patch2 -p 1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -785,6 +789,9 @@ fi
%endif
%changelog
+* Sun Oct 9 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-4
+- Add patch torque-initd-hangs-rhbz-744138.patch
+
* Mon Sep 19 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
--
cgit v0.10.2
>From 24f9b08ead64e6e99a1cbee4882d3f5b44faa2a0 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 17 Nov 2011 19:20:39 +0100
Subject: New upstream.
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 <steve.traylen at cern.ch> - 3.0.3-1
+- New upstream.
+
* Sun Oct 9 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-4
- Add patch torque-initd-hangs-rhbz-744138.patch
--
cgit v0.10.2
>From 18c2d9ec92feb25acf06423867e794b25426845c Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 17 Nov 2011 20:56:13 +0100
Subject: Add patch torque-fix-munge-rhbz#752079.patch
diff --git a/torque-fix-munge-rhbz#752079.patch b/torque-fix-munge-rhbz#752079.patch
new file mode 100644
index 0000000..5735b7a
--- /dev/null
+++ b/torque-fix-munge-rhbz#752079.patch
@@ -0,0 +1,94 @@
+Index: branches/2.5-fixes/src/include/batch_request.h
+===================================================================
+--- branches/2.5-fixes/src/include/batch_request.h (revision 5100)
++++ branches/2.5-fixes/src/include/batch_request.h (revision 5101)
+@@ -404,7 +404,7 @@
+
+ #ifndef PBS_MOM
+ extern void req_authenuser (struct batch_request *req);
+-extern void req_altauthenuser (struct batch_request *req);
++extern int req_altauthenuser (struct batch_request *req);
+ extern void req_connect (struct batch_request *req);
+ extern void req_locatejob (struct batch_request *req);
+ extern void req_manager (struct batch_request *req);
+Index: branches/2.5-fixes/src/server/req_getcred.c
+===================================================================
+--- branches/2.5-fixes/src/server/req_getcred.c (revision 5100)
++++ branches/2.5-fixes/src/server/req_getcred.c (revision 5101)
+@@ -436,7 +436,7 @@
+ * utility
+ *
+ */
+-void req_altauthenuser(
++int req_altauthenuser(
+
+ struct batch_request *preq) /* I */
+
+@@ -462,7 +462,7 @@
+ if(s >= PBS_NET_MAX_CONNECTIONS)
+ {
+ req_reject(PBSE_BADCRED, 0, preq, NULL, "cannot authenticate user");
+- return;
++ return (PBSE_BADCRED);
+ }
+
+
+@@ -470,7 +470,8 @@
+ if(rc)
+ {
+ /* FAILED */
+- return;
++ req_reject(PBSE_SYSTEM, 0, preq, NULL, "munge failure");
++ return (PBSE_SYSTEM);
+ }
+
+ /* SUCCESS */
+@@ -482,7 +483,7 @@
+ svr_conn[s].cn_authen = PBS_NET_CONN_AUTHENTICATED;
+
+ reply_ack(preq);
+- return;
++ return (PBSE_NONE);
+
+ } /* END req_altauthenuser() */
+
+Index: branches/2.5-fixes/src/server/process_request.c
+===================================================================
+--- branches/2.5-fixes/src/server/process_request.c (revision 5100)
++++ branches/2.5-fixes/src/server/process_request.c (revision 5101)
+@@ -541,10 +541,21 @@
+ rc = 0; /* bypass the authentication of the user--trust the client completely */
+ else if(munge_on)
+ {
+- /* If munge_on is true we will validate the connection later */
+- conn_credent[sfds].timestamp = time_now;
+- svr_conn[sfds].cn_authen = PBS_NET_CONN_AUTHENTICATED;
+- rc = 0;
++ /* If munge_on is true we will validate the connection now */
++ if ( request->rq_type == PBS_BATCH_AltAuthenUser)
++ {
++ rc = req_altauthenuser(request);
++ if (rc == PBSE_NONE)
++ {
++ conn_credent[sfds].timestamp = time_now;
++ svr_conn[sfds].cn_authen = PBS_NET_CONN_AUTHENTICATED;
++ }
++ return;
++ }
++ else
++ {
++ rc = authenticate_user(request, &conn_credent[sfds]);
++ }
+ }
+ else if (svr_conn[sfds].cn_authen != PBS_NET_CONN_AUTHENTICATED)
+ rc = PBSE_BADCRED;
+@@ -1021,9 +1032,6 @@
+ break;
+
+ case PBS_BATCH_AltAuthenUser:
+- /* Use given authentication method to determine
+- if user is valid */
+- req_altauthenuser(request);
+
+ break;
+
diff --git a/torque.spec b/torque.spec
index 9caf9e0..017cbef 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-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
Source2: xpbs.desktop
@@ -81,9 +81,15 @@ Source8: config
# https://bugzilla.redhat.com/show_bug.cgi?id=713996
Patch0: torque-munge-size.patch
+
+
# https://bugzilla.redhat.com/show_bug.cgi?id=744138
Patch2: torque-initd-hangs-rhbz-744138.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=752079
+Patch3: torque-fix-munge-rhbz#752079.patch
+
+
License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -341,6 +347,7 @@ DRMAA is "Distributed Resource Management Application API"
%setup -q
%patch0 -p 1
%patch2 -p 1
+%patch3 -p 2
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -789,6 +796,9 @@ fi
%endif
%changelog
+* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-5
+- Add patch torque-fix-munge-rhbz#752079.patch
+
* Sun Oct 9 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-4
- Add patch torque-initd-hangs-rhbz-744138.patch
--
cgit v0.10.2
>From 13d785bfe7292d02e65f016e215bd96a155f0783 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 17 Nov 2011 22:15:24 +0100
Subject: Empty release for release mistake.
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 <steve.traylen at cern.ch> - 3.0.3-2
+- Empty release for release mistake.
+
* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.3-1
- New upstream.
--
cgit v0.10.2
>From 540de7b34a153e6256661a74537f5892cab0bec2 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Thu, 17 Nov 2011 22:18:45 +0100
Subject: Empty release for release mistake.
diff --git a/torque.spec b/torque.spec
index 017cbef..ac9c3db 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -796,6 +796,9 @@ fi
%endif
%changelog
+* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-6
+- Empty release for release mistake.
+
* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-5
- Add patch torque-fix-munge-rhbz#752079.patch
--
cgit v0.10.2
>From b6989502a56414ceec16da8fb399e49fd9b98f1a Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Mon, 21 Nov 2011 19:43:44 +0100
Subject: Add torque-fix-munge-rhbz#752079-PTII.patch
diff --git a/torque-fix-munge-rhbz#752079-PTII.patch b/torque-fix-munge-rhbz#752079-PTII.patch
new file mode 100644
index 0000000..c5b684a
--- /dev/null
+++ b/torque-fix-munge-rhbz#752079-PTII.patch
@@ -0,0 +1,109 @@
+*** process_request.c.orig 2011-11-08 14:20:50.000000000 +0100
+--- process_request.c 2011-11-08 17:15:21.000000000 +0100
+***************
+*** 539,564 ****
+
+ if (ENABLE_TRUSTED_AUTH == TRUE )
+ rc = 0; /* bypass the authentication of the user--trust the client completely */
+! else if(munge_on)
+ {
+! /* If munge_on is true we will validate the connection now */
+! if ( request->rq_type == PBS_BATCH_AltAuthenUser)
+ {
+! rc = req_altauthenuser(request);
+! if (rc == PBSE_NONE)
+ {
+! conn_credent[sfds].timestamp = time_now;
+! svr_conn[sfds].cn_authen = PBS_NET_CONN_AUTHENTICATED;
+ }
+ return;
+ }
+ else
+! {
+! rc = authenticate_user(request, &conn_credent[sfds]);
+! }
+ }
+- else if (svr_conn[sfds].cn_authen != PBS_NET_CONN_AUTHENTICATED)
+- rc = PBSE_BADCRED;
+ else
+ rc = authenticate_user(request, &conn_credent[sfds]);
+
+--- 539,562 ----
+
+ if (ENABLE_TRUSTED_AUTH == TRUE )
+ rc = 0; /* bypass the authentication of the user--trust the client completely */
+! else if (svr_conn[sfds].cn_authen != PBS_NET_CONN_AUTHENTICATED)
+ {
+! if (munge_on && request->rq_type == PBS_BATCH_AltAuthenUser)
+ {
+! /* If munge_on is true do the validation request now */
+! if (request->rq_ind.rq_authen.rq_port != svr_conn[sfds].cn_port)
+! {
+! req_reject(PBSE_IVALREQ, 0, request, NULL, "Unexpected request to authenticate an alternate connection");
+! }
+! else
+ {
+! req_altauthenuser(request);
+ }
+ return;
+ }
+ else
+! rc = PBSE_BADCRED;
+ }
+ else
+ rc = authenticate_user(request, &conn_credent[sfds]);
+
+***************
+*** 1032,1038 ****
+ break;
+
+ case PBS_BATCH_AltAuthenUser:
+!
+ break;
+
+ case PBS_BATCH_JobObit:
+--- 1030,1036 ----
+ break;
+
+ case PBS_BATCH_AltAuthenUser:
+! req_reject(PBSE_IVALREQ, 0, request, NULL, "Unexpected request to authenticate at this point");
+ break;
+
+ case PBS_BATCH_JobObit:
+*** req_getcred.c.orig 2011-11-08 17:27:36.000000000 +0100
+--- req_getcred.c 2011-11-08 17:20:18.000000000 +0100
+***************
+*** 365,371 ****
+ /* Something went wrong. We will have to depend on the parent
+ to let everyone know */
+ close(fd_pipe[1]);
+! exit(0);
+
+ }
+
+--- 365,371 ----
+ /* Something went wrong. We will have to depend on the parent
+ to let everyone know */
+ close(fd_pipe[1]);
+! _exit(0);
+
+ }
+
+***************
+*** 453,459 ****
+
+ for (s = 0;s < PBS_NET_MAX_CONNECTIONS;++s)
+ {
+! if (preq->rq_ind.rq_authen.rq_port != svr_conn[s].cn_port)
+ {
+ continue;
+ }
+--- 453,460 ----
+
+ for (s = 0;s < PBS_NET_MAX_CONNECTIONS;++s)
+ {
+! if (preq->rq_ind.rq_authen.rq_port != svr_conn[s].cn_port ||
+! svr_conn[preq->rq_conn].cn_addr != svr_conn[s].cn_addr)
+ {
+ continue;
+ }
diff --git a/torque.spec b/torque.spec
index ac9c3db..5391757 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -88,6 +88,7 @@ Patch2: torque-initd-hangs-rhbz-744138.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=752079
Patch3: torque-fix-munge-rhbz#752079.patch
+Patch4: torque-fix-munge-rhbz#752079-PTII.patch
License: OpenPBS and TORQUEv1.1
@@ -348,6 +349,9 @@ DRMAA is "Distributed Resource Management Application API"
%patch0 -p 1
%patch2 -p 1
%patch3 -p 2
+pushd src/server
+%patch4 -p 0
+popd
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -796,6 +800,9 @@ fi
%endif
%changelog
+* Mon Nov 21 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-7
+- Add torque-fix-munge-rhbz#752079-PTII.patch
+
* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-6
- Empty release for release mistake.
--
cgit v0.10.2
>From 44081f771043381194bb0dfaa635305925ad05ac Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Wed, 30 Nov 2011 19:19:35 +0100
Subject: Add torque-rhbz#758740-r5258-dis-close.patch and
torque-rhbz#758740-r5270-dis-array.patch
diff --git a/torque-rhbz#758740-r5258-dis-close.patch b/torque-rhbz#758740-r5258-dis-close.patch
new file mode 100644
index 0000000..6313088
--- /dev/null
+++ b/torque-rhbz#758740-r5258-dis-close.patch
@@ -0,0 +1,124 @@
++ e - Added a new function DIS_tcp_close to the the code. This takes care of a problem
++ where TORQUE memory keeps growing because the read and write buffers associated
++ with each tcparray entry would grow to accommodate incoming and outgoing data
++ but would not shrink.
+
+Index: src/include/dis.h
+===================================================================
+--- src/include/dis.h (revision 5257)
++++ src/include/dis.h (revision 5258)
+@@ -238,13 +238,15 @@
+
+ /* the following routines set/control DIS over tcp */
+
+-extern void DIS_tcp_reset (int fd, int rw);
+-extern void DIS_tcp_setup (int fd);
+-extern int DIS_tcp_wflush (int fd);
+-extern void DIS_tcp_settimeout (long timeout);
+-extern int DIS_tcp_istimeout (int fd);
++void DIS_tcp_reset (int fd, int rw);
++void DIS_tcp_setup (int fd);
++int DIS_tcp_wflush (int fd);
++void DIS_tcp_settimeout (long timeout);
++int DIS_tcp_istimeout (int fd);
++void DIS_tcp_close (int fd);
+
+
++
+ extern int PConnTimeout(int);
+
+ /* NOTE: increase THE_BUF_SIZE to 131072 for systems > 5k nodes */
+Index: src/lib/Libattr/attr_fn_arst.c
+===================================================================
+--- src/lib/Libattr/attr_fn_arst.c (revision 5257)
++++ src/lib/Libattr/attr_fn_arst.c (revision 5258)
+@@ -186,13 +186,14 @@
+
+ bksize = (ns - 1) * sizeof(char *) + sizeof(struct array_strings);
+
+- if ((stp = (struct array_strings *)malloc(bksize)) == NULL)
++ if (( patr->at_val.at_arst = (struct array_strings *)malloc(bksize)) == NULL)
+ {
+ /* FAILURE */
+
+ return(PBSE_SYSTEM);
+ }
+
++ stp = patr->at_val.at_arst;
+ memset(stp, 0, bksize);
+
+ stp->as_npointers = ns;
+@@ -238,7 +239,7 @@
+
+ patr->at_flags |= ATR_VFLAG_SET | ATR_VFLAG_MODIFY;
+
+- patr->at_val.at_arst = stp;
++/* patr->at_val.at_arst = stp;*/
+
+ free(tmpval);
+
+Index: src/lib/Libifl/tcp_dis.c
+===================================================================
+--- src/lib/Libifl/tcp_dis.c (revision 5257)
++++ src/lib/Libifl/tcp_dis.c (revision 5258)
+@@ -790,9 +790,30 @@
+ return;
+ }
+
++void DIS_tcp_close(
+
++ int fd)
+
++ {
++ struct tcp_chan *tcp;
+
++ tcp = tcparray[fd];
++ if(tcp != NULL)
++ {
++ if(tcp->readbuf.tdis_thebuf != NULL)
++ free(tcp->readbuf.tdis_thebuf);
++ if(tcp->writebuf.tdis_thebuf != NULL)
++ free(tcp->writebuf.tdis_thebuf);
++
++ free(tcp);
++ tcparray[fd] = NULL;
++ }
++
++ return;
++ }
++
++
++
+ /*
+ * DIS_tcp_setup - setup supports routines for dis, "data is strings", to
+ * use tcp stream I/O. Also initializes an array of pointers to
+Index: src/lib/Libnet/net_server.c
+===================================================================
+--- src/lib/Libnet/net_server.c (revision 5257)
++++ src/lib/Libnet/net_server.c (revision 5258)
+@@ -114,6 +114,7 @@
+ #include "server_limits.h"
+ #include "net_connect.h"
+ #include "log.h"
++#include "dis.h" /* DIS_tcp_close */
+
+ extern int LOGLEVEL;
+
+@@ -718,6 +719,7 @@
+ int sd) /* I */
+
+ {
++
+ if ((sd < 0) || (max_connection <= sd))
+ {
+ return;
+@@ -757,6 +759,9 @@
+
+ num_connections--;
+
++ DIS_tcp_close(sd);
++
++
+ return;
+ } /* END close_conn() */
+
diff --git a/torque-rhbz#758740-r5270-dis-array.patch b/torque-rhbz#758740-r5270-dis-array.patch
new file mode 100644
index 0000000..b70ab5f
--- /dev/null
+++ b/torque-rhbz#758740-r5270-dis-array.patch
@@ -0,0 +1,27 @@
+Index: src/lib/Libifl/tcp_dis.c
+===================================================================
+--- src/lib/Libifl/tcp_dis.c (revision 5269)
++++ src/lib/Libifl/tcp_dis.c (revision 5270)
+@@ -797,12 +797,19 @@
+ {
+ struct tcp_chan *tcp;
+
++ /* On startup tcparray may not yet be initialized. check it */
++ if (tcparray == NULL)
++ return;
++
++ if (fd > tcparraymax)
++ return;
++
+ tcp = tcparray[fd];
+- if(tcp != NULL)
++ if (tcp != NULL)
+ {
+- if(tcp->readbuf.tdis_thebuf != NULL)
++ if (tcp->readbuf.tdis_thebuf != NULL)
+ free(tcp->readbuf.tdis_thebuf);
+- if(tcp->writebuf.tdis_thebuf != NULL)
++ if (tcp->writebuf.tdis_thebuf != NULL)
+ free(tcp->writebuf.tdis_thebuf);
+
+ free(tcp);
diff --git a/torque.spec b/torque.spec
index 5391757..b909ff2 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -90,6 +90,10 @@ Patch2: torque-initd-hangs-rhbz-744138.patch
Patch3: torque-fix-munge-rhbz#752079.patch
Patch4: torque-fix-munge-rhbz#752079-PTII.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=758740
+Patch5: torque-rhbz#758740-r5258-dis-close.patch
+Patch6: torque-rhbz#758740-r5270-dis-array.patch
+
License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
@@ -352,6 +356,10 @@ DRMAA is "Distributed Resource Management Application API"
pushd src/server
%patch4 -p 0
popd
+
+%patch5 -p 0
+%patch6 -p 0
+
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation.
@@ -800,6 +808,10 @@ fi
%endif
%changelog
+* Mon Nov 21 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-8
+- Add torque-rhbz#758740-r5258-dis-close.patch and
+ torque-rhbz#758740-r5270-dis-array.patch
+
* Mon Nov 21 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-7
- Add torque-fix-munge-rhbz#752079-PTII.patch
--
cgit v0.10.2
>From a1465f566f4350639e6dc75d687073bbbbe7f348 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sat, 3 Dec 2011 19:29:50 +0100
Subject: Add torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch
diff --git a/torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch b/torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch
new file mode 100644
index 0000000..ec1374b
--- /dev/null
+++ b/torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch
@@ -0,0 +1,12 @@
+diff -uNr torque-2.5.7.ORIG/src/server/req_getcred.c torque-2.5.7/src/server/req_getcred.c
+--- torque-2.5.7.ORIG/src/server/req_getcred.c 2011-12-03 19:05:46.670461225 +0100
++++ torque-2.5.7/src/server/req_getcred.c 2011-12-03 19:07:50.013609563 +0100
+@@ -471,7 +471,7 @@
+ if(rc)
+ {
+ /* FAILED */
+- req_reject(PBSE_SYSTEM, 0, preq, NULL, "munge failure");
++ /* req_reject(PBSE_SYSTEM, 0, preq, NULL, "munge failure"); */
+ return (PBSE_SYSTEM);
+ }
+
diff --git a/torque.spec b/torque.spec
index b909ff2..89ad5d3 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
Name: torque
Version: 2.5.7
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -94,6 +94,8 @@ Patch4: torque-fix-munge-rhbz#752079-PTII.patch
Patch5: torque-rhbz#758740-r5258-dis-close.patch
Patch6: torque-rhbz#758740-r5270-dis-array.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=759141
+Patch7: torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch
License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons
@@ -359,6 +361,7 @@ popd
%patch5 -p 0
%patch6 -p 0
+%patch7 -p 1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} .
@@ -808,6 +811,9 @@ fi
%endif
%changelog
+* Sat Dec 3 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-9
+- Add torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch
+
* Mon Nov 21 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-8
- Add torque-rhbz#758740-r5258-dis-close.patch and
torque-rhbz#758740-r5270-dis-array.patch
--
cgit v0.10.2
>From 289bcf559483e3ba26a50fb7816d645bd8627513 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 14 Jan 2012 00:54:37 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 3.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.3-2
- Empty release for release mistake.
--
cgit v0.10.2
>From 1fa3f1f0260efc2be400ed569bc4c971876e9562 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen at cern.ch>
Date: Sun, 5 Feb 2012 15:31:06 +0100
Subject: New upstream.
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 <steve.traylen at cern.ch> - 3.0.4-1
+- New upstream.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--
cgit v0.10.2
>From 091d3376103ab548c48eb51fa5ef0a8d7d635c48 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 21 Jul 2012 18:48:37 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 3.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Sun Feb 5 2012 Steve Traylen <steve.traylen at cern.ch> - 3.0.4-1
- New upstream.
--
cgit v0.10.2
>From 210c5d89270d5169a41cf0827fdc309f38b2da38 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Thu, 14 Feb 2013 19:50:31 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 3.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
--
cgit v0.10.2
>From 5e6609bb34d9c0b16d5681b21c64b11c9fefdf4b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 3 Aug 2013 23:22:31 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 3.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
cgit v0.10.2
>From 72969598d6a3fa1cc5752d7c8c2303672150a0e5 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at nwra.com>
Date: Fri, 16 Aug 2013 15:12:00 -0600
Subject: Update URL and Source0
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
--
cgit v0.10.2
>From 961c3e57d5c5940b98875810e839f3489500654e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at nwra.com>
Date: Fri, 16 Aug 2013 15:21:48 -0600
Subject: Fix changelog dates
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 <steve.traylen at cern.ch> - 3.0.2-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
-* Wed Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-2
+* Wed Aug 31 2011 Steve Traylen <steve.traylen at cern.ch> - 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 <rel-eng at lists.fedoraproject.org> - 2.1.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Mon Apr 16 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
+* Thu Apr 17 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
- add alternatives system
* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 2.1.10-5
--
cgit v0.10.2
>From 3a5d38cddd97ca5f14e1d0be4d45f498e8bb7e83 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at nwra.com>
Date: Fri, 16 Aug 2013 15:50:08 -0600
Subject: Drop Source URL for now
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
--
cgit v0.10.2
>From aed6def2b29e7a9e24eaeac53dbd03b7449f8e84 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at nwra.com>
Date: Fri, 16 Aug 2013 16:00:27 -0600
Subject: Add missing BRs for latex docs
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 <orion at cora.nwra.com> - 3.0.4-4
+- Add missing BRs for latex docs
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--
cgit v0.10.2
>From c9991409415707a65bf75fae3d9c72eba6ad9d39 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at nwra.com>
Date: Fri, 16 Aug 2013 16:28:33 -0600
Subject: Remove doxygen directory reference file
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.
--
cgit v0.10.2
>From 1f2427ba043306f1c1817fb41f95aac69bf315d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
Date: Sun, 12 Jan 2014 13:48:49 +0100
Subject: upstream 4.2.6.1
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?= <hguemar at fedoraproject.org>
+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 <hguemar at fedoraproject.org> - 4.2.6.1-1
+- upstream 4.2.6.1
+
+* Wed Nov 13 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 4.2.6-1
+- upstream 4.2.6
+
* Fri Aug 16 2013 Orion Poplawski <orion at cora.nwra.com> - 3.0.4-4
- Add missing BRs for latex docs
@@ -826,7 +833,7 @@ fi
* Mon Sep 19 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
-* Wed Aug 31 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-2
+* Tue Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 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 <rel-eng at lists.fedoraproject.org> - 2.1.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Thu Apr 17 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
+* Wed Apr 16 2008 Garrick Staples <garrick at usc.edu> 2.1.10-6
- add alternatives system
* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 2.1.10-5
--
cgit v0.10.2
>From bc8451121fec00f341418feaadbf6174e072a6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Wed, 21 May 2014 12:42:21 +0200
Subject: - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
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 <jskarvad at redhat.com> - 4.2.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
* Sun Jan 12 2014 Haïkel Guémar <hguemar at fedoraproject.org> - 4.2.6.1-1
- upstream 4.2.6.1
--
cgit v0.10.2
>From a228f6a4ed9a7c0ca763f2a8f78a8a7800e3ba14 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 8 Jun 2014 03:47:06 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 4.2.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Wed May 21 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 4.2.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
--
cgit v0.10.2
>From 3282eeabe0024465f9ce6c7cf2957d252cfa3bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Thu, 17 Jul 2014 15:08:47 +0200
Subject: 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.
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 <corsepiu at fedoraproject.org> - 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 <rel-eng at lists.fedoraproject.org> - 4.2.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>From d5159863fa3a515a38367b9c865085e42d14b4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Thu, 17 Jul 2014 15:19:31 +0200
Subject: Reflect upstream URL and Source0 having changed.
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 <corsepiu at fedoraproject.org> - 4.2.6.1-5
+- Reflect upstream URL and Source0 having changed.
+
* Thu Jul 17 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 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).
--
cgit v0.10.2
>From 3499f19984c57e6294f3a4e24362d787b7402907 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Mon, 18 Aug 2014 06:08:48 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
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 <rel-eng at lists.fedoraproject.org> - 4.2.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Thu Jul 17 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 4.2.6.1-5
- Reflect upstream URL and Source0 having changed.
--
cgit v0.10.2
>From f33844324cb5922c7090ee6bc22b1fe01c68a2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
Date: Mon, 1 Sep 2014 10:24:13 +0200
Subject: upstream 4.2.8
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 <hguemar at fedoraproject.org> - 4.2.8-1
+- upstream 4.2.8
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.6.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
>From f4f149069f728b33e19ea8b5aef98f646ab987b1 Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Tue, 14 Oct 2014 22:56:44 -0700
Subject: do this just to commit the broken stuff
diff --git a/.gitignore b/.gitignore
index 927ab95..865ea8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
/torque-2.5.2.tar.gz
/torque-2.5.3.tar.gz
-<<<<<<< HEAD
/torque-2.5.4.tar.gz
/torque-2.5.5.tar.gz
/torque-2.5.7.tar.gz
-=======
/torque-3.0.0.tar.gz
/torque-3.0.0-snap.201102011355.tar.gz
/torque-3.0.1.tar.gz
@@ -13,4 +11,3 @@
/torque-3.0.4.tar.gz
/torque-4.2.6.1.tar.gz
/torque-4.2.8.tar.gz
->>>>>>> master
diff --git a/sources b/sources
index c12e4cb..eafec14 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-aa033adc22df8ab333e5014dd93754b6 torque-2.5.7.tar.gz
-=======
3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz
->>>>>>> master
diff --git a/torque-munge-size.patch b/torque-munge-size.patch
index 5240094..18822aa 100644
--- a/torque-munge-size.patch
+++ b/torque-munge-size.patch
@@ -18,17 +18,10 @@ index 6d32c8b..06b1bec 100644
--- a/src/include/libpbs.h
+++ b/src/include/libpbs.h
@@ -121,7 +121,7 @@
->>>>>>> master
#define EOF -1
#endif
-#define MUNGE_SIZE 256 /* I do not know what the proper size of this should be. My
-<<<<<<< HEAD
-+#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[]) */
-=======
+#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 */
@@ -36,4 +29,3 @@ index 6d32c8b..06b1bec 100644
--
1.8.4.2
->>>>>>> master
diff --git a/torque.spec b/torque.spec
index e754a11..b3ac9d5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -876,11 +876,11 @@ fi
* Mon Sep 19 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
-* Tue Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-2
+* Wed Aug 31 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-2
- Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
-* Wed Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-2
+* Tue Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-2
- Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
@@ -890,9 +890,6 @@ fi
pbs_gpureset.
- Add or rather force munge support, Add torque-munge-size.patch.
-* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-3
-- Removes nodes database file from package rhbz#716659
-
* Mon Jun 27 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-1
- Update to 3.0.2.
- Remove torque-buffer-overrun since upstream now.
@@ -900,6 +897,9 @@ fi
* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-4
- Removes nodes database file from package rhbz#716659
+* Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-3
+- Removes nodes database file from package rhbz#716659
+
* Fri Jun 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-3
- Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky
--
cgit v0.10.2
>From fb931f6fe1badc6f4cd4cb0ae4282c9b608c7804 Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Tue, 14 Oct 2014 22:57:24 -0700
Subject: fix the torque munge patch
diff --git a/torque-munge-size.patch b/torque-munge-size.patch
index 18822aa..a473f4d 100644
--- a/torque-munge-size.patch
+++ b/torque-munge-size.patch
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-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?= <hguemar at fedoraproject.org>
Date: Sun, 12 Jan 2014 11:42:32 +0100
--
cgit v0.10.2
>From 4ed91f1ba87234f0729b50c329a9f15db88fe22e Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Tue, 14 Oct 2014 23:22:04 -0700
Subject: bumped release
diff --git a/torque.spec b/torque.spec
index b3ac9d5..f30add3 100644
--- a/torque.spec
+++ b/torque.spec
@@ -71,7 +71,7 @@
Name: torque
Version: 4.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -460,7 +460,7 @@ popd
# and delete the three copies of the same documentation.
%if 0%{?doxydoc}
-rm %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/*_src_drmaa_src_.3
+rm -f %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/*_src_drmaa_src_.3
mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/.
rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/*
rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/*
@@ -796,6 +796,10 @@ fi
%endif
%changelog
+* Tue Oct 14 2014 David Brown <david.brown at pnnl.gov> - 4.2.8-2
+- merged fedora latest into epel
+- This breaks old configs and should be treated carefully
+
* Mon Sep 01 2014 Haïkel Guémar <hguemar at fedoraproject.org> - 4.2.8-1
- upstream 4.2.8
@@ -903,7 +907,7 @@ fi
* Fri Jun 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-3
- Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky
-* Wed Jun 11 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-2
+* Wed Jun 8 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-2
- Add torque-buffer-overrun.patch rhbz#711463
* Wed Jun 8 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-2
@@ -941,7 +945,6 @@ fi
* Thu Dec 9 2010 Steve Traylen <steve.traylen at cern.ch> - 3.0.0-1
- New upstream 3.0.0. Drop patches torque-cond-touch.patch and
torque-start-start.patch since both upstream now.
->>>>>>> master
* Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-3
- Remove own copy of pbs-config. #657027
--
cgit v0.10.2
>From 6232a919bdd59b39e14092336b50a9925b1c3d3c Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Thu, 26 Mar 2015 16:47:00 +0000
Subject: Add an AppData file for the software center
diff --git a/torque.spec b/torque.spec
index fde49f6..d7e07c5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -71,7 +71,7 @@
Name: torque
Version: 4.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -514,6 +514,22 @@ fi
--slave %{_mandir}/man1/qstat.1.gz qstat-man \
%{_mandir}/man1/qstat-torque.1.gz
+# Merge applications into one software center item
+%if %{build_gui}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/xpbsmon.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard at hughsie.com> -->
+<component type="desktop">
+ <metadata_license>CC0-1.0</metadata_license>
+ <id>xpbsmon.desktop</id>
+ <metadata>
+ <value key="X-Merge-With-Parent">xpbs.desktop</value>
+ </metadata>
+</component>
+EOF
+%endif
+
%preun client
if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
@@ -651,6 +667,7 @@ fi
%{_bindir}/xpbsmon
%{_libdir}/xpbs
%{_libdir}/xpbsmon
+%{_datadir}/appdata/*.appdata.xml
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/xpbs.1.*
@@ -791,6 +808,9 @@ fi
%endif
%changelog
+* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.2.8-2
+- Add an AppData file for the software center
+
* Mon Sep 01 2014 Haïkel Guémar <hguemar at fedoraproject.org> - 4.2.8-1
- upstream 4.2.8
--
cgit v0.10.2
>From 2ac0fc257d16c226c44af789c82655eaddc4168c Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Thu, 2 Apr 2015 09:59:48 -0700
Subject: version bump to merge from master
diff --git a/torque.spec b/torque.spec
index 8bc96b2..77314cc 100644
--- a/torque.spec
+++ b/torque.spec
@@ -71,7 +71,7 @@
Name: torque
Version: 4.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@@ -813,6 +813,9 @@ fi
%endif
%changelog
+* Thu Apr 2 2015 David Brown <david.brown at pnnl.gov> - 4.2.8-3
+- Version bump to merge from previous version
+
* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.2.8-2
- Add an AppData file for the software center
--
cgit v0.10.2
>From 13a37e1cb58b7b89bbb359f04070f9301f001cfb Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Mon, 6 Apr 2015 18:55:39 -0700
Subject: updated upstream source
diff --git a/.gitignore b/.gitignore
index 581d76a..982fe8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/torque-3.0.4.tar.gz
/torque-4.2.6.1.tar.gz
/torque-4.2.8.tar.gz
+/torque-4.2.10.tar.gz
diff --git a/sources b/sources
index eafec14..726c75c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz
+541f58ab46166e86d7a468500be3fa4d torque-4.2.10.tar.gz
diff --git a/torque.spec b/torque.spec
index d7e07c5..d1ca055 100644
--- a/torque.spec
+++ b/torque.spec
@@ -70,8 +70,8 @@
%global server_nameflags --with-default-server=%{server_name}
Name: torque
-Version: 4.2.8
-Release: 2%{?dist}
+Version: 4.2.10
+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
@@ -808,6 +808,9 @@ fi
%endif
%changelog
+* Mon Apr 6 2015 David Brown <david.brown at pnnl.gov> - 4.2.10-1
+- Updated upstream version
+
* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.2.8-2
- Add an AppData file for the software center
--
cgit v0.10.2
>From e23e1e70273d9c9727eb81b1fc84a4516adb19b3 Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Tue, 7 Apr 2015 20:52:34 -0700
Subject: this works except for doxygen produces bad latex
https://bugzilla.gnome.org/show_bug.cgi?id=742427
diff --git a/torque.spec b/torque.spec
index d1ca055..fcf5121 100644
--- a/torque.spec
+++ b/torque.spec
@@ -103,6 +103,7 @@ BuildRequires: ncurses-devel
BuildRequires: gperf
BuildRequires: openssl-devel
BuildRequires: libxml2-devel
+BuildRequires: munge-devel
%if %{use_tcl}
BuildRequires: tcl-devel
%endif
@@ -124,6 +125,7 @@ BuildRequires: tex-xtab
BuildRequires: tex-sectsty
BuildRequires: tex-tocloft
BuildRequires: tex-multirow
+BuildRequires: tex-adjustbox
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires: tex(latex)
@@ -358,7 +360,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings -DUSE_INTERP_RESULT -DUSE_INTERP_ERR
--with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
--with-sendmail=%{_sbindir}/sendmail --disable-static \
--with-tcp-retry-limit=2 --without-debug \
- --enable-drmaa --enable-munge-auth \
+ --enable-drmaa --enable-munge-auth --with-munge \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
make %{?_smp_mflags}
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/torque.git/commit/?h=el5&id=72f042a527f9b7e8d7482e8d0188d64d00afdda3
More information about the scm-commits
mailing list