From 4a8756d7becbaabbf042c935056bad4919b1b105 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:11:22 +0000
Subject: [PATCH 1/4] updated v0.52.0

---
 recipe/meta.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 1524c07..b021883 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "flux-core" %}
-{% set version = "0.51.0" %}
+{% set version = "0.52.0" %}
 
 package:
   name: {{ name|lower }}
@@ -7,7 +7,7 @@ package:
 
 source:
   url: https://github.com/flux-framework/flux-core/releases/download/v{{ version }}/flux-core-{{ version }}.tar.gz
-  sha256: e57b71b708482f20d2a2195a000c0c3b9176faa6aaadfad4d2117f8671ca67ce
+  sha256: dca434238405e4cae4686c8143f2cc79919bfd9e26b09c980e1e5f69ffd0c448
   patches:
     - centos6.patch  # This patch can be removed once the conda-forge reference is updated
     - signal.patch

From 827f41b636ba3f2b207f712c961244266a43b73d Mon Sep 17 00:00:00 2001
From: Jan Janssen <jan-janssen@users.noreply.github.com>
Date: Fri, 7 Jul 2023 08:59:05 -0600
Subject: [PATCH 2/4] Update centos6.patch

---
 recipe/centos6.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipe/centos6.patch b/recipe/centos6.patch
index 59e086f..e1a4762 100644
--- a/recipe/centos6.patch
+++ b/recipe/centos6.patch
@@ -58,10 +58,10 @@ index eeeb2c581..79747091d 100644
  }
  
 diff --git a/src/cmd/flux-job.c b/src/cmd/flux-job.c
-index 979c7fbf7..2eb7c7a8b 100644
+index bbbee11ee68..719a165322c 100644
 --- a/src/cmd/flux-job.c
 +++ b/src/cmd/flux-job.c
-@@ -1672,9 +1672,12 @@ static void handle_output_data (struct attach_ctx *ctx, json_t *context)
+@@ -1660,9 +1660,12 @@ static void handle_output_data (struct attach_ctx *ctx, json_t *context)
      else
          fp = stderr;
      if (len > 0) {
@@ -72,17 +72,17 @@ index 979c7fbf7..2eb7c7a8b 100644
 +        rc = fwrite (data, len, 1, fp);
 +        (void) rc;
 +
-         fflush (fp);
-     }
-     free (data);
-@@ -2205,7 +2208,9 @@ void handle_exec_log_msg (struct attach_ctx *ctx, double ts, json_t *context)
+         /*  If attached to a pty, terminal is in raw mode so a carriage
+          *  return will be necessary to return cursor to the start of line.
+          */
+@@ -2217,7 +2220,9 @@ void handle_exec_log_msg (struct attach_ctx *ctx, double ts, json_t *context)
                   rank,
                   stream);
      }
 -    fwrite (data, len, 1, stderr);
 +    int rc = fwrite (data, len, 1, stderr);
 +    (void) rc;
-+    
++
  }
  
  static struct idset *all_taskids (const struct taskmap *map)

From 7df2914938ef0795355b66c42e27fad3fb0cb69f Mon Sep 17 00:00:00 2001
From: Jan Janssen <jan-janssen@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:08:29 -0600
Subject: [PATCH 3/4] Update meta.yaml

---
 recipe/meta.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index b021883..ad347bf 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -10,7 +10,6 @@ source:
   sha256: dca434238405e4cae4686c8143f2cc79919bfd9e26b09c980e1e5f69ffd0c448
   patches:
     - centos6.patch  # This patch can be removed once the conda-forge reference is updated
-    - signal.patch
 
 build:
   number: 0

From 829d9c126ef80c9113118d1227a351785d70b6a5 Mon Sep 17 00:00:00 2001
From: Jan Janssen <jan-janssen@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:08:45 -0600
Subject: [PATCH 4/4] Delete signal.patch

---
 recipe/signal.patch | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 recipe/signal.patch

diff --git a/recipe/signal.patch b/recipe/signal.patch
deleted file mode 100644
index 980cb95..0000000
--- a/recipe/signal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/cmd/flux-job.c b/src/cmd/flux-job.c
-index 6fe161801..f4ee5c70e 100644
---- a/src/cmd/flux-job.c
-+++ b/src/cmd/flux-job.c
-@@ -28,6 +28,7 @@
- #include <jansson.h>
- #include <argz.h>
- #include <sys/ioctl.h>
-+#include <signal.h>
- #include <flux/core.h>
- #include <flux/optparse.h>
- #include <flux/hostlist.h>