CVS commit: pkgsrc/devel/libuv

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct 19 07:13:40 UTC 2026

Modified Files:
        pkgsrc/devel/libuv: distinfo
        pkgsrc/devel/libuv/patches: patch-src_unix_process.c

Log Message:
libuv: limit fork workaround on NetBSD to unfixed versions

Ride bump


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/libuv/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libuv/patches/patch-src_unix_process.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libuv/distinfo
diff -u pkgsrc/devel/libuv/distinfo:1.91 pkgsrc/devel/libuv/distinfo:1.92
--- pkgsrc/devel/libuv/distinfo:1.91    Mon Oct 19 06:53:57 2026
+++ pkgsrc/devel/libuv/distinfo Mon Oct 19 07:13:40 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2026/10/19 06:53:57 kikadf Exp $
+$NetBSD: distinfo,v 1.92 2026/10/19 07:13:40 wiz Exp $
 
 BLAKE2s (libuv-1.53.0.tar.gz) = 1a173a316ef190946401984bb698011ec5ae9793ea07a41553d7ebc7596a2490
 SHA512 (libuv-1.53.0.tar.gz) = 8f26c14b016368a8e382539026e1fa3cf187a7cc8bd8b50498a9b26003e9da3e48a89f4d2032694e5f152cd4177386e259b85e8280cf814153ab58950d205014
@@ -7,7 +7,7 @@ SHA1 (patch-autogen.sh) = 99790076b91d57
 SHA1 (patch-src_unix_core.c) = f6dbe539369c01e9cb870be8063d8b199393883d
 SHA1 (patch-src_unix_fs.c) = 510693bb63cac7bf25e04c64e2d231de80b149d1
 SHA1 (patch-src_unix_netbsd.c) = 071a2a853f9a73dc72e24d63316aa21b28669469
-SHA1 (patch-src_unix_process.c) = 498f4352f9f11234c9836db365fdcb035c2ec8d9
+SHA1 (patch-src_unix_process.c) = d93cc8076c9e695e66fd206bd4da404efb674f10
 SHA1 (patch-src_unix_tty.c) = 157be1b1272dc38b3605a9822316e6cb2ddb6f22
 SHA1 (patch-src_unix_udp.c) = 88e4c08c9413095dfa0132febbc99be2e299ee8f
 SHA1 (patch-test_test-fs.c) = 8b369d45f3f88c793eeeb6fd8d8177bba14fd0ac

Index: pkgsrc/devel/libuv/patches/patch-src_unix_process.c
diff -u pkgsrc/devel/libuv/patches/patch-src_unix_process.c:1.2 pkgsrc/devel/libuv/patches/patch-src_unix_process.c:1.3
--- pkgsrc/devel/libuv/patches/patch-src_unix_process.c:1.2     Mon Oct 19 06:53:57 2026
+++ pkgsrc/devel/libuv/patches/patch-src_unix_process.c Mon Oct 19 07:13:40 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_unix_process.c,v 1.2 2026/10/19 06:53:57 kikadf Exp $
+$NetBSD: patch-src_unix_process.c,v 1.3 2026/10/19 07:13:40 wiz Exp $
 
 Backport https://github.com/libuv/libuv/pull/5284
 
@@ -7,17 +7,27 @@ PR kern/60653: posix_spawn(3) causes inc
 
 --- src/unix/process.c.orig    2026-09-24 14:33:47.000000000 +0000
 +++ src/unix/process.c
-@@ -490,6 +490,9 @@ static void uv__spawn_init_posix_spawn(v
+@@ -36,6 +36,9 @@
+ #include <spawn.h>
+ #include <paths.h>
+ #include <dlfcn.h>
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
+ 
+ #if defined(__PASE__)
+ #define _PATH_DEFPATH "/QOpenSys/pkgs/bin:/QOpenSys/usr/bin:/usr/bin"
+@@ -490,6 +493,9 @@ static void uv__spawn_init_posix_spawn(void) {
     * Unices in that it returns 0 instead of EACCES or ENOENT for paths
     * that don't exist. See https://github.com/libuv/libuv/issues/5240.
     */
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) && __NetBSD_Version__ < 1199000800
 +  /* PR kern/60653: posix_spawn(3) causes incorrect stack base information
 +   */
  #else
  #if !defined(__linux__) && !defined(_AIX) && !defined(__PASE__)
    posix_spawn_works = 1;
-@@ -610,11 +613,14 @@ static int uv__spawn_set_posix_spawn_fil
+@@ -610,11 +616,14 @@ static int uv__spawn_set_posix_spawn_file_actions(
      const uv_process_options_t* options,
      int stdio_count,
      int (*pipes)[2]) {
@@ -32,7 +42,7 @@ PR kern/60653: posix_spawn(3) causes inc
    err = posix_spawn_file_actions_init(actions);
    if (err != 0) {
      /* If initialization fails, no need to de-init, just return */
-@@ -633,14 +639,25 @@ static int uv__spawn_set_posix_spawn_fil
+@@ -633,14 +642,25 @@ static int uv__spawn_set_posix_spawn_file_actions(
        goto error;
    }
  
@@ -44,12 +54,12 @@ PR kern/60653: posix_spawn(3) causes inc
 +      goto error;
 +    }
 +  }
-+
+ 
 +  /* File actions only remap descriptors in the child. Keep the parent's
 +   * descriptors intact for stream setup and cleanup. */
 +  for (fd = 0; fd < stdio_count; fd++)
 +    child_fds[fd] = pipes[fd][1];
- 
++
    /* First duplicate low numbered fds, since it's not safe to duplicate them,
     * they could get replaced. Example: swapping stdout and stderr; without
     * this fd 2 (stderr) would be duplicated into fd 1, thus making both
@@ -60,7 +70,7 @@ PR kern/60653: posix_spawn(3) causes inc
  #if defined(__APPLE__) || defined(__linux__)
      if (use_fd < 0 || use_fd >= fd)
        continue;
-@@ -656,24 +673,24 @@ static int uv__spawn_set_posix_spawn_fil
+@@ -656,24 +676,24 @@ static int uv__spawn_set_posix_spawn_file_actions(
        /* If we were not setting POSIX_SPAWN_CLOEXEC_DEFAULT, we would need to
         * also consider whether fcntl(fd, F_GETFD) returned without the
         * FD_CLOEXEC flag set. */
@@ -89,7 +99,7 @@ PR kern/60653: posix_spawn(3) causes inc
      if (use_fd < 0) {
        if (fd >= 3)
          continue;
-@@ -702,20 +719,21 @@ static int uv__spawn_set_posix_spawn_fil
+@@ -702,20 +722,21 @@ static int uv__spawn_set_posix_spawn_file_actions(
      if (err != 0)
        goto error;
  
@@ -116,7 +126,7 @@ PR kern/60653: posix_spawn(3) causes inc
            break;
      }
      if (fd2 < fd)
-@@ -727,9 +745,13 @@ static int uv__spawn_set_posix_spawn_fil
+@@ -727,9 +748,13 @@ static int uv__spawn_set_posix_spawn_file_actions(
        goto error;
    }
  
@@ -130,7 +140,7 @@ PR kern/60653: posix_spawn(3) causes inc
    (void) posix_spawn_file_actions_destroy(actions);
    return err;
  }
-@@ -862,7 +884,6 @@ static int uv__spawn_and_init_child_posi
+@@ -862,7 +887,6 @@ static int uv__spawn_and_init_child_posix_spawn(
    if (err != 0)
      goto error;