[torque/el5] Enabled or rather force munge support.

[stevetraylen]

commit 2d2e1e93dee265e3e532974503aff824a0a529de
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Jul 26 14:33:00 2011 +0200

    Enabled or rather force munge support.

 torque-munge-size.patch |   12 ++++++++++++
 torque.spec             |   12 ++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
---
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 b01637f..d2e9375 100644
--- a/torque.spec
+++ b/torque.spec
@@ -92,6 +92,11 @@ Source4: xpbs.png
 Source5: xpbsmon.png
 Source6: README-localhost
 Source7: pbs-config-multilib
+
+# 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/
@@ -122,6 +127,7 @@ This package holds just a few shared files and directories.
 
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
+%patch0 -p1
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
 
@@ -130,6 +136,7 @@ This package holds just a few shared files and directories.
   --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
   --with-sendmail=/usr/sbin/sendmail \
+  --enable-munge-auth \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
 %__cp -vf pbs-config-multilib pbs-config
@@ -272,6 +279,7 @@ fi
 Group: System Environment/Daemons
 Summary: The main part of TORQUE
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: munge
 Provides: pbs-server
 %description server
 %shared_description
@@ -300,6 +308,7 @@ fi
 Group: System Environment/Daemons
 Summary: Node execution daemon for TORQUE
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: munge
 Provides: pbs-mom
 %description mom
 %shared_description
@@ -333,6 +342,7 @@ fi
 Group: Applications/System
 Summary: Client part of TORQUE
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: munge
 Provides: pbs-client
 %description client
 %shared_description
@@ -420,6 +430,7 @@ This package holds the graphical clients.
 Summary: Run-time libs for programs which will use the %{name} library
 Group: Development/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: munge
 
 %description -n lib%{name}
 %shared_description
@@ -468,6 +479,7 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
 * Thu Jul 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-1
 - Big update to 2.5.7-1, drop torque-buffer-overrun-2.3.13.patch,
   change license from OpenPBS to OpenPBS and TORQUEv1.1
+- Enabled or rather force munge support.
 
 * Wed Jun 8 2011 Steve Traylen <steve.traylen at cern.ch> - 2.3.13-2
 - Add torque-buffer-overrun.patch , rhbz#711463