[torque/el5] Add torque-buffer-overrun.patch , rhbz#711463

[stevetraylen]

commit fc87943b30f7252fef70bca81ce6614eaf43cd6b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Jun 8 19:52:59 2011 +0200

    Add torque-buffer-overrun.patch , rhbz#711463

 torque-buffer-overrun-2.3.13.patch |  122 ++++++++++++++++++++++++++++++++++++
 torque.spec                        |    9 ++-
 2 files changed, 129 insertions(+), 2 deletions(-)
---
diff --git a/torque-buffer-overrun-2.3.13.patch b/torque-buffer-overrun-2.3.13.patch
new file mode 100644
index 0000000..705a56d
--- /dev/null
+++ b/torque-buffer-overrun-2.3.13.patch
@@ -0,0 +1,122 @@
+diff -uNr torque-2.3.13.ORIG/src/lib/Libnet/get_hostaddr.c torque-2.3.13/src/lib/Libnet/get_hostaddr.c
+--- torque-2.3.13.ORIG/src/lib/Libnet/get_hostaddr.c	2011-06-08 16:21:35.185913002 +0200
++++ torque-2.3.13/src/lib/Libnet/get_hostaddr.c	2011-06-08 16:30:06.784913002 +0200
+@@ -143,7 +143,8 @@
+ 
+   if (hp == NULL)
+     {
+-    sprintf(log_buffer,"cannot resolve IP address for host '%s' herror=%d: %s",
++    snprintf(log_buffer, sizeof(log_buffer),
++      "cannot resolve IP address for host '%s' herror=%d: %s",
+       hostname,
+       h_errno,
+       hstrerror(h_errno));
+diff -uNr torque-2.3.13.ORIG/src/server/req_quejob.c torque-2.3.13/src/server/req_quejob.c
+--- torque-2.3.13.ORIG/src/server/req_quejob.c	2011-06-08 16:21:35.244913002 +0200
++++ torque-2.3.13/src/server/req_quejob.c	2011-06-08 16:29:05.238913002 +0200
+@@ -930,17 +930,20 @@
+     {
+     if (errno == 0)
+       {
+-      sprintf(log_buffer, "job %s in unexpected state '%s'",
+-              pj->ji_qs.ji_jobid,
+-              PJobSubState[pj->ji_qs.ji_substate]);
++      snprintf(log_buffer, sizeof(log_buffer),
++        "job %s in unexpected state '%s'",
++        pj->ji_qs.ji_jobid,
++        PJobSubState[pj->ji_qs.ji_substate]);
++
+       }
+     else
+       {
+-      sprintf(log_buffer, "job %s in unexpected state '%s' (errno=%d - %s)",
+-              pj->ji_qs.ji_jobid,
+-              PJobSubState[pj->ji_qs.ji_substate],
+-              errno,
+-              strerror(errno));
++      snprintf(log_buffer, sizeof(log_buffer),
++        "job %s in unexpected state '%s' (errno=%d - %s)",
++        pj->ji_qs.ji_jobid,
++        PJobSubState[pj->ji_qs.ji_substate],
++        errno,
++        strerror(errno));
+       }
+ 
+     log_err(errno, id, log_buffer);
+@@ -1141,9 +1144,10 @@
+ 
+   if (LOGLEVEL >= 6)
+     {
+-    sprintf(log_buffer, "successfully moved file '%s' for job '%s'",
+-            namebuf,
+-            preq->rq_ind.rq_jobfile.rq_jobid);
++    snprintf(log_buffer, sizeof(log_buffer),
++      "successfully moved file '%s' for job '%s'",
++      namebuf,
++      preq->rq_ind.rq_jobfile.rq_jobid);
+ 
+     log_record(
+       PBSEVENT_JOB,
+@@ -1251,9 +1255,11 @@
+     {
+     char tmpLine[1024];
+ 
+-    sprintf(tmpLine, "cannot save job - errno=%d - %s",
+-            errno,
+-            strerror(errno));
++    snprintf(tmpLine, sizeof(tmpLine),
++      "cannot save job - errno=%d - %s",
++      errno,
++      strerror(errno));
++
+ 
+     log_err(errno, "req_rdytocommit", tmpLine);
+ 
+@@ -1277,9 +1283,11 @@
+     {
+     /* reply failed, purge the job and close the connection */
+ 
+-    sprintf(log_buffer, "cannot report jobid - errno=%d - %s",
+-            errno,
+-            strerror(errno));
++    snprintf(log_buffer, sizeof(log_buffer),
++      "cannot report jobid - errno=%d - %s",
++      errno,
++      strerror(errno));
++
+ 
+     log_err(errno, "req_rdytocommit", log_buffer);
+ 
+@@ -1557,11 +1565,13 @@
+ 
+   /* need to format message first, before request goes away */
+ 
+-  sprintf(log_buffer, msg_jobnew,
+-          preq->rq_user, preq->rq_host,
+-          pj->ji_wattr[(int)JOB_ATR_job_owner].at_val.at_str,
+-          pj->ji_wattr[(int)JOB_ATR_jobname].at_val.at_str,
+-          pj->ji_qhdr->qu_qs.qu_name);
++  snprintf(log_buffer, sizeof(log_buffer),
++    msg_jobnew,
++    preq->rq_user, preq->rq_host,
++    pj->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
++    pj->ji_wattr[JOB_ATR_jobname].at_val.at_str,
++    pj->ji_qhdr->qu_qs.qu_name);
++
+ 
+   /* acknowledge the request with the job id */
+ 
+@@ -1591,8 +1601,11 @@
+     {
+     if (LOGLEVEL >= 7)
+       {
+-      sprintf(log_buffer, "Trying to AUTORUN job %s",
+-              pj->ji_qs.ji_jobid);
++      snprintf(log_buffer, sizeof(log_buffer),
++        "Trying to AUTORUN job %s",
++        pj->ji_qs.ji_jobid);
++
++
+       log_record(
+         PBSEVENT_JOB,
+         PBS_EVENTCLASS_JOB,
diff --git a/torque.spec b/torque.spec
index d9a1ff3..a563ddc 100644
--- a/torque.spec
+++ b/torque.spec
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.3.13
 #%%define snap 200604251602
-%define release 1
+%define release 2
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -92,6 +92,8 @@ Source4: xpbs.png
 Source5: xpbsmon.png
 Source6: README-localhost
 Source7: pbs-config-multilib
+# https://bugzilla.redhat.com/show_bug.cgi?id=711463
+Patch0:  torque-buffer-overrun-2.3.13.patch
 License: OpenPBS
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -122,7 +124,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} .
 
 
@@ -465,6 +467,9 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
 
 
 %changelog
+* Wed Jun 8 2011 Steve Traylen <steve.traylen at cern.ch> - 2.3.13-2
+- Add torque-buffer-overrun.patch , rhbz#711463
+
 * Tue Sep 29 2010 Steve Traylen <steve.traylen at cern.ch> - 2.3.13-1
 - New upstream 2.3.13