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