diff --git a/srcpkgs/libuv/patches/disable-fs-chown.patch b/srcpkgs/libuv/patches/disable-fs-chown.patch index e2dd0899fad..893d09edfa0 100644 --- a/srcpkgs/libuv/patches/disable-fs-chown.patch +++ b/srcpkgs/libuv/patches/disable-fs-chown.patch @@ -1,6 +1,6 @@ ---- test/test-list.h.orig 2018-04-16 19:13:01.184197428 +0200 -+++ test/test-list.h 2018-04-16 19:13:28.144260600 +0200 -@@ -287,7 +287,7 @@ TEST_DECLARE (fs_unlink_readonly) +--- test/test-list.h.orig 2021-03-02 21:59:17.718832425 +1100 ++++ test/test-list.h 2021-03-02 21:59:41.809157112 +1100 +@@ -344,7 +344,7 @@ #ifdef _WIN32 TEST_DECLARE (fs_unlink_archive_readonly) #endif @@ -9,12 +9,12 @@ TEST_DECLARE (fs_link) TEST_DECLARE (fs_readlink) TEST_DECLARE (fs_realpath) -@@ -821,7 +821,7 @@ TASK_LIST_START +@@ -997,7 +997,7 @@ #ifdef _WIN32 TEST_ENTRY (fs_unlink_archive_readonly) #endif - TEST_ENTRY (fs_chown) + /* TEST_ENTRY (fs_chown) */ TEST_ENTRY (fs_utime) + TEST_ENTRY (fs_utime_round) TEST_ENTRY (fs_futime) - TEST_ENTRY (fs_readlink) diff --git a/srcpkgs/libuv/patches/disable-setuid-test.patch b/srcpkgs/libuv/patches/disable-setuid-test.patch index 27ccb746445..9dbd6bcee61 100644 --- a/srcpkgs/libuv/patches/disable-setuid-test.patch +++ b/srcpkgs/libuv/patches/disable-setuid-test.patch @@ -1,6 +1,6 @@ ---- test/test-list.h.orig 2018-04-16 19:13:01.184197428 +0200 -+++ test/test-list.h 2018-04-16 19:15:11.042501710 +0200 -@@ -254,8 +254,8 @@ TEST_DECLARE (spawn_detached) +--- test/test-list.h.orig 2021-03-02 21:59:17.718832425 +1100 ++++ test/test-list.h 2021-03-02 22:05:18.359833402 +1100 +@@ -305,8 +305,8 @@ TEST_DECLARE (spawn_and_kill_with_std) TEST_DECLARE (spawn_and_ping) TEST_DECLARE (spawn_preserve_env) @@ -11,16 +11,16 @@ TEST_DECLARE (spawn_stdout_to_file) TEST_DECLARE (spawn_stdout_and_stderr_to_file) TEST_DECLARE (spawn_stdout_and_stderr_to_file2) -@@ -391,7 +391,7 @@ TEST_DECLARE (win32_signum_number) +@@ -477,7 +477,7 @@ + TEST_DECLARE (win32_signum_number) + #else TEST_DECLARE (emfile) - TEST_DECLARE (close_fd) - TEST_DECLARE (spawn_fs_open) -TEST_DECLARE (spawn_setuid_setgid) +/* TEST_DECLARE (spawn_setuid_setgid) */ TEST_DECLARE (we_get_signal) TEST_DECLARE (we_get_signals) TEST_DECLARE (we_get_signal_one_shot) -@@ -755,8 +755,8 @@ TASK_LIST_START +@@ -923,8 +923,8 @@ TEST_ENTRY (spawn_and_kill_with_std) TEST_ENTRY (spawn_and_ping) TEST_ENTRY (spawn_preserve_env) @@ -31,10 +31,10 @@ TEST_ENTRY (spawn_stdout_to_file) TEST_ENTRY (spawn_stdout_and_stderr_to_file) TEST_ENTRY (spawn_stdout_and_stderr_to_file2) -@@ -790,7 +790,7 @@ TASK_LIST_START +@@ -963,7 +963,7 @@ + TEST_ENTRY (win32_signum_number) + #else TEST_ENTRY (emfile) - TEST_ENTRY (close_fd) - TEST_ENTRY (spawn_fs_open) - TEST_ENTRY (spawn_setuid_setgid) + /* TEST_ENTRY (spawn_setuid_setgid) */ TEST_ENTRY (we_get_signal) diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 458c4ed52aa..76a36863f4b 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -1,6 +1,6 @@ # Template file for 'libuv' pkgname=libuv -version=1.39.0 +version=1.41.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -10,7 +10,9 @@ license="MIT, CC-BY-SA-4.0" homepage="https://libuv.org/" changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz" -checksum=dc7b21f1bb7ef19f4b42c5ea058afabe51132d165da18812b70fb319659ba629 +checksum=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa +# the tests fail when run as root and as such break in the CI containers +make_check="extended" LDFLAGS="-pthread"