[gridengine/el5: 5/7] Update to 6.1u4 from fedora branch

[Orion Poplawski]

commit c50c0dd26ec2bbc61fb313e9837cad8b022ff969
Merge: 88ee2b4 6d6475f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Apr 17 13:38:07 2012 -0600

    Update to 6.1u4 from fedora branch

 .cvsignore                         |    2 +
 gridengine-6.1u2-qstat-xml.patch   |    1 +
 gridengine-6.1u3-csh.patch         |   15 +++++++
 gridengine-6.1u4-execd.patch       |   11 +++++
 gridengine-6.1u4-qmon.patch        |   11 +++++
 gridengine-6.1u4-rctemplates.patch |   14 +++++++
 gridengine.spec                    |   75 +++++++++++++++++++++++++++++-------
 sources                            |    2 +-
 8 files changed, 116 insertions(+), 15 deletions(-)
---
diff --cc gridengine-6.1u2-qstat-xml.patch
index d874cc6,6102f2b..998049b
--- a/gridengine-6.1u2-qstat-xml.patch
+++ b/gridengine-6.1u2-qstat-xml.patch
@@@ -13,4 -12,4 +13,5 @@@ diff -up gridengine/source/clients/qsta
  +   if (!summary->has_load_value && summary->has_load_value_from_object) {
         xml_append_Attr_D(attribute_list, "load_avg", summary->load_avg);
      }
 +    
+ 
diff --cc gridengine.spec
index 4afcc39,4b1ccca..35f8008
--- a/gridengine.spec
+++ b/gridengine.spec
@@@ -39,19 -39,14 +39,19 @@@ Patch14: gridengine-6.1u2-x86_64.patc
  Patch15: gridengine-6.0u8-lesstif.patch
  Patch16: gridengine-6.1u2-java.patch
  Patch17: gridengine-6.1u3-open.patch
- Patch18: gridengine-6.1u2-qmon.patch
+ Patch18: gridengine-6.1u4-qmon.patch
  Patch19: gridengine-6.1u2-auto.patch
  Patch20: gridengine-6.1u2-qstat-xml.patch
- Patch21: gridengine-6.1u3-execd.patch
+ Patch21: gridengine-6.1u4-execd.patch
  Patch22: gridengine-6.1u3-rpath.patch
- Patch23: gridengine-6.1u3-rctemplates.patch
- Patch24: gridengine-6.1u3-perm.patch
+ Patch23: gridengine-6.1u4-rctemplates.patch
  Patch25: gridengine-6.1u3-libs.patch
+ Patch26: gridengine-6.1u3-csh.patch
 +# Upstream security patches
 +Patch30: gridengine-6.1u3-env-code-injection.patch
 +Patch31: buffer-overflow.patch
 +Patch32: symlink.patch
 +
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
@@@ -157,12 -154,8 +159,11 @@@ sed -i -e '/^#! *\/bin\/sh/d' source/di
  %patch21 -p1 -b .execd
  %patch22 -p1 -b .rpath
  %patch23 -p1 -b .rctemplates
- %patch24 -p1 -b .perm
  %patch25 -p1 -b .libs
+ %patch26 -p1 -b .csh
 +%patch30 -p1 -b .env-code-injection
 +%patch31 -p0 -b .buffer-overflow
 +%patch32 -p1 -b .symlink
- 
  sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
  #Don't ship rctemplates
  rm -rf source/dist/util/rctemplates
diff --cc sources
index 6ac1390,b4b375a..fa466ae
--- a/sources
+++ b/sources
@@@ -1,2 -1,3 +1,2 @@@
--a0e8ff817ac79f1ad76aa7e100b3cd9c  ge-V61u3_TAG-src.tar.gz
  a03b0663e8a8912d67adf281c5c49eb4  gridengine-ppc.tar.gz
+ d47aee70a978ab59e6a74c3e96c47dd8  ge-V61u4_TAG-src.tar.gz