On Mon, 22 Jan 2018 13:50:15 +0100, Pascal Stumpf wrote:
> Update to latest version. This lets lang/moarvm use this port instead
> of an internal version. Tested with all other dependent ports.
>
> ok?
New version, 1.19.1.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libuv/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 22 Feb 2017 14:34:34 -0000 1.3
+++ Makefile 10 Feb 2018 16:26:24 -0000
@@ -2,13 +2,12 @@
COMMENT = multi-platform library for asynchronous I/O
-VER = 1.11.0
-REVISION = 1
+VER = 1.19.1
DISTNAME = libuv-v${VER}
PKGNAME = libuv-${VER}
CATEGORIES = devel
-SHARED_LIBS = uv 0.0 # 1.0
+SHARED_LIBS = uv 1.0 # 1.0
HOMEPAGE = http://libuv.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libuv/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 14 Feb 2017 09:37:16 -0000 1.1.1.1
+++ distinfo 10 Feb 2018 16:26:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (libuv-v1.11.0.tar.gz) = D2hplNzqbLXNP1DjXV/doHIRtLNYZRbffDm9vxmsuac=
-SIZE (libuv-v1.11.0.tar.gz) = 1075986
+SHA256 (libuv-v1.19.1.tar.gz) = Mu2ZRDZOzyXkt1In5e5XCREEI7qApcfX5RI6uJMA6Hg=
+SIZE (libuv-v1.19.1.tar.gz) = 1166759
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 14 Feb 2017 09:37:16 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2017/02/14 09:37:16 edd Exp $
---- configure.ac.orig Sat Nov 26 18:32:08 2016
-+++ configure.ac Sat Nov 26 18:32:41 2016
-@@ -42,7 +42,6 @@ LT_INIT
- # TODO(bnoordhuis) Check for -pthread vs. -pthreads
- AC_CHECK_LIB([dl], [dlopen])
- AC_CHECK_LIB([kstat], [kstat_lookup])
--AC_CHECK_LIB([kvm], [kvm_open])
- AC_CHECK_LIB([nsl], [gethostbyname])
- AC_CHECK_LIB([perfstat], [perfstat_cpu])
- AC_CHECK_LIB([pthread], [pthread_mutex_init])
Index: patches/patch-src_unix_internal_h
===================================================================
RCS file: patches/patch-src_unix_internal_h
diff -N patches/patch-src_unix_internal_h
--- patches/patch-src_unix_internal_h 14 Feb 2017 09:37:16 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_unix_internal_h,v 1.1.1.1 2017/02/14 09:37:16 edd Exp $
-
-https://patch-diff.githubusercontent.com/raw/libuv/libuv/pull/1218.diff
-
---- src/unix/internal.h.orig Wed Feb 1 00:38:56 2017
-+++ src/unix/internal.h Thu Feb 9 21:38:39 2017
-@@ -162,7 +162,8 @@ struct uv__stream_queued_fds_s {
- defined(__DragonFly__) || \
- defined(__FreeBSD__) || \
- defined(__FreeBSD_kernel__) || \
-- defined(__linux__)
-+ defined(__linux__) || \
-+ defined(__OpenBSD__)
- #define uv__cloexec uv__cloexec_ioctl
- #define uv__nonblock uv__nonblock_ioctl
- #else
Index: patches/patch-src_unix_openbsd_c
===================================================================
RCS file: patches/patch-src_unix_openbsd_c
diff -N patches/patch-src_unix_openbsd_c
--- patches/patch-src_unix_openbsd_c 22 Feb 2017 14:28:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_unix_openbsd_c,v 1.2 2017/02/22 14:28:30 jca Exp $
-
-- fix insecure format string idiom
- https://patch-diff.githubusercontent.com/raw/libuv/libuv/pull/1218.diff
-- add IPv6 support
-
---- src/unix/openbsd.c.orig Wed Feb 1 01:38:56 2017
-+++ src/unix/openbsd.c Tue Feb 14 01:51:19 2017
-@@ -163,7 +163,7 @@ char** uv_setup_args(int argc, char** argv) {
- int uv_set_process_title(const char* title) {
- uv__free(process_title);
- process_title = uv__strdup(title);
-- setproctitle(title);
-+ setproctitle("%s", title);
- return 0;
- }
-
-@@ -315,7 +315,8 @@ int uv_interface_addresses(uv_interface_address_t** ad
- for (ent = addrs; ent != NULL; ent = ent->ifa_next) {
- if (!((ent->ifa_flags & IFF_UP) && (ent->ifa_flags & IFF_RUNNING)) ||
- (ent->ifa_addr == NULL) ||
-- (ent->ifa_addr->sa_family != PF_INET)) {
-+ (ent->ifa_addr->sa_family != PF_INET &&
-+ ent->ifa_addr->sa_family != PF_INET6)) {
- continue;
- }
- (*count)++;
-@@ -337,7 +338,8 @@ int uv_interface_addresses(uv_interface_address_t** ad
- if (ent->ifa_addr == NULL)
- continue;
-
-- if (ent->ifa_addr->sa_family != PF_INET)
-+ if (ent->ifa_addr->sa_family != PF_INET &&
-+ ent->ifa_addr->sa_family != PF_INET6)
- continue;
-
- address->name = uv__strdup(ent->ifa_name);
Index: patches/patch-src_unix_tcp_c
===================================================================
RCS file: /cvs/ports/devel/libuv/patches/patch-src_unix_tcp_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_unix_tcp_c
--- patches/patch-src_unix_tcp_c 22 Feb 2017 14:28:30 -0000 1.1
+++ patches/patch-src_unix_tcp_c 10 Feb 2018 16:26:24 -0000
@@ -3,9 +3,10 @@ $OpenBSD: patch-src_unix_tcp_c,v 1.1 201
- we don't support setting IPV6_V6ONLY to anything but 1
(no support for IPv4-mapped IPv6 addresses)
---- src/unix/tcp.c.orig Tue Feb 14 07:40:30 2017
-+++ src/unix/tcp.c Tue Feb 14 07:40:32 2017
-@@ -107,23 +107,6 @@ int uv__tcp_bind(uv_tcp_t* tcp,
+Index: src/unix/tcp.c
+--- src/unix/tcp.c.orig
++++ src/unix/tcp.c
+@@ -168,23 +168,6 @@ int uv__tcp_bind(uv_tcp_t* tcp,
if (setsockopt(tcp->io_watcher.fd, SOL_SOCKET, SO_REUSEADDR, &on,
sizeof(on)))
return -errno;
Index: patches/patch-src_unix_udp_c
===================================================================
RCS file: patches/patch-src_unix_udp_c
diff -N patches/patch-src_unix_udp_c
--- patches/patch-src_unix_udp_c 22 Feb 2017 14:28:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-src_unix_udp_c,v 1.1 2017/02/22 14:28:30 jca Exp $
-
-- we don't support setting IPV6_V6ONLY to anything but 1
- (no support for IPv4-mapped IPv6 addresses)
-- setsockopt(IP_MULTICAST_*) uses a char, setsockopt(IPV6_MULTICAST_*) uses
u_int
-
---- src/unix/udp.c.orig Wed Feb 1 01:38:56 2017
-+++ src/unix/udp.c Tue Feb 14 07:58:03 2017
-@@ -310,19 +310,6 @@ int uv__udp_bind(uv_udp_t* handle,
- goto out;
- }
-
-- if (flags & UV_UDP_IPV6ONLY) {
--#ifdef IPV6_V6ONLY
-- yes = 1;
-- if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof yes) == -1) {
-- err = -errno;
-- goto out;
-- }
--#else
-- err = -ENOTSUP;
-- goto out;
--#endif
-- }
--
- if (bind(fd, addr, addrlen)) {
- err = -errno;
- if (errno == EAFNOSUPPORT)
-@@ -750,7 +737,7 @@ int uv_udp_set_multicast_ttl(uv_udp_t* handle, int ttl
- * IP_MULTICAST_TTL, so hardcode the size of the option in the IPv6 case,
- * and use the general uv__setsockopt_maybe_char call otherwise.
- */
--#if defined(__sun) || defined(_AIX) || defined(__MVS__)
-+#if defined(__sun) || defined(_AIX) || defined(__MVS__) ||
defined(__OpenBSD__)
- if (handle->flags & UV_HANDLE_IPV6)
- return uv__setsockopt(handle,
- IP_MULTICAST_TTL,
-@@ -773,7 +760,7 @@ int uv_udp_set_multicast_loop(uv_udp_t* handle, int on
- * IP_MULTICAST_LOOP, so hardcode the size of the option in the IPv6 case,
- * and use the general uv__setsockopt_maybe_char call otherwise.
- */
--#if defined(__sun) || defined(_AIX) || defined(__MVS__)
-+#if defined(__sun) || defined(_AIX) || defined(__MVS__) ||
defined(__OpenBSD__)
- if (handle->flags & UV_HANDLE_IPV6)
- return uv__setsockopt(handle,
- IP_MULTICAST_LOOP,
Index: patches/patch-test_test-fs_c
===================================================================
RCS file: /cvs/ports/devel/libuv/patches/patch-test_test-fs_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-test_test-fs_c
--- patches/patch-test_test-fs_c 14 Feb 2017 09:37:16 -0000 1.1.1.1
+++ patches/patch-test_test-fs_c 10 Feb 2018 16:26:24 -0000
@@ -3,9 +3,10 @@ $OpenBSD: patch-test_test-fs_c,v 1.1.1.1
Workaround for a minor bug:
https://github.com/libuv/libuv/issues/1216
---- test/test-fs.c.orig Wed Feb 1 00:38:56 2017
-+++ test/test-fs.c Thu Feb 9 22:06:12 2017
-@@ -1621,7 +1621,7 @@ TEST_IMPL(fs_realpath) {
+Index: test/test-fs.c
+--- test/test-fs.c.orig
++++ test/test-fs.c
+@@ -1649,7 +1649,7 @@ TEST_IMPL(fs_realpath) {
uv_fs_t req;
loop = uv_default_loop();
@@ -14,7 +15,7 @@ https://github.com/libuv/libuv/issues/12
ASSERT(0 == uv_run(loop, UV_RUN_DEFAULT));
ASSERT(dummy_cb_count == 1);
ASSERT(req.ptr == NULL);
-@@ -1637,7 +1637,7 @@ TEST_IMPL(fs_realpath) {
+@@ -1665,7 +1665,7 @@ TEST_IMPL(fs_realpath) {
ASSERT(req.result == UV_ENOENT);
uv_fs_req_cleanup(&req);
Index: patches/patch-test_test-poll_c
===================================================================
RCS file: patches/patch-test_test-poll_c
diff -N patches/patch-test_test-poll_c
--- patches/patch-test_test-poll_c 14 Feb 2017 09:37:16 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-test_test-poll_c,v 1.1.1.1 2017/02/14 09:37:16 edd Exp $
-
-https://patch-diff.githubusercontent.com/raw/libuv/libuv/pull/1218.diff
-
---- test/test-poll.c.orig Wed Feb 1 00:38:56 2017
-+++ test/test-poll.c Thu Feb 9 21:38:39 2017
-@@ -594,7 +594,8 @@ TEST_IMPL(poll_unidirectional) {
- */
- TEST_IMPL(poll_bad_fdtype) {
- #if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__sun) && \
-- !defined(_AIX) && !defined(__MVS__) && !defined(__FreeBSD_kernel__)
-+ !defined(_AIX) && !defined(__MVS__) && !defined(__FreeBSD_kernel__) && \
-+ !defined(__OpenBSD__)
- uv_poll_t poll_handle;
- int fd;
-
Index: patches/patch-test_test-udp-ipv6_c
===================================================================
RCS file: /cvs/ports/devel/libuv/patches/patch-test_test-udp-ipv6_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-test_test-udp-ipv6_c
--- patches/patch-test_test-udp-ipv6_c 22 Feb 2017 14:28:30 -0000 1.1
+++ patches/patch-test_test-udp-ipv6_c 10 Feb 2018 16:26:24 -0000
@@ -2,13 +2,14 @@ $OpenBSD: patch-test_test-udp-ipv6_c,v 1
- no dual stack support
---- test/test-udp-ipv6.c.orig Wed Feb 1 01:38:56 2017
-+++ test/test-udp-ipv6.c Sat Feb 18 12:54:17 2017
-@@ -166,10 +166,7 @@ TEST_IMPL(udp_dual_stack) {
+Index: test/test-udp-ipv6.c
+--- test/test-udp-ipv6.c.orig
++++ test/test-udp-ipv6.c
+@@ -171,10 +171,7 @@ TEST_IMPL(udp_dual_stack) {
if (!can_ipv6())
RETURN_SKIP("IPv6 not supported");
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- if (!can_ipv6_ipv4_dual())
RETURN_SKIP("IPv6-IPv4 dual stack not supported");
-#endif
Index: patches/patch-test_test-udp-multicast-join6_c
===================================================================
RCS file: /cvs/ports/devel/libuv/patches/patch-test_test-udp-multicast-join6_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-test_test-udp-multicast-join6_c
--- patches/patch-test_test-udp-multicast-join6_c 22 Feb 2017 14:28:30
-0000 1.1
+++ patches/patch-test_test-udp-multicast-join6_c 10 Feb 2018 16:26:24
-0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-test_test-udp-multicast-join6_c,v 1.1 2017/02/22 14:28:30 jca
Exp $
---- test/test-udp-multicast-join6.c.orig Tue Feb 14 08:02:41 2017
-+++ test/test-udp-multicast-join6.c Tue Feb 14 08:02:56 2017
-@@ -122,7 +122,8 @@ TEST_IMPL(udp_multicast_join6) {
- #if defined(__APPLE__) || \
+Index: test/test-udp-multicast-join6.c
+--- test/test-udp-multicast-join6.c.orig
++++ test/test-udp-multicast-join6.c
+@@ -123,7 +123,8 @@ TEST_IMPL(udp_multicast_join6) {
defined(_AIX) || \
defined(__MVS__) || \
-- defined(__FreeBSD_kernel__)
-+ defined(__FreeBSD_kernel__) || \
+ defined(__FreeBSD_kernel__) || \
+- defined(__NetBSD__)
++ defined(__NetBSD__) || \
+ defined(__OpenBSD__)
r = uv_udp_set_membership(&client, "ff02::1", "::1%lo0", UV_JOIN_GROUP);
#else
