CVS commit: pkgsrc/devel/libuv

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Jan 17 10:12:54 UTC 2022

Modified Files:
        pkgsrc/devel/libuv: Makefile distinfo
        pkgsrc/devel/libuv/patches: patch-src_unix_bsd-proctitle.c

Log Message:
libuv: switch to upstream-provided patch


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/devel/libuv/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/libuv/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/libuv/patches/patch-src_unix_bsd-proctitle.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/Makefile
diff -u pkgsrc/devel/libuv/Makefile:1.70 pkgsrc/devel/libuv/Makefile:1.71
--- pkgsrc/devel/libuv/Makefile:1.70    Mon Jan 17 01:38:53 2022
+++ pkgsrc/devel/libuv/Makefile Mon Jan 17 10:12:54 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2022/01/17 01:38:53 tnn Exp $
+# $NetBSD: Makefile,v 1.71 2022/01/17 10:12:54 tnn Exp $
 
 DISTNAME=      libuv-1.43.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libuv/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/devel/libuv/distinfo
diff -u pkgsrc/devel/libuv/distinfo:1.69 pkgsrc/devel/libuv/distinfo:1.70
--- pkgsrc/devel/libuv/distinfo:1.69    Mon Jan 17 01:38:53 2022
+++ pkgsrc/devel/libuv/distinfo Mon Jan 17 10:12:54 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.69 2022/01/17 01:38:53 tnn Exp $
+$NetBSD: distinfo,v 1.70 2022/01/17 10:12:54 tnn Exp $
 
 BLAKE2s (libuv-1.43.0.tar.gz) = d058d220ac448170de1c2dd554e0ef0e6c362fddf181509ba8d3d416398ae715
 SHA512 (libuv-1.43.0.tar.gz) = 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
 Size (libuv-1.43.0.tar.gz) = 1295972 bytes
 SHA1 (patch-autogen.sh) = a5f48189bfb17624c545a80626ea311b7755d232
-SHA1 (patch-src_unix_bsd-proctitle.c) = 95bc1a1014bbc9c8c073076fbd59f34fdb9a90c9
+SHA1 (patch-src_unix_bsd-proctitle.c) = 8643762602af6537589b935baae48ff2a0541a2f
 SHA1 (patch-src_unix_fs.c) = d5afe699254210d9724bf2d02ea4563a92666d4f
 SHA1 (patch-src_unix_netbsd.c) = 071a2a853f9a73dc72e24d63316aa21b28669469

Index: pkgsrc/devel/libuv/patches/patch-src_unix_bsd-proctitle.c
diff -u pkgsrc/devel/libuv/patches/patch-src_unix_bsd-proctitle.c:1.1 pkgsrc/devel/libuv/patches/patch-src_unix_bsd-proctitle.c:1.2
--- pkgsrc/devel/libuv/patches/patch-src_unix_bsd-proctitle.c:1.1       Mon Jan 17 01:38:53 2022
+++ pkgsrc/devel/libuv/patches/patch-src_unix_bsd-proctitle.c   Mon Jan 17 10:12:54 2022
@@ -1,29 +1,14 @@
-$NetBSD: patch-src_unix_bsd-proctitle.c,v 1.1 2022/01/17 01:38:53 tnn Exp $
+$NetBSD: patch-src_unix_bsd-proctitle.c,v 1.2 2022/01/17 10:12:54 tnn Exp $
 
-Only destroy the process title mutex if it had been initialized.
+https://github.com/libuv/libuv/pull/3428/commits/4ea2e7629dcedac0eb84bdc85861fbc51386e20b
 
 --- src/unix/bsd-proctitle.c.orig      2022-01-04 14:18:00.000000000 +0000
 +++ src/unix/bsd-proctitle.c
-@@ -27,6 +27,7 @@
- 
- 
- static uv_mutex_t process_title_mutex;
-+static int process_title_mutex_inited = 0;
- static uv_once_t process_title_mutex_once = UV_ONCE_INIT;
- static char* process_title;
- 
-@@ -34,11 +35,13 @@ static char* process_title;
- static void init_process_title_mutex_once(void) {
-   if (uv_mutex_init(&process_title_mutex))
-     abort();
-+  process_title_mutex_inited = 1;
- }
+@@ -38,6 +38,7 @@ static void init_process_title_mutex_onc
  
  
  void uv__process_title_cleanup(void) {
--  uv_mutex_destroy(&process_title_mutex);
-+  if (process_title_mutex_inited)
-+    uv_mutex_destroy(&process_title_mutex);
++  uv_once(&process_title_mutex_once, init_process_title_mutex_once);
+   uv_mutex_destroy(&process_title_mutex);
  }
  
-