summaryrefslogtreecommitdiff
path: root/system/libuv
diff options
context:
space:
mode:
Diffstat (limited to 'system/libuv')
-rw-r--r--system/libuv/APKBUILD10
-rw-r--r--system/libuv/disable-process-priority.patch22
-rw-r--r--system/libuv/disable-setuid-test.patch46
-rw-r--r--system/libuv/fix-test-tty-size-assumption.patch29
4 files changed, 33 insertions, 74 deletions
diff --git a/system/libuv/APKBUILD b/system/libuv/APKBUILD
index ef071f093..7a5ac1b4d 100644
--- a/system/libuv/APKBUILD
+++ b/system/libuv/APKBUILD
@@ -2,7 +2,7 @@
# Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libuv
-pkgver=1.28.0
+pkgver=1.44.2
pkgrel=0
pkgdesc="Cross-platform asychronous I/O"
url="https://libuv.org"
@@ -11,8 +11,7 @@ license="MIT AND BSD-2-Clause AND BSD-3-Clause AND ISC"
makedepends="automake autoconf libtool linux-headers"
subpackages="$pkgname-dev"
source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz
- disable-process-priority.patch
- disable-setuid-test.patch
+ fix-test-tty-size-assumption.patch
"
builddir="$srcdir/$pkgname-v$pkgver"
@@ -42,6 +41,5 @@ package() {
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-sha512sums="d7f635ab99569e96db9ae97d29a302f5eec1fd75c71b035ec597a6b978a3fc797a37c7406fed81a27d4d706fe21cbfe919d829d6dae67399cd5cddd107ad6949 libuv-v1.28.0.tar.gz
-58bc259a0f703fa6b8dda14909f718e14dfb9ddc9039ae13378f7e32e0ff7096774cbfb2964a0abb06f8a64a71cf298cc77b7475927df0fb50ce3f0e414a7787 disable-process-priority.patch
-478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch"
+sha512sums="91197ff9303112567bbb915bbb88058050e2ad1c048815a3b57c054635d5dc7df458b956089d785475290132236cb0edcfae830f5d749de29a9a3213eeaf0b20 libuv-v1.44.2.tar.gz
+e7b2242345af697dd175a5fc29b7eb001e5b0f43743a86d9e3fc7307cf3b3bb98e46c2993e84332ecb2934a30f942a78f4ddd19efed6871d85fcf8e2bba15643 fix-test-tty-size-assumption.patch"
diff --git a/system/libuv/disable-process-priority.patch b/system/libuv/disable-process-priority.patch
deleted file mode 100644
index f0f41fc95..000000000
--- a/system/libuv/disable-process-priority.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libuv-v1.23.0/test/test-list.h.old 2018-08-17 02:05:34.000000000 +0000
-+++ libuv-v1.23.0/test/test-list.h 2018-09-05 19:06:26.360000000 +0000
-@@ -214,7 +214,9 @@
- TEST_DECLARE (pipe_set_non_blocking)
- TEST_DECLARE (pipe_set_chmod)
- TEST_DECLARE (process_ref)
-+#if 0
- TEST_DECLARE (process_priority)
-+#endif
- TEST_DECLARE (has_ref)
- TEST_DECLARE (active)
- TEST_DECLARE (embed)
-@@ -690,7 +692,9 @@
- TEST_ENTRY (pipe_ref4)
- TEST_HELPER (pipe_ref4, pipe_echo_server)
- TEST_ENTRY (process_ref)
-+#if 0
- TEST_ENTRY (process_priority)
-+#endif
- TEST_ENTRY (has_ref)
-
- TEST_ENTRY (loop_handles)
diff --git a/system/libuv/disable-setuid-test.patch b/system/libuv/disable-setuid-test.patch
deleted file mode 100644
index 3c6e01611..000000000
--- a/system/libuv/disable-setuid-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/test/test-list.h b/test/test-list.h
-index 3a1e82a..dd25e69 100644
---- a/test/test-list.h
-+++ b/test/test-list.h
-@@ -240,8 +240,10 @@ TEST_DECLARE (spawn_detached)
- TEST_DECLARE (spawn_and_kill_with_std)
- TEST_DECLARE (spawn_and_ping)
- TEST_DECLARE (spawn_preserve_env)
-+#if 0
- TEST_DECLARE (spawn_setuid_fails)
- TEST_DECLARE (spawn_setgid_fails)
-+#endif
- TEST_DECLARE (spawn_stdout_to_file)
- TEST_DECLARE (spawn_stdout_and_stderr_to_file)
- TEST_DECLARE (spawn_stdout_and_stderr_to_file2)
-@@ -351,7 +353,9 @@ TEST_DECLARE (win32_signum_number)
- TEST_DECLARE (emfile)
- TEST_DECLARE (close_fd)
- TEST_DECLARE (spawn_fs_open)
-+#if 0
- TEST_DECLARE (spawn_setuid_setgid)
-+#endif
- TEST_DECLARE (we_get_signal)
- TEST_DECLARE (we_get_signals)
- TEST_DECLARE (signal_multiple_loops)
-@@ -669,8 +673,10 @@ TASK_LIST_START
- TEST_ENTRY (spawn_and_kill_with_std)
- TEST_ENTRY (spawn_and_ping)
- TEST_ENTRY (spawn_preserve_env)
-+#if 0
- TEST_ENTRY (spawn_setuid_fails)
- TEST_ENTRY (spawn_setgid_fails)
-+#endif
- TEST_ENTRY (spawn_stdout_to_file)
- TEST_ENTRY (spawn_stdout_and_stderr_to_file)
- TEST_ENTRY (spawn_stdout_and_stderr_to_file2)
-@@ -701,7 +707,9 @@ TASK_LIST_START
- TEST_ENTRY (emfile)
- TEST_ENTRY (close_fd)
- TEST_ENTRY (spawn_fs_open)
-+#if 0
- TEST_ENTRY (spawn_setuid_setgid)
-+#endif
- TEST_ENTRY (we_get_signal)
- TEST_ENTRY (we_get_signals)
- TEST_ENTRY (signal_multiple_loops)
diff --git a/system/libuv/fix-test-tty-size-assumption.patch b/system/libuv/fix-test-tty-size-assumption.patch
new file mode 100644
index 000000000..7f1f7cff2
--- /dev/null
+++ b/system/libuv/fix-test-tty-size-assumption.patch
@@ -0,0 +1,29 @@
+From f2aeea78510758053e1634bb6ea6268edfefed51 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Tue, 31 Jan 2023 12:24:58 +0100
+Subject: [PATCH] test: remove bad tty window size assumption
+
+Fixes: https://github.com/libuv/libuv/issues/3894
+---
+ test/test-tty.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/test/test-tty.c b/test/test-tty.c
+index 2c7ec4ec56..f53a701fce 100644
+--- a/test/test-tty.c
++++ b/test/test-tty.c
+@@ -116,12 +116,8 @@ TEST_IMPL(tty) {
+ return TEST_SKIP;
+ }
+
+- /*
+- * Is it a safe assumption that most people have terminals larger than
+- * 10x10?
+- */
+- ASSERT(width > 10);
+- ASSERT(height > 10);
++ ASSERT_GT(width, 0);
++ ASSERT_GT(height, 0);
+
+ /* Turn on raw mode. */
+ r = uv_tty_set_mode(&tty_in, UV_TTY_MODE_RAW);