sys-cluster/torque: Add fix for dev-lang/tcl-8.6, #453154

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

1 files changed, 66 insertions, 0 deletions

diff --git a/sys-cluster/torque/files/torque-3.0.6-tcl8.6.patch b/sys-cluster/torque/files/torque-3.0.6-tcl8.6.patch
new file mode 100644
index 000000000000..c8ce7191cf65
--- /dev/null
+++ b/sys-cluster/torque/files/torque-3.0.6-tcl8.6.patch
@@ -0,0 +1,66 @@
+ src/cmds/qstat.c                | 8 ++++----
+ src/scheduler.tcl/pbs_tclWrap.c | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
+index 5f85de7..a782151 100644
+--- a/src/cmds/qstat.c
++++ b/src/cmds/qstat.c
+@@ -1856,7 +1856,7 @@ tcl_init(void)
+   if (Tcl_Init(interp) == TCL_ERROR)
+     {
+     fprintf(stderr, "Tcl_Init error: %s",
+-            interp->result);
++            Tcl_GetStringResult(interp));
+     }
+ 
+ #if TCLX
+@@ -1869,7 +1869,7 @@ tcl_init(void)
+     {
+ #endif
+     fprintf(stderr, "Tclx_Init error: %s",
+-            interp->result);
++            Tcl_GetStringResult(interp));
+     }
+ 
+ #endif /* TCLX */
+@@ -1980,10 +1980,10 @@ void tcl_run(
+     trace = (char *)Tcl_GetVar(interp, "errorInfo", 0);
+ 
+     if (trace == NULL)
+-      trace = interp->result;
++      trace = Tcl_GetStringResult(interp);
+ 
+     fprintf(stderr, "%s: TCL error @ line %d: %s\n",
+-            script, interp->errorLine, trace);
++            script, Tcl_GetErrorLine(interp), trace);
+     }
+ 
+   Tcl_DeleteInterp(interp);
+diff --git a/src/scheduler.tcl/pbs_tclWrap.c b/src/scheduler.tcl/pbs_tclWrap.c
+index e859ae5..194c24b 100644
+--- a/src/scheduler.tcl/pbs_tclWrap.c
++++ b/src/scheduler.tcl/pbs_tclWrap.c
+@@ -924,7 +924,7 @@ char *argv[];
+ 
+   if (argc != 2)
+     {
+-    sprintf(interp->result,
++    sprintf(Tcl_GetStringResult(interp),
+             "%s: wrong # args: job_id", argv[0]);
+     return TCL_ERROR;
+     }
+@@ -936,11 +936,11 @@ char *argv[];
+     return TCL_OK;
+     }
+ 
+-  interp->result = "0";
++  Tcl_SetResult(interp, "0", TCL_STATIC);
+ 
+   if (pbs_rerunjob(connector, argv[1], extend))
+     {
+-    interp->result = "-1";
++    Tcl_SetResult(interp, "-1", TCL_STATIC);
+     msg = pbs_geterrmsg(connector);
+     sprintf(log_buffer, "%s (%d)", msg ? msg : fail, pbs_errno);
+     log_err(-1, argv[0], log_buffer);