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] 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