commit: 7fb50c6381ceba51d9404d8713c8289343556d98
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 20:28:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:03:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb50c63
dev-libs/libuv: add 1.47.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libuv/Manifest | 1 +
dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch | 54 ++++++++++++++++++++++
.../{libuv-9999.ebuild => libuv-1.47.0.ebuild} | 8 +++-
dev-libs/libuv/libuv-9999.ebuild | 4 +-
4 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 0e61e6ca0a8e..e84f057fa9c9 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,3 +1,4 @@
DIST libuv-1.44.2.tar.gz 1309062 BLAKE2B
883a1fbffcd8f55bf28ea5a79ed18aa3e2f2fac126285e8aca2ef9370eafc62f69f95ddb8bf27d4159e038bfb0a01abafdf0dadbc4309e5d31f0e77057ee84ac
SHA512
d21c890787b0b364fafa5fc0cbbff296bc2ca269e1991d2f7f35fcb37b8634da377466f5af5a4245425fcf876ae6870d100ab32b12bce64f8e0b01fd25a1bc83
DIST libuv-1.45.0.tar.gz 1307245 BLAKE2B
fcd9aad052cf641e5e974b1e3c47bef7968474f4b0e38363559719a164867ce6e67630c1d0fd0386da22ba5b82e35c6ca946b7509a8a08f08f972388e70a40b9
SHA512
a156dd0ed06bc7c50515f46ef6e5636d870288636f442ce9ec46716e22fdaa664ce49e432f4737c81e9c6013b34ed150e7420ab9fc316ed23281096954359774
DIST libuv-1.46.0.tar.gz 1311065 BLAKE2B
fd492b6ca873a08ad4df7561b9d83a09d9bd2cbc10c17265c02982a231edb5c6d71698aecc9a14d455ea230f9e791807f42561d8b3c96e37edb4a709860859b0
SHA512
e3a7c10ffd909f9b128fb2316e09b8456e87278107178b49368f31ba30e7f62d64e7eba650cc59ef2d7eb178199c7a2c5b5c99b333849200492235116d7aee7a
+DIST libuv-1.47.0.tar.gz 1316016 BLAKE2B
6c530f8625366a9bf3f99ac4eb6b3bf3d4f6a05f98848e08cdab884934d79862cf8e79dd2d506ec734d701faab517eba2215063dce4b4216add5cfd6bfebd82e
SHA512
3d0e76c4e29c5de14fddda07409f8db30dc64261d1c0bdfce7f70eb8f5ac911707fe662e81c4f117e4068cb0728158fc2b8255f8aa497c0f688e46c7fb93a5b3
diff --git a/dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch
b/dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch
new file mode 100644
index 000000000000..20176dc7aba0
--- /dev/null
+++ b/dev-libs/libuv/files/libuv-1.47.0-ipv6-tests.patch
@@ -0,0 +1,54 @@
+https://github.com/libuv/libuv/issues/4211
+https://github.com/libuv/libuv/pull/4220
+https://github.com/libuv/libuv/commit/54d8364c2406758b572621af381f1d83e01ae46c
+
+From 54d8364c2406758b572621af381f1d83e01ae46c Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <i...@bnoordhuis.nl>
+Date: Tue, 14 Nov 2023 22:09:30 +0100
+Subject: [PATCH] test: check if ipv6 link-local traffic is routable (#4220)
+
+Fixes: https://github.com/libuv/libuv/issues/4211
+--- a/test/test-tcp-connect6-error.c
++++ b/test/test-tcp-connect6-error.c
+@@ -23,6 +23,7 @@
+ #include "task.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+
+ 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));
+
+
diff --git a/dev-libs/libuv/libuv-9999.ebuild
b/dev-libs/libuv/libuv-1.47.0.ebuild
similarity index 88%
copy from dev-libs/libuv/libuv-9999.ebuild
copy to dev-libs/libuv/libuv-1.47.0.ebuild
index 771fe56d3e96..34862127937a 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-1.47.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
LICENSE="BSD BSD-2 ISC MIT"
@@ -24,6 +24,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-ipv6-tests.patch
+)
+
src_prepare() {
default
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 771fe56d3e96..0028ef084a43 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
LICENSE="BSD BSD-2 ISC MIT"
