Fix <https://issues.guix.gnu.org/61095>, which affects GNU/Hurd.

diff --git a/libguile/posix.c b/libguile/posix.c
index 3a8be94e4..f5fdc544c 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1326,7 +1326,14 @@ static void
 close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd)
 {
   while (--max_fd > 2)
-    posix_spawn_file_actions_addclose (actions, max_fd);
+    {
+      /* Adding invalid file descriptors to an 'addclose' action leads
+         to 'posix_spawn' failures on some operating systems:
+         <https://bugs.gnu.org/61095>.  Hence the extra check.  */
+      int flags = fcntl (max_fd, F_GETFD, NULL);
+      if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0))
+        posix_spawn_file_actions_addclose (actions, max_fd);
+    }
 }
 
 static void

Fix <https://issues.guix.gnu.org/62501>.

diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test
index f20e04453..d5cf47cda 100644
--- a/test-suite/tests/posix.test
+++ b/test-suite/tests/posix.test
@@ -431,7 +431,13 @@
       (let ((str (get-string-all (car input+output))))
         (close-port (car input+output))
         (waitpid pid)
-        str)))
+
+        ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for
+        ;; every program: <https://bugs.gnu.org/62501>.  Strip it.
+        (if (and (string=? "GNU" (utsname:sysname (uname)))
+                 (string-prefix? "LD_ORIGIN_PATH=" str))
+            (string-drop str (+ 1 (string-index str #\newline)))
+            str))))
 
   (pass-if-equal "ls /proc/self/fd"
       "0\n1\n2\n3\n"                     ;fourth FD is for /proc/self/fd
crates-io.scm'>
<input type='hidden' name='id' value='f0ae1d6d023853520d4c3c986a2365252e89fc34'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/diff/?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>root</a>/<a href='/guix/diff/gnu?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>gnu</a>/<a href='/guix/diff/gnu/packages?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>packages</a>/<a href='/guix/diff/gnu/packages/crates-io.scm?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>crates-io.scm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='f0ae1d6d023853520d4c3c986a2365252e89fc34'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/guix/diff/?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>Diffstat</a> (limited to 'gnu/packages/crates-io.scm')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/guix/diff/gnu/packages/crates-io.scm?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>gnu/packages/crates-io.scm</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='47%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 47 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm<br/>index 1469a3f2fb..2b0a040512 100644<br/>--- a/<a href='/guix/tree/gnu/packages/crates-io.scm?id=c78a24ac94fe411852fabe1914c09ca72f3befbc'>gnu/packages/crates-io.scm</a><br/>+++ b/<a href='/guix/tree/gnu/packages/crates-io.scm?id=f0ae1d6d023853520d4c3c986a2365252e89fc34'>gnu/packages/crates-io.scm</a></div>