From 15b52f32c0ff1ed727f28e7d06d40132365c20e6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 25 Sep 2024 12:42:43 -0400 Subject: [PATCH] Update to 1.49.2 Needed for update for NodeJS 22. Related: RHEL-76035 --- .gitignore | 6 ++ ...nore-ifaddrs-with-NULL-ifa_addr-4218.patch | 33 ----------- ...-ipv6-link-local-traffic-is-routable.patch | 58 ------------------- ...-issue-on-32-bit-systems-using-btrfs.patch | 34 ----------- libuv.spec | 2 +- sources | 3 +- 6 files changed, 9 insertions(+), 127 deletions(-) delete mode 100644 0001-unix-ignore-ifaddrs-with-NULL-ifa_addr-4218.patch delete mode 100644 0002-test-check-if-ipv6-link-local-traffic-is-routable.patch delete mode 100644 0003-test_fs.c-Fix-issue-on-32-bit-systems-using-btrfs.patch diff --git a/.gitignore b/.gitignore index 5b1cbcc..c7609b6 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,9 @@ libuv-v*/ /libuv-v1.46.0.tar.gz /libuv-v1.47.0.tar.gz /libuv-v1.48.0.tar.gz +/libuv-v1.49.0.tar.gz +/libuv-v1.49.0.tar.gz.sign +/libuv-v1.49.1.tar.gz +/libuv-v1.49.1.tar.gz.sign +/libuv-v1.49.2.tar.gz +/libuv-v1.49.2.tar.gz.sign diff --git a/0001-unix-ignore-ifaddrs-with-NULL-ifa_addr-4218.patch b/0001-unix-ignore-ifaddrs-with-NULL-ifa_addr-4218.patch deleted file mode 100644 index 20a8d6a..0000000 --- a/0001-unix-ignore-ifaddrs-with-NULL-ifa_addr-4218.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b963f0a75bd6c95fbfa0ac17e46ab1f9d1a787c4 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Tue, 14 Nov 2023 04:23:28 -0500 -Subject: [PATCH 1/2] unix: ignore ifaddrs with NULL ifa_addr (#4218) - -Passing this to uv__is_ipv6_link_local() is causing a segmentation -fault. Note that the documentation for getifaddrs() explicitly states -that this value may be NULL. - -Signed-off-by: Stephen Gallagher ---- - src/unix/tcp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/unix/tcp.c b/src/unix/tcp.c -index a6b53e5913271d0c83e1d7f7e4cb8140f5f3936d..29f4532e747db50146a8b821389f4d45304c5cd0 100644 ---- a/src/unix/tcp.c -+++ b/src/unix/tcp.c -@@ -233,8 +233,9 @@ static int uv__ipv6_link_local_scope_id(void) { - return 0; - - for (p = ifa; p != NULL; p = p->ifa_next) -- if (uv__is_ipv6_link_local(p->ifa_addr)) -- break; -+ if (p->ifa_addr != NULL) -+ if (uv__is_ipv6_link_local(p->ifa_addr)) -+ break; - - rv = 0; - if (p != NULL) { --- -2.41.0 - diff --git a/0002-test-check-if-ipv6-link-local-traffic-is-routable.patch b/0002-test-check-if-ipv6-link-local-traffic-is-routable.patch deleted file mode 100644 index 53cd53a..0000000 --- a/0002-test-check-if-ipv6-link-local-traffic-is-routable.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 21e403424060d71e97ee1ef328288fdb9d24a191 Mon Sep 17 00:00:00 2001 -From: Ben Noordhuis -Date: Tue, 14 Nov 2023 10:58:02 +0100 -Subject: [PATCH 2/2] test: check if ipv6 link-local traffic is routable - -Fixes: https://github.com/libuv/libuv/issues/4211 ---- - test/test-tcp-connect6-error.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/test/test-tcp-connect6-error.c b/test/test-tcp-connect6-error.c -index 1e6d7c78da999d5d6d1f5e1e57646e34aba4a33b..dc2fce82f8958ac5afaeafafa8f2efccf2a1e1ec 100644 ---- a/test/test-tcp-connect6-error.c -+++ b/test/test-tcp-connect6-error.c -@@ -23,6 +23,7 @@ - #include "task.h" - #include - #include -+#include - - - static int connect_cb_called = 0; -@@ -75,9 +76,13 @@ TEST_IMPL(tcp_connect6_error_fault) { - - - TEST_IMPL(tcp_connect6_link_local) { -+ uv_interface_address_t* ifs; -+ uv_interface_address_t* p; - struct sockaddr_in6 addr; - uv_connect_t req; - uv_tcp_t server; -+ int ok; -+ int n; - - if (!can_ipv6()) - RETURN_SKIP("IPv6 not supported"); -@@ -90,6 +95,18 @@ TEST_IMPL(tcp_connect6_link_local) { - RETURN_SKIP("Test does not currently work in QEMU"); - #endif /* defined(__QEMU__) */ - -+ /* Check there's an interface that routes link-local (fe80::/10) traffic. */ -+ ASSERT_OK(uv_interface_addresses(&ifs, &n)); -+ for (p = ifs; p < &ifs[n]; p++) -+ if (p->address.address6.sin6_family == AF_INET6) -+ if (!memcmp(&p->address.address6.sin6_addr, "\xfe\x80", 2)) -+ break; -+ ok = (p < &ifs[n]); -+ uv_free_interface_addresses(ifs, n); -+ -+ if (!ok) -+ RETURN_SKIP("IPv6 link-local traffic not supported"); -+ - ASSERT_OK(uv_ip6_addr("fe80::0bad:babe", 1337, &addr)); - ASSERT_OK(uv_tcp_init(uv_default_loop(), &server)); - --- -2.41.0 - diff --git a/0003-test_fs.c-Fix-issue-on-32-bit-systems-using-btrfs.patch b/0003-test_fs.c-Fix-issue-on-32-bit-systems-using-btrfs.patch deleted file mode 100644 index c851c32..0000000 --- a/0003-test_fs.c-Fix-issue-on-32-bit-systems-using-btrfs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3d10efa49dc063831787bc01501ab946f6d91282 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Thu, 16 Nov 2023 10:00:20 -0500 -Subject: [PATCH 3/3] test_fs.c: Fix issue on 32-bit systems using btrfs - -On Fedora's build system, the build environment runs on btrfs. This -revealed a bug in the test on i686 systems, where this comparison was -being performed as a comparison of two signed integers, but the -filesystem type of btrfs happens to use the higher-order bits, resulting -in it appearing as a negative value. - -BTRFS_SUPER_MAGIC 0x9123683e - -Signed-off-by: Stephen Gallagher ---- - test/test-fs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test-fs.c b/test/test-fs.c -index 1acdc5c67082c7ea4f579f25af82cd9bd3fefc71..ab8a9e07ccea95493e479703a07bebca5e29be30 100644 ---- a/test/test-fs.c -+++ b/test/test-fs.c -@@ -343,7 +343,7 @@ static void statfs_cb(uv_fs_t* req) { - defined(__OpenBSD__) || defined(__NetBSD__) - ASSERT_OK(stats->f_type); - #else -- ASSERT_GT(stats->f_type, 0); -+ ASSERT_UINT64_GT(stats->f_type, 0); - #endif - - ASSERT_GT(stats->f_bsize, 0); --- -2.41.0 - diff --git a/libuv.spec b/libuv.spec index af26ecd..28acd52 100644 --- a/libuv.spec +++ b/libuv.spec @@ -9,7 +9,7 @@ Name: libuv Epoch: 1 -Version: 1.48.0 +Version: 1.49.2 Release: %autorelease Summary: Platform layer for node.js diff --git a/sources b/sources index a6dc0b4..f76a542 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libuv-v1.48.0.tar.gz) = 7ae3a4c02f654a26056db1541e52ccc4c54aaea39c33585f0cf6949af997d0a0a29f30a294c8df6e92f6f6af7ce64c2766b1a2cc67f342e3e139cd55b7326c94 +SHA512 (libuv-v1.49.2.tar.gz) = ecb94edb9393d1f3ace1e01e89a3f693fb813c1ed21a3c706409bdfd8821885e7713f8d6b043d97ab202cbea9edc99ad6672d1144858802dc92031800ffba1a1 +SHA512 (libuv-v1.49.2.tar.gz.sign) = 66a6f345bfc16a5a673b8e7eb696e731b42f2cc9cb10f2a9eff74ca2ea5f47c7809f1ecea6182863531b776fef8bef8cefee3c7295d1976bd47f0f30afc455cf