From 3a4d5db332a64081a6ab2b81391a0ae50da62e4a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:36 +0000 Subject: [PATCH 01/41] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) From 0e8053028a8a2a56cec7bc573e15f09865363bcf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:25:44 +0000 Subject: [PATCH 02/41] Initialize branch EL-6 for torque --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From a7e63a0384887b1e6d3d1f9c93b6c60512c0e928 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 10 May 2010 10:50:40 +0000 Subject: [PATCH 03/41] Hand branch EL5 into EL6. --- sources | 2 +- torque-2.1.10-NI_MAXSERV.patch | 14 ---------- torque.spec | 50 +++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 torque-2.1.10-NI_MAXSERV.patch 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 - 2.3.10-1 +- New upstream 2.3.10 + +* Tue Jan 19 2010 Steve Traylen - 2.3.9-1 +- New upstream 2.3.9 +* Thu Dec 3 2009 Steve Traylen - 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 - 2.1.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 34762c2c8f3649f2e0284979531214aca5ab186f Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Wed, 14 Jul 2010 21:11:28 +0000 Subject: [PATCH 04/41] Something at least approching package guidelines. --- .cvsignore | 2 +- README-localhost | 20 -- README.Fedora | 71 ++++ sources | 2 +- torque.spec | 822 +++++++++++++++++++++++++++++------------------ 5 files changed, 576 insertions(+), 341 deletions(-) delete mode 100644 README-localhost create mode 100644 README.Fedora 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 < $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 + +# 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 "$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 + 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 - 2.3.10-1 -- New upstream 2.3.10 +* Thu Jul 1 2010 Steve Traylen - 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 - 2.4.8-1 +- update to 2.4.8 +- drop static libs +- cleanup spec file -* Tue Jan 19 2010 Steve Traylen - 2.3.9-1 -- New upstream 2.3.9 -* Thu Dec 3 2009 Steve Traylen - 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 - 2.1.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From e2529dbda68a3c04ff7617bec391aba1b73e68e9 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Wed, 14 Jul 2010 21:18:58 +0000 Subject: [PATCH 05/41] forgot to add config on EL-6 branch. --- config | 2 ++ torque.spec | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 config 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 - 2.4.8-3 +- Rebuild for cvs mistake. + * Thu Jul 1 2010 Steve Traylen - 2.4.8-2 - Set torquehome to /var/lib/torque rather than /var/torque - Drop provides and obsoletes since never present in Fedora/EPEL. From df36db9efe94d5125cd714531668b6e748e95030 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Wed, 14 Jul 2010 21:20:31 +0000 Subject: [PATCH 06/41] and up release --- torque.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 6a65143cf4bc66eeafd12b1b721342aeb52a8502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:22:25 +0000 Subject: [PATCH 07/41] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore 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 From c212e51cda010113a70512d4b26ad562bda1cf7e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 7 Sep 2010 11:36:37 +0200 Subject: [PATCH 08/41] To 2.4.10. --- .gitignore | 1 + sources | 2 +- torque.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) 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 - 2.4.10-1 +- New upstream 2.4.10. +- Add 3 new man pages to file listing. + * Wed Jul 14 2010 Steve Traylen - 2.4.8-3 - Rebuild for cvs mistake. From 0d968f7a1f36adfe1872dfe916e6ff33f67a1458 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 7 Sep 2010 11:58:53 +0200 Subject: [PATCH 09/41] 2.4.10. --- .gitignore | 2 +- sources | 2 +- torque.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) 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 - 2.4.10-1 +- New version for 2.4.10-1. +- Three new man pages. + * Wed Jul 14 2010 Steve Traylen - 2.4.8-3 - Rebuild for cvs mistake. From 7dde4188c70baaef3463e49b2d03f8f18b6b2ad9 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 18 Nov 2010 21:44:31 +0100 Subject: [PATCH 10/41] - New upstream 2.4.11. --- .gitignore | 1 + sources | 2 +- torque.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) 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 - 2.4.11-1 +- New upstream 2.4.11. + * Tue Sep 7 2010 Steve Traylen - 2.4.10-1 - New upstream 2.4.10. - Add 3 new man pages to file listing. From 6c894efef86dcf78cbcb1c8e4ddbabec5a1c07c1 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 18 Nov 2010 21:48:33 +0100 Subject: [PATCH 11/41] Patch not used anymore. --- torque-2.1.10-NI_MAXSERV.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 torque-2.1.10-NI_MAXSERV.patch 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; From a112f5965647ebe49cf626be5afbc32aa42b423c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 8 Dec 2010 12:35:42 +0100 Subject: [PATCH 12/41] - Only build a noarch doc package for EPEL6 or more. #659723 --- torque.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 - 2.4.11-2 +- Only build a noarch doc package for EPEL6 or more. #659723 + * Thu Nov 18 2010 Steve Traylen - 2.4.11-1 - New upstream 2.4.11. From d3a5d23cde713b8f4bf62ca7ca0e8db77a75895e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 9 Jan 2011 22:27:46 +0100 Subject: [PATCH 13/41] - New upstream 2.5.4 Drop patches: torque-cond-touch.patch rhbz#528060 and torque-start-start.patch rhbz#643194 since both upstream. --- .gitignore | 1 + sources | 2 +- torque-cond-touch.patch | 45 ------------------------- torque-start-start.patch | 71 ---------------------------------------- torque.spec | 15 ++++----- 5 files changed, 9 insertions(+), 125 deletions(-) delete mode 100644 torque-cond-touch.patch delete mode 100644 torque-start-start.patch diff --git a/.gitignore b/.gitignore index 808b65c..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 - 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 - 2.5.3-3 - Remove own copy of pbs-config. #657027 - Move man pages from doc subpackage to relavent sub package. From f463b40067b32fc8542112b0835fdc43cb832692 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 8 Mar 2011 20:00:03 +0100 Subject: [PATCH 14/41] 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" --- .gitignore | 1 + sources | 2 +- torque.spec | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) 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 - 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 - 2.5.4-1 - New upstream 2.5.4 Drop patches: torque-cond-touch.patch rhbz#528060 and From ef7485e5d68c3616b400ef359077ecf07b1d7344 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 8 Jun 2011 19:10:05 +0200 Subject: [PATCH 15/41] Add torque-buffer-overrun.patch rhbz#711463 --- torque-buffer-overrun-2.5.5.patch | 173 ++++++++++++++++++++++++++++++ torque.spec | 8 +- 2 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 torque-buffer-overrun-2.5.5.patch 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 - 2.5.5-2 +- Add torque-buffer-overrun.patch rhbz#711463 + * Tue Mar 8 2011 Steve Traylen - 2.5.5-1 - New upstream 2.5.5 Drop torque-create-request.patch since fixed upstream. From 9b76c3d0737818724318bf9ab0251004ddb89dde Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 26 Jun 2011 18:21:02 +0200 Subject: [PATCH 16/41] Removes nodes database file from package rhbz#716659 (cherry picked from commit e3aa6e0cf9dc5244cc99a232d34f73aa891cfb45) Conflicts: torque.spec --- torque.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 - 2.5.5-3 +- Removes nodes database file from package rhbz#716659 + * Wed Jun 11 2011 Steve Traylen - 2.5.5-2 - Add torque-buffer-overrun.patch rhbz#711463 From 8a0677c235858fb1b33f6a38b0485a55818a9183 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 26 Jul 2011 00:43:57 +0200 Subject: [PATCH 17/41] Update to 2.5.7, drop torque-buffer-overrun-2.5.5.patch, Add man pages for: qgpumod, qgpureset, pbs_gpumode and pbs_gpureset. --- .gitignore | 1 + sources | 2 +- torque.spec | 16 +++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) 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 - 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 - 2.5.5-3 - Removes nodes database file from package rhbz#716659 From 65809ab2f712df3603ed3f60c93a84ff7be80c9e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 26 Jul 2011 01:01:39 +0200 Subject: [PATCH 18/41] Add or rather force munge support, Add torque-munge-size.patch. --- torque-munge-size.patch | 12 ++++++++++++ torque.spec | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 torque-munge-size.patch diff --git a/torque-munge-size.patch b/torque-munge-size.patch new file mode 100644 index 0000000..1f0470f --- /dev/null +++ b/torque-munge-size.patch @@ -0,0 +1,12 @@ +diff -uNr torque-3.0.1.ORIG/src/include/libpbs.h torque-3.0.1/src/include/libpbs.h +--- torque-3.0.1.ORIG/src/include/libpbs.h 2011-06-17 19:19:32.984380003 +0200 ++++ torque-3.0.1/src/include/libpbs.h 2011-06-17 19:23:19.406379620 +0200 +@@ -117,7 +117,7 @@ + #define EOF -1 + #endif + +-#define MUNGE_SIZE 256 /* I do not know what the proper size of this should be. My ++#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My + testing with munge shows it creates a string of 128 bytes */ + + /* enums for standard job files (sync w/TJobFileType[]) */ diff --git a/torque.spec b/torque.spec index 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 - 2.5.5-3 - Removes nodes database file from package rhbz#716659 From 125e4c605f20dcc7dcd8f4c2ee491788a05666f4 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 31 Aug 2011 20:11:00 +0200 Subject: [PATCH 19/41] Move checkpoint directory from torque-mom to torque package. rhbz#734878. Conflicts: torque.spec --- torque.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 - 2.5.7-2 +- Move checkpoint directory from torque-mom to torque package. + rhbz#734878. + * Tue Jul 26 2011 Steve Traylen - 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 From 82418b9603543277ba102aa031eef2f62baa9fa7 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 18 Sep 2011 20:26:43 +0200 Subject: [PATCH 20/41] Add --with-tcp-retry-limit=2 to build, rhbz#738576. Conflicts: torque.spec --- torque.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 - 2.5.7-3 +- Add --with-tcp-retry-limit=2 to build, rhbz#738576. + * Wed Aug 30 2011 Steve Traylen - 2.5.7-2 - Move checkpoint directory from torque-mom to torque package. rhbz#734878. From a302d11f21857552794c70f6b7920953a1d6a5c7 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 9 Oct 2011 00:16:39 +0200 Subject: [PATCH 21/41] Add patch torque-initd-hangs-rhbz-744138.patch Conflicts: torque.spec --- torque-initd-hangs-rhbz-744138.patch | 19 +++++++++++++++++++ torque.spec | 11 +++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 torque-initd-hangs-rhbz-744138.patch diff --git a/torque-initd-hangs-rhbz-744138.patch b/torque-initd-hangs-rhbz-744138.patch new file mode 100644 index 0000000..c0ffbd2 --- /dev/null +++ b/torque-initd-hangs-rhbz-744138.patch @@ -0,0 +1,19 @@ +diff -uNr torque-3.0.2.ORIG/contrib/init.d/pbs_server torque-3.0.2/contrib/init.d/pbs_server +--- torque-3.0.2.ORIG/contrib/init.d/pbs_server 2011-10-09 00:09:29.026651535 +0200 ++++ torque-3.0.2/contrib/init.d/pbs_server 2011-10-09 00:12:05.012653474 +0200 +@@ -14,13 +14,11 @@ + echo "Configuration already exists. Please remove $PBS_SERVERDB to create a new one." + exit 1 + fi +- + $PBS_DAEMON -d $PBS_HOME -t create & +- while [ ! -r $PBS_SERVERDB ]; do +- sleep 1 +- done ++ sleep 5 + killproc pbs_server + RET=$? ++ + } + + start() { diff --git a/torque.spec b/torque.spec index 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 - 2.5.7-4 +- Add patch torque-initd-hangs-rhbz-744138.patch + * Mon Sep 19 2011 Steve Traylen - 2.5.7-3 - Add --with-tcp-retry-limit=2 to build, rhbz#738576. From 18c2d9ec92feb25acf06423867e794b25426845c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 17 Nov 2011 20:56:13 +0100 Subject: [PATCH 22/41] Add patch torque-fix-munge-rhbz#752079.patch --- torque-fix-munge-rhbz#752079.patch | 94 ++++++++++++++++++++++++++++++ torque.spec | 12 +++- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 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 - 2.5.7-5 +- Add patch torque-fix-munge-rhbz#752079.patch + * Sun Oct 9 2011 Steve Traylen - 2.5.7-4 - Add patch torque-initd-hangs-rhbz-744138.patch From 540de7b34a153e6256661a74537f5892cab0bec2 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 17 Nov 2011 22:18:45 +0100 Subject: [PATCH 23/41] Empty release for release mistake. --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 - 2.5.7-6 +- Empty release for release mistake. + * Thu Nov 17 2011 Steve Traylen - 2.5.7-5 - Add patch torque-fix-munge-rhbz#752079.patch From b6989502a56414ceec16da8fb399e49fd9b98f1a Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 21 Nov 2011 19:43:44 +0100 Subject: [PATCH 24/41] Add torque-fix-munge-rhbz#752079-PTII.patch --- torque-fix-munge-rhbz#752079-PTII.patch | 109 ++++++++++++++++++++++++ torque.spec | 9 +- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 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 - 2.5.7-7 +- Add torque-fix-munge-rhbz#752079-PTII.patch + * Thu Nov 17 2011 Steve Traylen - 2.5.7-6 - Empty release for release mistake. From 44081f771043381194bb0dfaa635305925ad05ac Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 30 Nov 2011 19:19:35 +0100 Subject: [PATCH 25/41] Add torque-rhbz#758740-r5258-dis-close.patch and torque-rhbz#758740-r5270-dis-array.patch --- torque-rhbz#758740-r5258-dis-close.patch | 124 +++++++++++++++++++++++ torque-rhbz#758740-r5270-dis-array.patch | 27 +++++ torque.spec | 14 ++- 3 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 torque-rhbz#758740-r5258-dis-close.patch create mode 100644 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 - 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 - 2.5.7-7 - Add torque-fix-munge-rhbz#752079-PTII.patch From a1465f566f4350639e6dc75d687073bbbbe7f348 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 3 Dec 2011 19:29:50 +0100 Subject: [PATCH 26/41] Add torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch --- ...ue-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch | 12 ++++++++++++ torque.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 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 - 2.5.7-9 +- Add torque-2.5.7-rhbz#759141-r5167-pbs_server-crash.patch + * Mon Nov 21 2011 Steve Traylen - 2.5.7-8 - Add torque-rhbz#758740-r5258-dis-close.patch and torque-rhbz#758740-r5270-dis-array.patch From 1f2427ba043306f1c1817fb41f95aac69bf315d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= Date: Sun, 12 Jan 2014 13:48:49 +0100 Subject: [PATCH 27/41] upstream 4.2.6.1 --- .gitignore | 1 + sources | 2 +- torque-munge-size.patch | 25 ++++++++++++++++------ torque.spec | 47 +++++++++++++++++++++++------------------ 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 4a4742d..97388d2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /torque-3.0.2.tar.gz /torque-3.0.3.tar.gz /torque-3.0.4.tar.gz +/torque-4.2.6.1.tar.gz diff --git a/sources b/sources index 6bb34ce..d5f8326 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd822d5ba1ac938ac1c48392b55e775e torque-3.0.4.tar.gz +a87afed9436967cf10468ef76a7e8fcd torque-4.2.6.1.tar.gz diff --git a/torque-munge-size.patch b/torque-munge-size.patch index 1f0470f..a473f4d 100644 --- a/torque-munge-size.patch +++ b/torque-munge-size.patch @@ -1,12 +1,25 @@ -diff -uNr torque-3.0.1.ORIG/src/include/libpbs.h torque-3.0.1/src/include/libpbs.h ---- torque-3.0.1.ORIG/src/include/libpbs.h 2011-06-17 19:19:32.984380003 +0200 -+++ torque-3.0.1/src/include/libpbs.h 2011-06-17 19:23:19.406379620 +0200 -@@ -117,7 +117,7 @@ +From 12a8d7dde1d07aed670f0dd50b317b256daaa991 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Sun, 12 Jan 2014 11:42:32 +0100 +Subject: [PATCH] munge size fix + +--- + src/include/libpbs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/libpbs.h b/src/include/libpbs.h +index 6d32c8b..06b1bec 100644 +--- a/src/include/libpbs.h ++++ b/src/include/libpbs.h +@@ -121,7 +121,7 @@ #define EOF -1 #endif -#define MUNGE_SIZE 256 /* I do not know what the proper size of this should be. My -+#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My ++#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My testing with munge shows it creates a string of 128 bytes */ - /* enums for standard job files (sync w/TJobFileType[]) */ + +-- +1.8.4.2 + diff --git a/torque.spec b/torque.spec index fcb2b5b..6d64e18 100644 --- a/torque.spec +++ b/torque.spec @@ -70,10 +70,10 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 3.0.4 -Release: 4%{?dist} +Version: 4.2.6.1 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: %{name}-%{version}.tar.gz +Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png @@ -89,12 +89,9 @@ Source8: config # https://bugzilla.redhat.com/show_bug.cgi?id=713996 Patch1: torque-munge-size.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=744138 -Patch2: torque-initd-hangs-rhbz-744138.patch - License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons -URL: http://www.adaptivecomputing.com/products/open-source/torque/ +URL: http://www.clusterresources.com/products/torque/ %if 0%{?el4}%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -103,6 +100,9 @@ BuildRequires: pam-devel BuildRequires: xauth BuildRequires: readline-devel BuildRequires: ncurses-devel +BuildRequires: gperf +BuildRequires: openssl-devel +BuildRequires: libxml2-devel %if %{use_tcl} BuildRequires: tcl-devel %endif @@ -120,10 +120,10 @@ BuildRequires: graphviz-gd %endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(sectsty.sty) -BuildRequires: tex(tocloft.sty) -BuildRequires: tex(xtab.sty) +BuildRequires: tex-xtab +BuildRequires: tex-sectsty +BuildRequires: tex-tocloft +BuildRequires: tex-multirow %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) @@ -346,7 +346,7 @@ DRMAA is "Distributed Resource Management Application API" %prep %setup -q -n torque-%{version} %patch1 -p 1 -%patch2 -p 1 +sed -i '/LATEX_BATCHMODE/d' src/drmaa/Doxyfile.in install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ %{SOURCE6} %{SOURCE8} . # rm x bit on some documentation. @@ -361,7 +361,6 @@ CFLAGS="%{optflags} -Wno-overlength-strings" --enable-drmaa --enable-munge-auth \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} - make %{?_smp_mflags} for daemon in pbs_mom pbs_sched pbs_server @@ -458,9 +457,8 @@ popd # and delete the three copies of the same documentation. %if 0%{?doxydoc} +rm %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/*_src_drmaa_src_.3 mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/. -# Remove strange doxygen directory reference file -rm %{buildroot}%{_mandir}/man3/_* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/* # Include drmaa.pdf later from the src tree. @@ -470,6 +468,9 @@ rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf #Remove man page for binary that is not included. rm %{buildroot}%{_mandir}/man1/basl2c.1 +# fix permissions for some directories in /var/lib/torque +chmod 755 `find %{buildroot}/var/lib/torque -type d` + %clean rm -rf %{buildroot} @@ -554,7 +555,7 @@ fi %files %defattr(-, root, root, -) %doc README.torque torque.setup Release_Notes -%doc CHANGELOG PBS_License_2.5.txt README.Fedora contrib/PBS_License_2.3.txt +%doc CHANGELOG PBS_License.txt README.Fedora contrib/PBS_License_2.3.txt %dir %{torquehomedir} %dir %{torquehomedir}/aux %dir %{torquehomedir}/spool @@ -579,7 +580,6 @@ fi %{_bindir}/printtracking %{_bindir}/tracejob %{_sbindir}/momctl -%attr(4755, root, root) %{_sbindir}/pbs_iff %{_sbindir}/pbs_demux %if %{use_tcl} %{_bindir}/pbs_tclsh @@ -671,6 +671,7 @@ fi %{_includedir}/torque/rpp.h %{_includedir}/torque/tm.h %{_includedir}/torque/tm_.h +%{_includedir}/torque/*.h %{_bindir}/pbs-config %{_mandir}/man3/pbs_alterjob.3.* %{_mandir}/man3/pbs_connect.3.* @@ -704,7 +705,6 @@ fi %{_mandir}/man3/pbs_get_server_list.3.gz %{_mandir}/man3/pbs_gpumode.3.gz %{_mandir}/man3/pbs_gpureset.3.gz -%{_mandir}/man3/rpp.3.* %{_mandir}/man3/tm.3.* @@ -755,6 +755,7 @@ fi %defattr(-, root, root, -) %attr(0755, root, root) %{_sbindir}/pbs_server %attr(0755, root, root) %{_sbindir}/momctl +%attr(0755, root, root) %{_sbindir}/trqauthd %{_sbindir}/qserverd %{_initrddir}/pbs_server %dir %{_var}/log/torque/server_logs @@ -796,6 +797,12 @@ fi %endif %changelog +* Sun Jan 12 2014 Haïkel Guémar - 4.2.6.1-1 +- upstream 4.2.6.1 + +* Wed Nov 13 2013 Haïkel Guémar - 4.2.6-1 +- upstream 4.2.6 + * Fri Aug 16 2013 Orion Poplawski - 3.0.4-4 - Add missing BRs for latex docs @@ -826,7 +833,7 @@ fi * Mon Sep 19 2011 Steve Traylen - 3.0.2-3 - Add --with-tcp-retry-limit=2 to build, rhbz#738576. -* Wed Aug 31 2011 Steve Traylen - 3.0.2-2 +* Tue Aug 30 2011 Steve Traylen - 3.0.2-2 - Move checkpoint directory from torque-mom to torque package. rhbz#734878. @@ -923,7 +930,7 @@ fi * Wed Feb 25 2009 Fedora Release Engineering - 2.1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Apr 17 2008 Garrick Staples 2.1.10-6 +* Wed Apr 16 2008 Garrick Staples 2.1.10-6 - add alternatives system * Thu Feb 14 2008 Garrick Staples 2.1.10-5 From bc8451121fec00f341418feaadbf6174e072a6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 21 May 2014 12:42:21 +0200 Subject: [PATCH 28/41] - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 6d64e18..0f3f151 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -797,6 +797,9 @@ fi %endif %changelog +* Wed May 21 2014 Jaroslav Škarvada - 4.2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + * Sun Jan 12 2014 Haïkel Guémar - 4.2.6.1-1 - upstream 4.2.6.1 From a228f6a4ed9a7c0ca763f2a8f78a8a7800e3ba14 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 03:47:06 -0500 Subject: [PATCH 29/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 0f3f151..6387d04 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -797,6 +797,9 @@ fi %endif %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed May 21 2014 Jaroslav Škarvada - 4.2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 From 3282eeabe0024465f9ce6c7cf2957d252cfa3bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 17 Jul 2014 15:08:47 +0200 Subject: [PATCH 30/41] Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455). - Pass --without-debug to %configure to let configure pass through %optflags (RHBZ#1074571). - Fix twice listed files in *-devel. --- torque.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/torque.spec b/torque.spec index 6387d04..66df7e2 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -353,11 +353,11 @@ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ chmod 644 torque.setup %build -CFLAGS="%{optflags} -Wno-overlength-strings" +CFLAGS="%{optflags} -Wno-overlength-strings -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" %configure --includedir=%{_includedir}/torque \ --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=%{_sbindir}/sendmail --disable-static \ - --with-tcp-retry-limit=2 \ + --with-tcp-retry-limit=2 --without-debug \ --enable-drmaa --enable-munge-auth \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} @@ -664,14 +664,8 @@ fi %files devel %defattr(-, root, root, -) %{_libdir}/libtorque.so -%{_includedir}/torque/pbs_error.h -%{_includedir}/torque/pbs_error_db.h -%{_includedir}/torque/pbs_ifl.h -%{_includedir}/torque/rm.h -%{_includedir}/torque/rpp.h -%{_includedir}/torque/tm.h -%{_includedir}/torque/tm_.h -%{_includedir}/torque/*.h +%{_includedir}/torque +%exclude %{_includedir}/torque/drmaa.h %{_bindir}/pbs-config %{_mandir}/man3/pbs_alterjob.3.* %{_mandir}/man3/pbs_connect.3.* @@ -797,6 +791,13 @@ fi %endif %changelog +* Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-4 +- Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around + Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455). +- Pass --without-debug to %%configure to let configure pass through + %%optflags (RHBZ#1074571). +- Fix twice listed files in *-devel. + * Sun Jun 08 2014 Fedora Release Engineering - 4.2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d5159863fa3a515a38367b9c865085e42d14b4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 17 Jul 2014 15:19:31 +0200 Subject: [PATCH 31/41] Reflect upstream URL and Source0 having changed. --- torque.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/torque.spec b/torque.spec index 66df7e2..2e2cdeb 100644 --- a/torque.spec +++ b/torque.spec @@ -71,9 +71,9 @@ Name: torque Version: 4.2.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager -Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz +Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png @@ -91,7 +91,7 @@ Patch1: torque-munge-size.patch License: OpenPBS and TORQUEv1.1 Group: System Environment/Daemons -URL: http://www.clusterresources.com/products/torque/ +URL: http://www.adaptivecomputing.com/products/open-source/torque/ %if 0%{?el4}%{?el5} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -791,6 +791,9 @@ fi %endif %changelog +* Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-5 +- Reflect upstream URL and Source0 having changed. + * Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-4 - Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455). From 3499f19984c57e6294f3a4e24362d787b7402907 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:08:48 +0000 Subject: [PATCH 32/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/torque.spec b/torque.spec index 2e2cdeb..98a759a 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -791,6 +791,9 @@ fi %endif %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 4.2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 17 2014 Ralf Corsépius - 4.2.6.1-5 - Reflect upstream URL and Source0 having changed. From f33844324cb5922c7090ee6bc22b1fe01c68a2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= Date: Mon, 1 Sep 2014 10:24:13 +0200 Subject: [PATCH 33/41] upstream 4.2.8 --- .gitignore | 1 + sources | 2 +- torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 97388d2..581d76a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /torque-3.0.3.tar.gz /torque-3.0.4.tar.gz /torque-4.2.6.1.tar.gz +/torque-4.2.8.tar.gz diff --git a/sources b/sources index d5f8326..eafec14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a87afed9436967cf10468ef76a7e8fcd torque-4.2.6.1.tar.gz +3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz diff --git a/torque.spec b/torque.spec index 98a759a..fde49f6 100644 --- a/torque.spec +++ b/torque.spec @@ -70,8 +70,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 4.2.6.1 -Release: 6%{?dist} +Version: 4.2.8 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -791,6 +791,9 @@ fi %endif %changelog +* Mon Sep 01 2014 Haïkel Guémar - 4.2.8-1 +- upstream 4.2.8 + * Mon Aug 18 2014 Fedora Release Engineering - 4.2.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From f4f149069f728b33e19ea8b5aef98f646ab987b1 Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 14 Oct 2014 22:56:44 -0700 Subject: [PATCH 34/41] do this just to commit the broken stuff --- .gitignore | 3 --- sources | 4 ---- torque-munge-size.patch | 8 -------- torque.spec | 10 +++++----- 4 files changed, 5 insertions(+), 20 deletions(-) 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 - 2.5.7-3 - Add --with-tcp-retry-limit=2 to build, rhbz#738576. -* Tue Aug 30 2011 Steve Traylen - 3.0.2-2 +* Wed Aug 31 2011 Steve Traylen - 2.5.7-2 - Move checkpoint directory from torque-mom to torque package. rhbz#734878. -* Wed Aug 30 2011 Steve Traylen - 2.5.7-2 +* Tue Aug 30 2011 Steve Traylen - 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 - 2.5.5-3 -- Removes nodes database file from package rhbz#716659 - * Mon Jun 27 2011 Steve Traylen - 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 - 3.0.1-4 - Removes nodes database file from package rhbz#716659 +* Sun Jun 26 2011 Steve Traylen - 2.5.5-3 +- Removes nodes database file from package rhbz#716659 + * Fri Jun 17 2011 Steve Traylen - 3.0.1-3 - Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky From fb931f6fe1badc6f4cd4cb0ae4282c9b608c7804 Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 14 Oct 2014 22:57:24 -0700 Subject: [PATCH 35/41] fix the torque munge patch --- torque-munge-size.patch | 6 ------ 1 file changed, 6 deletions(-) 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?= Date: Sun, 12 Jan 2014 11:42:32 +0100 From 4ed91f1ba87234f0729b50c329a9f15db88fe22e Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 14 Oct 2014 23:22:04 -0700 Subject: [PATCH 36/41] bumped release --- torque.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 - 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 - 4.2.8-1 - upstream 4.2.8 @@ -903,7 +907,7 @@ fi * Fri Jun 17 2011 Steve Traylen - 3.0.1-3 - Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky -* Wed Jun 11 2011 Steve Traylen - 2.5.5-2 +* Wed Jun 8 2011 Steve Traylen - 2.5.5-2 - Add torque-buffer-overrun.patch rhbz#711463 * Wed Jun 8 2011 Steve Traylen - 3.0.1-2 @@ -941,7 +945,6 @@ fi * Thu Dec 9 2010 Steve Traylen - 3.0.0-1 - New upstream 3.0.0. Drop patches torque-cond-touch.patch and torque-start-start.patch since both upstream now. ->>>>>>> master * Wed Dec 8 2010 Steve Traylen - 2.5.3-3 - Remove own copy of pbs-config. #657027 From 6232a919bdd59b39e14092336b50a9925b1c3d3c Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:47:00 +0000 Subject: [PATCH 37/41] Add an AppData file for the software center --- torque.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 < + + + CC0-1.0 + xpbsmon.desktop + + xpbs.desktop + + +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 - 4.2.8-2 +- Add an AppData file for the software center + * Mon Sep 01 2014 Haïkel Guémar - 4.2.8-1 - upstream 4.2.8 From 2ac0fc257d16c226c44af789c82655eaddc4168c Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 2 Apr 2015 09:59:48 -0700 Subject: [PATCH 38/41] version bump to merge from master --- torque.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 - 4.2.8-3 +- Version bump to merge from previous version + * Thu Mar 26 2015 Richard Hughes - 4.2.8-2 - Add an AppData file for the software center From 13a37e1cb58b7b89bbb359f04070f9301f001cfb Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 6 Apr 2015 18:55:39 -0700 Subject: [PATCH 39/41] updated upstream source --- .gitignore | 1 + sources | 1 + torque.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) 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 - 4.2.10-1 +- Updated upstream version + * Thu Mar 26 2015 Richard Hughes - 4.2.8-2 - Add an AppData file for the software center From e23e1e70273d9c9727eb81b1fc84a4516adb19b3 Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 7 Apr 2015 20:52:34 -0700 Subject: [PATCH 40/41] this works except for doxygen produces bad latex https://bugzilla.gnome.org/show_bug.cgi?id=742427 --- torque.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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} From a617210d68a862ed7d83ec3444ea2a9d1138d636 Mon Sep 17 00:00:00 2001 From: David Brown Date: Fri, 24 Apr 2015 21:57:00 -0700 Subject: [PATCH 41/41] add some hacks to manipulate services better --- torque.spec | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/torque.spec b/torque.spec index 8da6b7a..da27a35 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.10 -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 @@ -135,6 +135,8 @@ BuildRequires: tetex-latex %endif %endif +Requires(post): /bin/grep /etc/services + %description TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource manager providing control over batch jobs and distributed compute nodes. @@ -496,21 +498,17 @@ EOF rm -rf %{buildroot} %post -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 +for srvs in pbs:15001 pbs_mon:15002 pbs_resmom:15003 pbs_sched:15004 ; do + port=${srvs/*:/} + srvs=${srvs/:*/} + for proto in tcp udp ; do + if ! grep -q $srvs'\W\W*'$port'/'$proto /etc/services;then + cat<<__EOF__>>/etc/services +$srvs $port/$proto __EOF__ -fi + fi + done +done %posttrans client /usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \ @@ -815,6 +813,9 @@ fi %endif %changelog +* Fri Apr 24 2015 David Brown - 4.2.10-2 +- Bugfix - #1154413 make manipulating services better. + * Mon Apr 6 2015 David Brown - 4.2.10-1 - Updated upstream version