From 73d9b77a11b4516905caf579abb559736f715ea6 Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Mon, 11 Apr 2022 20:43:18 -0400
Subject: [PATCH] Zuo: patch zuo_process for "/bin/sh" on Guix

If:

    1. The nonstandard but ubiquitous macro `_PATH_BSHELL` from
       <paths.h> is defined; and

    2. `zuo_process` is called with the exact path "/bin/sh"; and

    3. The path specified by `_PATH_BSHELL` exists;

then `zuo_process` will execute the file specified by `_PATH_BSHELL`
instead of "/bin/sh".

Checking that the path specified by `_PATH_BSHELL` exists safeguards
against obscure errors if attempting to use stand-alone executables
built by the patched Racket in non-Guix envoronments.
---
 racket/src/zuo/zuo.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/racket/src/zuo/zuo.c b/racket/src/zuo/zuo.c
index 17f161826d..c4fb3929bb 100644
--- a/racket/src/zuo/zuo.c
+++ b/racket/src/zuo/zuo.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <ctype.h>
 #ifdef ZUO_UNIX
+# include <paths.h> /* PATCHED for Guix */
 # include <fcntl.h>
 # include <unistd.h>
 # include <errno.h>
@@ -5730,7 +5731,10 @@ static void zuo_pipe(zuo_raw_handle_t *_r, zuo_raw_handle_t *_w)
 zuo_t *zuo_process(zuo_t *command_and_args)
 {
   const char *who = "process";
-  zuo_t *command = _zuo_car(command_and_args);
+  /* BEGIN PATCH for Guix */
+  zuo_t *_guix_orig_command = _zuo_car(command_and_args);
+  zuo_t *command;
+  /* END PATCH for Guix */
   zuo_t *args = _zuo_cdr(command_and_args), *rev_args = z.o_null;
   zuo_t *options = z.o_empty_hash, *opt;
   zuo_t *dir, *l, *p_handle, *result;
@@ -5741,7 +5745,19 @@ zuo_t *zuo_process(zuo_t *command_and_args)
   void *env;
   int as_child, exact_cmdline;
 
-  check_path_string(who, command);
+  /* BEGIN PATCH for Guix */
+  check_path_string(who, _guix_orig_command);
+#if defined(_PATH_BSHELL)
+  command =
+    ((z.o_false == zuo_string_eql(_guix_orig_command, zuo_string("/bin/sh")))
+     || (z.o_false == zuo_stat(zuo_string(_PATH_BSHELL), z.o_false, z.o_true)))
+    ? _guix_orig_command
+    : zuo_string(_PATH_BSHELL);
+#else
+  command = _guix_orig_command;
+#endif
+  /* END PATCH for Guix */
+
   for (l = args; l->tag == zuo_pair_tag; l = _zuo_cdr(l)) {
     zuo_t *a = _zuo_car(l);
     if (a == z.o_null) {

base-commit: 87eee6e2adb8c6bc11e60619c706fa6295096085
-- 
2.32.0

nt'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/gsasl.scm?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-02 20:43:26 +0200'>2021-01-02</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=b252db39ef982d763738f692dccb806b1673b99a'>gnu: gsasl: Update to 1.10.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gsasl.scm (gsasl): Update to 1.10.0.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-12-31 14:42:15 +0200'>2020-12-31</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=c9156e811c8f4ef90d3e45726535d9e9dc81f912'>gnu: gsasl: Fix cross compiling.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/45545&gt;.

* gnu/packages/gsasl.scm (gsasl)[native-inputs]: Add libgcrypt.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-04-30 12:50:06 -0400'>2020-04-30</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=194cb75d85a2d282419b2a618c8e124f140859f3'>gnu: libntlm: Update to 1.6 [fixes CVE-2019-17455].</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gsasl.scm (libntlm): Update to 1.6.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Simon Josefsson</td></tr>
<tr><td><span title='2020-01-23 22:43:46 +0100'>2020-01-23</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=10214fa9f637a6c780ccca1710413e67fe9b3d83'>gnu: gsasl: Do not build 'libgsasl.a'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gsasl.scm (gsasl)[arguments]: Add "--disable-static" to
 #:configure-flags.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-01-23 22:43:46 +0100'>2020-01-23</span></td><td><a href='/guix/commit/gnu/packages/gsasl.scm?id=df8a9c7496c82f56560ce5e84c2c27c83010e64d'>gnu: gsasl: Update to 1.8.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gsasl.scm (gsasl): Update to 1.8.1.
[source](modules, snippet): Remove.
[inputs]: Add LIBGCRYPT.
</span></span></td><td>Marius Bakke</td></tr>