Received: by mail.netbsd.org (Postfix, from userid 605) id EDBC28517B; Thu, 22 Aug 2019 10:28:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 704AE8517A for ; Thu, 22 Aug 2019 10:28:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id RJo58V14lqXS for ; Thu, 22 Aug 2019 10:28:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9F00185160 for ; Thu, 22 Aug 2019 10:28:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 98218FBF4; Thu, 22 Aug 2019 10:28:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1566469705132040" MIME-Version: 1.0 Date: Thu, 22 Aug 2019 10:28:25 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/libuv To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20190822102825.98218FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1566469705132040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Aug 22 10:28:25 UTC 2019 Modified Files: pkgsrc/devel/libuv: distinfo pkgsrc/devel/libuv/patches: patch-configure.ac patch-src_unix_fs.c patch-src_unix_netbsd.c patch-src_unix_thread.c Added Files: pkgsrc/devel/libuv/patches: patch-test_test-fs.c Log Message: libuv: Add a patch to fix a test failure, from adam@ Add upstream bug report URLs and comments, where missing. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/libuv/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libuv/patches/patch-configure.ac \ pkgsrc/devel/libuv/patches/patch-src_unix_netbsd.c cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libuv/patches/patch-src_unix_fs.c cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libuv/patches/patch-src_unix_thread.c cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuv/patches/patch-test_test-fs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1566469705132040 Content-Disposition: inline Content-Length: 4992 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libuv/distinfo diff -u pkgsrc/devel/libuv/distinfo:1.48 pkgsrc/devel/libuv/distinfo:1.49 --- pkgsrc/devel/libuv/distinfo:1.48 Fri Aug 16 12:06:31 2019 +++ pkgsrc/devel/libuv/distinfo Thu Aug 22 10:28:25 2019 @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.48 2019/08/16 12:06:31 wiz Exp $ +$NetBSD: distinfo,v 1.49 2019/08/22 10:28:25 wiz Exp $ SHA1 (libuv-1.31.0.tar.gz) = 1434cb0e2909877eb94d459d04c8a146692492db RMD160 (libuv-1.31.0.tar.gz) = b9c56562f91f2a1e1dc49341141e28baa84fd457 SHA512 (libuv-1.31.0.tar.gz) = bb27ab86f2f6e9c2b22e768216097db2b69e468967b48bf1a15d17c36b445355ee4bd356f59bbd1bcf7d7c0d3f68b2c6660f999a2cc0660033eb5e3775499409 Size (libuv-1.31.0.tar.gz) = 1238566 bytes SHA1 (patch-autogen.sh) = a5f48189bfb17624c545a80626ea311b7755d232 -SHA1 (patch-configure.ac) = e6636d522dc9218fc9aee62846426645473cb6cd -SHA1 (patch-src_unix_fs.c) = 852fd7da9f19dc53427b98ae84b1aa7146418a41 -SHA1 (patch-src_unix_netbsd.c) = 3386e702e3acc29bba6f3f5f612db728473b2a73 -SHA1 (patch-src_unix_thread.c) = da1fe29d95594355f57f8024613122c34b6510e5 +SHA1 (patch-configure.ac) = 06500ab342d1af50f03bc92f2cb4a2ec28db84cc +SHA1 (patch-src_unix_fs.c) = 97b7ec45ecd8a96a97680a8fde9f0261e3508b5d +SHA1 (patch-src_unix_netbsd.c) = 4bea4eda43c4256b5281bc798a46d29690917d27 +SHA1 (patch-src_unix_thread.c) = 7a9a5d19025bb7bb8968a9f5c5e0c67f37021b89 +SHA1 (patch-test_test-fs.c) = 7a6eb5f895e44067ebdd045bba86105faa3cefe0 Index: pkgsrc/devel/libuv/patches/patch-configure.ac diff -u pkgsrc/devel/libuv/patches/patch-configure.ac:1.1 pkgsrc/devel/libuv/patches/patch-configure.ac:1.2 --- pkgsrc/devel/libuv/patches/patch-configure.ac:1.1 Tue Mar 28 18:44:49 2017 +++ pkgsrc/devel/libuv/patches/patch-configure.ac Thu Aug 22 10:28:25 2019 @@ -1,6 +1,7 @@ -$NetBSD: patch-configure.ac,v 1.1 2017/03/28 18:44:49 maya Exp $ +$NetBSD: patch-configure.ac,v 1.2 2019/08/22 10:28:25 wiz Exp $ Add feature-test for pthread_condattr_setclock absent in netbsd-6-0 +https://github.com/libuv/libuv/pull/2436 --- configure.ac.orig 2017-02-01 00:38:56.000000000 +0000 +++ configure.ac Index: pkgsrc/devel/libuv/patches/patch-src_unix_netbsd.c diff -u pkgsrc/devel/libuv/patches/patch-src_unix_netbsd.c:1.1 pkgsrc/devel/libuv/patches/patch-src_unix_netbsd.c:1.2 --- pkgsrc/devel/libuv/patches/patch-src_unix_netbsd.c:1.1 Fri Oct 6 15:58:15 2017 +++ pkgsrc/devel/libuv/patches/patch-src_unix_netbsd.c Thu Aug 22 10:28:25 2019 @@ -1,4 +1,7 @@ -$NetBSD: patch-src_unix_netbsd.c,v 1.1 2017/10/06 15:58:15 kamil Exp $ +$NetBSD: patch-src_unix_netbsd.c,v 1.2 2019/08/22 10:28:25 wiz Exp $ + +Check for KERN_PROC_PATHNAME before using it, or use fallback implementation. +https://github.com/libuv/libuv/pull/2436 --- src/unix/netbsd.c.orig 2017-10-02 23:30:27.000000000 +0000 +++ src/unix/netbsd.c Index: pkgsrc/devel/libuv/patches/patch-src_unix_fs.c diff -u pkgsrc/devel/libuv/patches/patch-src_unix_fs.c:1.2 pkgsrc/devel/libuv/patches/patch-src_unix_fs.c:1.3 --- pkgsrc/devel/libuv/patches/patch-src_unix_fs.c:1.2 Fri Aug 16 12:06:31 2019 +++ pkgsrc/devel/libuv/patches/patch-src_unix_fs.c Thu Aug 22 10:28:25 2019 @@ -1,6 +1,7 @@ -$NetBSD: patch-src_unix_fs.c,v 1.2 2019/08/16 12:06:31 wiz Exp $ +$NetBSD: patch-src_unix_fs.c,v 1.3 2019/08/22 10:28:25 wiz Exp $ * Fix portability on NetBSD. +https://github.com/libuv/libuv/pull/2436 --- src/unix/fs.c.orig 2019-08-09 14:57:12.000000000 +0000 +++ src/unix/fs.c Index: pkgsrc/devel/libuv/patches/patch-src_unix_thread.c diff -u pkgsrc/devel/libuv/patches/patch-src_unix_thread.c:1.6 pkgsrc/devel/libuv/patches/patch-src_unix_thread.c:1.7 --- pkgsrc/devel/libuv/patches/patch-src_unix_thread.c:1.6 Thu Apr 18 07:47:33 2019 +++ pkgsrc/devel/libuv/patches/patch-src_unix_thread.c Thu Aug 22 10:28:25 2019 @@ -1,6 +1,7 @@ -$NetBSD: patch-src_unix_thread.c,v 1.6 2019/04/18 07:47:33 adam Exp $ +$NetBSD: patch-src_unix_thread.c,v 1.7 2019/08/22 10:28:25 wiz Exp $ Use feature test for pthread_condattr_setclock, absent in netbsd-6-0 +https://github.com/libuv/libuv/pull/2436 --- src/unix/thread.c.orig 2019-02-10 16:44:47.000000000 +0000 +++ src/unix/thread.c Added files: Index: pkgsrc/devel/libuv/patches/patch-test_test-fs.c diff -u /dev/null pkgsrc/devel/libuv/patches/patch-test_test-fs.c:1.1 --- /dev/null Thu Aug 22 10:28:25 2019 +++ pkgsrc/devel/libuv/patches/patch-test_test-fs.c Thu Aug 22 10:28:25 2019 @@ -0,0 +1,16 @@ +$NetBSD: patch-test_test-fs.c,v 1.1 2019/08/22 10:28:25 wiz Exp $ + +Use statvfs on NetBSD. +https://github.com/libuv/libuv/pull/2436 + +--- test/test-fs.c.orig 2019-08-09 14:57:12.000000000 +0000 ++++ test/test-fs.c +@@ -339,7 +339,7 @@ static void statfs_cb(uv_fs_t* req) { + ASSERT(req->ptr != NULL); + stats = req->ptr; + +-#if defined(_WIN32) || defined(__sun) || defined(_AIX) || defined(__MVS__) ++#if defined(_WIN32) || defined(__sun) || defined(_AIX) || defined(__MVS__) || defined(__NetBSD__) + ASSERT(stats->f_type == 0); + #else + ASSERT(stats->f_type > 0); --_----------=_1566469705132040--