main/libuv: upgrade to 1.34.1

2 files changed, 2 insertions, 165 deletions

diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD
index 9dc4f3215fb..f0522b48c3c 100644
--- a/main/libuv/APKBUILD
+++ b/main/libuv/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libuv
-pkgver=1.34.0
+pkgver=1.34.1
 pkgrel=0
 pkgdesc="Cross-platform asychronous I/O"
 url="https://libuv.org"
@@ -12,7 +12,6 @@ makedepends_build="automake autoconf libtool"
 makedepends_host="linux-headers"
 subpackages="$pkgname-static $pkgname-dev $pkgname-dbg"
 source="https://dist.libuv.org/dist/v$pkgver/libuv-v$pkgver.tar.gz
-	revert-test-udp-multicast-join-1.31.patch
 	disable-test-failing-on-builders.patch
 	"
 builddir="$srcdir/$pkgname-v$pkgver"
@@ -52,6 +51,5 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="91f36185b206f818b5536fa9c11001dd8cf3acfd12d6c263ad5678812e144ec441cf80693df291cf8336155e854ecc50d57da80ff1d4cd8eca8c8a9defb0d33e  libuv-v1.34.0.tar.gz
-f341410a6c693d4ef6c11b72d13d28690dcab3978b500c9cdf5ee5dbee0b9703b92d39f117109c5b3069831b5c92d804fc161de107a95f42dfdad0ffcb96868b  revert-test-udp-multicast-join-1.31.patch
+sha512sums="0d2fd07ad9c2e56b8d7085d9e375c5606d264038f6ebebc678e772e89a068f256275802efe6f8114b4da862c2e2c1e45ccea7333cdf71b24639bebf550fdf3bb  libuv-v1.34.1.tar.gz
 0d155259cfaa78fd229a015fd7181b9a76bf4618e36e6e9d4697323cddcde42f29598f161f6831489ec31adc5cf2614cb670021bf6f5ede7202bcbad7f675fbb  disable-test-failing-on-builders.patch"
diff --git a/main/libuv/revert-test-udp-multicast-join-1.31.patch b/main/libuv/revert-test-udp-multicast-join-1.31.patch
deleted file mode 100644
index 236f4d440a6..00000000000
--- a/main/libuv/revert-test-udp-multicast-join-1.31.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From a3777bc180b1dd2233d27abab35451f7bcb3b2b4 Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@gmail.com>
-Date: Tue, 1 Oct 2019 16:26:16 +0200
-Subject: [PATCH] revert test-udp-multicast-join to 1.31
-
-new test fails on macOS
-
-created with
-
-```
-git checkout v1.32.0
-git checkout v1.31.0 test/test-udp-multicast-join.c
-git commit
-git format-patch v1.32.0
-```
-
----
- test/test-udp-multicast-join.c | 74 ++++++++++------------------------
- 1 file changed, 22 insertions(+), 52 deletions(-)
-
-diff --git a/test/test-udp-multicast-join.c b/test/test-udp-multicast-join.c
-index 6bac072d..053d2f79 100644
---- a/test/test-udp-multicast-join.c
-+++ b/test/test-udp-multicast-join.c
-@@ -29,12 +29,8 @@
- #define CHECK_HANDLE(handle) \
-   ASSERT((uv_udp_t*)(handle) == &server || (uv_udp_t*)(handle) == &client)
- 
--#define MULTICAST_ADDR "239.255.0.1"
--
- static uv_udp_t server;
- static uv_udp_t client;
--static uv_udp_send_t req;
--static uv_udp_send_t req_ss;
- 
- static int cl_recv_cb_called;
- 
-@@ -66,26 +62,7 @@ static void sv_send_cb(uv_udp_send_t* req, int status) {
- 
-   sv_send_cb_called++;
- 
--  if (sv_send_cb_called == 2)
--    uv_close((uv_handle_t*) req->handle, close_cb);
--}
--
--
--static int do_send(uv_udp_send_t* send_req) {
--  uv_buf_t buf;
--  struct sockaddr_in addr;
--  
--  buf = uv_buf_init("PING", 4);
--
--  ASSERT(0 == uv_ip4_addr(MULTICAST_ADDR, TEST_PORT, &addr));
--
--  /* client sends "PING" */
--  return uv_udp_send(send_req,
--                     &client,
--                     &buf,
--                     1,
--                     (const struct sockaddr*) &addr,
--                     sv_send_cb);
-+  uv_close((uv_handle_t*) req->handle, close_cb);
- }
- 
- 
-@@ -97,6 +74,8 @@ static void cl_recv_cb(uv_udp_t* handle,
-   CHECK_HANDLE(handle);
-   ASSERT(flags == 0);
- 
-+  cl_recv_cb_called++;
-+
-   if (nread < 0) {
-     ASSERT(0 && "unexpected error");
-   }
-@@ -111,35 +90,18 @@ static void cl_recv_cb(uv_udp_t* handle,
-   ASSERT(nread == 4);
-   ASSERT(!memcmp("PING", buf->base, nread));
- 
--  cl_recv_cb_called++;
--
--  if (cl_recv_cb_called == 2) {
--    /* we are done with the server handle, we can close it */
--    uv_close((uv_handle_t*) &server, close_cb);
--  } else {
--    int r;
--    char source_addr[64];
--
--    r = uv_ip4_name((const struct sockaddr_in*)addr, source_addr, sizeof(source_addr));
--    ASSERT(r == 0);
--
--    r = uv_udp_set_membership(&server, MULTICAST_ADDR, NULL, UV_LEAVE_GROUP);
--    ASSERT(r == 0);
--
--    r = uv_udp_set_source_membership(&server, MULTICAST_ADDR, NULL, source_addr, UV_JOIN_GROUP);
--    ASSERT(r == 0);
--
--    r = do_send(&req_ss);
--    ASSERT(r == 0);
--  }
-+  /* we are done with the client handle, we can close it */
-+  uv_close((uv_handle_t*) &client, close_cb);
- }
- 
- 
- TEST_IMPL(udp_multicast_join) {
-   int r;
-+  uv_udp_send_t req;
-+  uv_buf_t buf;
-   struct sockaddr_in addr;
- 
--  ASSERT(0 == uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
-+  ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
- 
-   r = uv_udp_init(uv_default_loop(), &server);
-   ASSERT(r == 0);
-@@ -148,19 +110,27 @@ TEST_IMPL(udp_multicast_join) {
-   ASSERT(r == 0);
- 
-   /* bind to the desired port */
--  r = uv_udp_bind(&server, (const struct sockaddr*) &addr, 0);
-+  r = uv_udp_bind(&client, (const struct sockaddr*) &addr, 0);
-   ASSERT(r == 0);
- 
-   /* join the multicast channel */
--  r = uv_udp_set_membership(&server, MULTICAST_ADDR, NULL, UV_JOIN_GROUP);
-+  r = uv_udp_set_membership(&client, "239.255.0.1", NULL, UV_JOIN_GROUP);
-   if (r == UV_ENODEV)
-     RETURN_SKIP("No multicast support.");
-   ASSERT(r == 0);
- 
--  r = uv_udp_recv_start(&server, alloc_cb, cl_recv_cb);
-+  r = uv_udp_recv_start(&client, alloc_cb, cl_recv_cb);
-   ASSERT(r == 0);
- 
--  r = do_send(&req);
-+  buf = uv_buf_init("PING", 4);
-+
-+  /* server sends "PING" */
-+  r = uv_udp_send(&req,
-+                  &server,
-+                  &buf,
-+                  1,
-+                  (const struct sockaddr*) &addr,
-+                  sv_send_cb);
-   ASSERT(r == 0);
- 
-   ASSERT(close_cb_called == 0);
-@@ -170,8 +140,8 @@ TEST_IMPL(udp_multicast_join) {
-   /* run the loop till all events are processed */
-   uv_run(uv_default_loop(), UV_RUN_DEFAULT);
- 
--  ASSERT(cl_recv_cb_called == 2);
--  ASSERT(sv_send_cb_called == 2);
-+  ASSERT(cl_recv_cb_called == 1);
-+  ASSERT(sv_send_cb_called == 1);
-   ASSERT(close_cb_called == 2);
- 
-   MAKE_VALGRIND_HAPPY();
--- 
-2.23.0
-