[gridengine/el5: 6/7] Rebase env-code-injection patch

[Orion Poplawski]

commit eb7bc8a00ac863de4b246a83cdcadf33280b9a01
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Apr 17 13:40:03 2012 -0600

    Rebase env-code-injection patch

 ...ch => gridengine-6.1u4-env-code-injection.patch |   24 ++++++++++----------
 gridengine.spec                                    |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/gridengine-6.1u3-env-code-injection.patch b/gridengine-6.1u4-env-code-injection.patch
similarity index 87%
rename from gridengine-6.1u3-env-code-injection.patch
rename to gridengine-6.1u4-env-code-injection.patch
index 960232c..0f1edcf 100644
--- a/gridengine-6.1u3-env-code-injection.patch
+++ b/gridengine-6.1u4-env-code-injection.patch
@@ -1,6 +1,6 @@
 diff -up gridengine/source/daemons/shepherd/builtin_starter.c.env-code-injection gridengine/source/daemons/shepherd/builtin_starter.c
---- gridengine/source/daemons/shepherd/builtin_starter.c.env-code-injection	2007-07-04 03:38:38.000000000 -0600
-+++ gridengine/source/daemons/shepherd/builtin_starter.c	2012-04-17 13:21:36.176480523 -0600
+--- gridengine/source/daemons/shepherd/builtin_starter.c.env-code-injection	2007-12-11 03:37:56.000000000 -0700
++++ gridengine/source/daemons/shepherd/builtin_starter.c	2012-04-17 13:38:28.004918108 -0600
 @@ -47,6 +47,7 @@
  #include "uti/sge_unistd.h"
  #include "setosjobid.h"
@@ -72,7 +72,7 @@ diff -up gridengine/source/daemons/shepherd/builtin_starter.c.env-code-injection
           value = "";
 diff -up gridengine/source/daemons/shepherd/builtin_starter.h.env-code-injection gridengine/source/daemons/shepherd/builtin_starter.h
 --- gridengine/source/daemons/shepherd/builtin_starter.h.env-code-injection	2007-01-03 12:00:54.000000000 -0700
-+++ gridengine/source/daemons/shepherd/builtin_starter.h	2012-04-17 13:22:40.373160760 -0600
++++ gridengine/source/daemons/shepherd/builtin_starter.h	2012-04-17 13:38:28.005918072 -0600
 @@ -34,7 +34,7 @@
  
  
@@ -83,9 +83,9 @@ diff -up gridengine/source/daemons/shepherd/builtin_starter.h.env-code-injection
  int sge_set_env_value(const char *, const char *);
  const char *sge_get_env_value(const char *);
 diff -up gridengine/source/daemons/shepherd/shepherd.c.env-code-injection gridengine/source/daemons/shepherd/shepherd.c
---- gridengine/source/daemons/shepherd/shepherd.c.env-code-injection	2007-10-30 05:32:05.000000000 -0600
-+++ gridengine/source/daemons/shepherd/shepherd.c	2012-04-17 13:22:21.866829491 -0600
-@@ -1789,7 +1789,7 @@ char *childname            /* "job", "pe
+--- gridengine/source/daemons/shepherd/shepherd.c.env-code-injection	2008-02-04 03:14:15.000000000 -0700
++++ gridengine/source/daemons/shepherd/shepherd.c	2012-04-17 13:38:28.007918001 -0600
+@@ -1788,7 +1788,7 @@ char *childname            /* "job", "pe
  
  #if defined(INTERIX)
  /* <Windows_GUI> */
@@ -94,7 +94,7 @@ diff -up gridengine/source/daemons/shepherd/shepherd.c.env-code-injection griden
        if(strcmp(childname, "job") == 0 &&
           wl_get_GUI_mode(get_conf_val("display_win_gui")) == true) {
           if(npid != -1) {      
-@@ -1887,7 +1887,7 @@ char *childname            /* "job", "pe
+@@ -1886,7 +1886,7 @@ char *childname            /* "job", "pe
              }
           } else {
  #if defined(INTERIX)
@@ -103,7 +103,7 @@ diff -up gridengine/source/daemons/shepherd/shepherd.c.env-code-injection griden
              if(strcmp(childname, "job") == 0 &&
                 wl_get_GUI_mode(get_conf_val("display_win_gui")) == true) {
                 /*
-@@ -2157,7 +2157,7 @@ static int start_async_command(const cha
+@@ -2156,7 +2156,7 @@ static int start_async_command(const cha
        pid = getpid();
        setpgid(pid, pid);  
        setrlimits(0);
@@ -113,14 +113,14 @@ diff -up gridengine/source/daemons/shepherd/shepherd.c.env-code-injection griden
        tmp_str = search_conf_val("qsub_gid");
        if (tmp_str && strcmp(tmp_str, "no")) {
 diff -up gridengine/source/libs/gdi/version.c.env-code-injection gridengine/source/libs/gdi/version.c
---- gridengine/source/libs/gdi/version.c.env-code-injection	2007-10-31 07:46:10.000000000 -0600
-+++ gridengine/source/libs/gdi/version.c	2012-04-17 13:12:21.448526462 -0600
+--- gridengine/source/libs/gdi/version.c.env-code-injection	2008-02-26 08:11:04.000000000 -0700
++++ gridengine/source/libs/gdi/version.c	2012-04-17 13:38:59.783769787 -0600
 @@ -34,7 +34,7 @@
  
  #include "version.h"
  
--const char GDI_VERSION[] = "6.1u3";
-+const char GDI_VERSION[] = "6.1u3p1";
+-const char GDI_VERSION[] = "6.1u4";
++const char GDI_VERSION[] = "6.1u4p1";
  
  const gdi_ulong32 GRM_GDI_VERSION = 0x10002000;
  
diff --git a/gridengine.spec b/gridengine.spec
index 35f8008..51253cd 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -48,7 +48,7 @@ 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
+Patch30: gridengine-6.1u4-env-code-injection.patch
 Patch31: buffer-overflow.patch
 Patch32: symlink.patch