diff --git a/.gitignore b/.gitignore
index 52fcd27..b919eaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libuv-v1.38.0.tar.gz
+SOURCES/libuv-v1.40.0.tar.gz
diff --git a/.libuv.metadata b/.libuv.metadata
index 68c7fcd..045d3a1 100644
--- a/.libuv.metadata
+++ b/.libuv.metadata
@@ -1 +1 @@
-ec045c2dfd29e1c6caab5886244fcb56a95b93f1 SOURCES/libuv-v1.38.0.tar.gz
+b332257555ad719c016b68fecfd056706a6c63f9 SOURCES/libuv-v1.40.0.tar.gz
diff --git a/SOURCES/0001-Disable-failing-network-tests.patch b/SOURCES/0001-Disable-failing-network-tests.patch
index ddf7157..90fcac7 100644
--- a/SOURCES/0001-Disable-failing-network-tests.patch
+++ b/SOURCES/0001-Disable-failing-network-tests.patch
@@ -1,8 +1,8 @@
diff --git a/Makefile.am b/Makefile.am
-index d9d2f3d0..1d105806 100644
+index 46308eaa..5a3cde05 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -254,7 +254,6 @@ test_run_tests_SOURCES = test/blackhole-server.c \
+@@ -255,7 +255,6 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-tcp-create-socket-early.c \
test/test-tcp-connect-error-after-write.c \
test/test-tcp-connect-error.c \
@@ -10,8 +10,8 @@ index d9d2f3d0..1d105806 100644
test/test-tcp-connect6-error.c \
test/test-tcp-flags.c \
test/test-tcp-open.c \
-@@ -288,8 +287,6 @@ test_run_tests_SOURCES = test/blackhole-server.c \
- test/test-udp-ipv6.c \
+@@ -292,8 +291,6 @@ test_run_tests_SOURCES = test/blackhole-server.c \
+ test/test-udp-mmsg.c \
test/test-udp-multicast-interface.c \
test/test-udp-multicast-interface6.c \
- test/test-udp-multicast-join.c \
@@ -20,46 +20,44 @@ index d9d2f3d0..1d105806 100644
test/test-udp-open.c \
test/test-udp-options.c \
diff --git a/test/test-list.h b/test/test-list.h
-index 24a8a657..cb034076 100644
+index 52b17a69..89903c7e 100644
--- a/test/test-list.h
+++ b/test/test-list.h
-@@ -126,7 +126,7 @@ TEST_DECLARE (tcp_bind_invalid_flags)
+@@ -126,9 +126,6 @@ TEST_DECLARE (tcp_bind_invalid_flags)
TEST_DECLARE (tcp_bind_writable_flags)
TEST_DECLARE (tcp_listen_without_bind)
TEST_DECLARE (tcp_connect_error_fault)
-TEST_DECLARE (tcp_connect_timeout)
-+// TEST_DECLARE (tcp_connect_timeout)
+-TEST_DECLARE (tcp_local_connect_timeout)
+-TEST_DECLARE (tcp6_local_connect_timeout)
TEST_DECLARE (tcp_close_while_connecting)
TEST_DECLARE (tcp_close)
TEST_DECLARE (tcp_close_reset_accepted)
-@@ -162,8 +162,8 @@ TEST_DECLARE (udp_send_and_recv)
- TEST_DECLARE (udp_send_hang_loop)
+@@ -166,8 +163,6 @@ TEST_DECLARE (udp_send_hang_loop)
TEST_DECLARE (udp_send_immediate)
TEST_DECLARE (udp_send_unreachable)
+ TEST_DECLARE (udp_mmsg)
-TEST_DECLARE (udp_multicast_join)
-TEST_DECLARE (udp_multicast_join6)
-+// TEST_DECLARE (udp_multicast_join)
-+// TEST_DECLARE (udp_multicast_join6)
TEST_DECLARE (udp_multicast_ttl)
TEST_DECLARE (udp_multicast_interface)
TEST_DECLARE (udp_multicast_interface6)
-@@ -670,7 +670,7 @@ TASK_LIST_START
+@@ -681,9 +676,6 @@ TASK_LIST_START
TEST_ENTRY (tcp_bind_writable_flags)
TEST_ENTRY (tcp_listen_without_bind)
TEST_ENTRY (tcp_connect_error_fault)
- TEST_ENTRY (tcp_connect_timeout)
-+// TEST_ENTRY (tcp_connect_timeout)
+- TEST_ENTRY (tcp_local_connect_timeout)
+- TEST_ENTRY (tcp6_local_connect_timeout)
TEST_ENTRY (tcp_close_while_connecting)
TEST_ENTRY (tcp_close)
TEST_ENTRY (tcp_close_reset_accepted)
-@@ -717,8 +717,8 @@ TASK_LIST_START
- TEST_ENTRY (udp_no_autobind)
+@@ -733,8 +725,6 @@ TASK_LIST_START
+ TEST_ENTRY (udp_mmsg)
TEST_ENTRY (udp_multicast_interface)
TEST_ENTRY (udp_multicast_interface6)
- TEST_ENTRY (udp_multicast_join)
- TEST_ENTRY (udp_multicast_join6)
-+// TEST_ENTRY (udp_multicast_join)
-+// TEST_ENTRY (udp_multicast_join6)
TEST_ENTRY (udp_multicast_ttl)
+ TEST_ENTRY (udp_sendmmsg_error)
TEST_ENTRY (udp_try_send)
-
diff --git a/SOURCES/libuv-unix-don-t-use-_POSIX_PATH_MAX.patch b/SOURCES/libuv-unix-don-t-use-_POSIX_PATH_MAX.patch
deleted file mode 100644
index d759b0e..0000000
--- a/SOURCES/libuv-unix-don-t-use-_POSIX_PATH_MAX.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream patch from https://github.com/libuv/libuv/pull/2966
-to address https://bugzilla.redhat.com/show_bug.cgi?id=1879330
-Resolves: #CVE-2020-8252
-
-From 0e6e8620496dff0eb285589ef1e37a7f407f3ddd Mon Sep 17 00:00:00 2001
-From: Ben Noordhuis <info@bnoordhuis.nl>
-Date: Mon, 24 Aug 2020 11:42:27 +0200
-Subject: unix: don't use _POSIX_PATH_MAX
-
-Libuv was using _POSIX_PATH_MAX wrong. Bug introduced in commit b56d279b
-("unix: do not require PATH_MAX to be defined") from September 2018.
-
-_POSIX_PATH_MAX is the minimum max path size guaranteed by POSIX, not
-the actual max path size of the system libuv runs on. _POSIX_PATH_MAX
-is always 256, the real max is often much bigger.
-
-This commit fixes buffer overruns when processing very long paths in
-uv_fs_readlink() and uv_fs_realpath() because libuv was not allocating
-enough memory to store the result.
-
-Fixes: https://github.com/libuv/libuv/issues/2965
-PR-URL: https://github.com/libuv/libuv/pull/2966
-Reviewed-By: Richard Lau <riclau@uk.ibm.com>
-Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
-Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
-Reviewed-By: Jameson Nash <vtjnash@gmail.com>
----
- src/unix/internal.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/unix/internal.h b/src/unix/internal.h
-index 30711673..9d3c2297 100644
---- a/src/unix/internal.h
-+++ b/src/unix/internal.h
-@@ -62,9 +62,7 @@
- # include <AvailabilityMacros.h>
- #endif
-
--#if defined(_POSIX_PATH_MAX)
--# define UV__PATH_MAX _POSIX_PATH_MAX
--#elif defined(PATH_MAX)
-+#if defined(PATH_MAX)
- # define UV__PATH_MAX PATH_MAX
- #else
- # define UV__PATH_MAX 8192
---
-2.26.2
-
diff --git a/SPECS/libuv.spec b/SPECS/libuv.spec
index 2c42a0a..8f4c967 100644
--- a/SPECS/libuv.spec
+++ b/SPECS/libuv.spec
@@ -5,8 +5,8 @@
Name: libuv
Epoch: 1
-Version: 1.38.0
-Release: 2%{?dist}
+Version: 1.40.0
+Release: 1%{?dist}
Summary: Platform layer for node.js
# the licensing breakdown is described in detail in the LICENSE file
@@ -25,7 +25,6 @@ BuildRequires: gcc
# -- Patches -- #
Patch1: 0001-Disable-failing-network-tests.patch
%endif
-Patch2: libuv-unix-don-t-use-_POSIX_PATH_MAX.patch
%description
libuv is a new platform layer for Node. Its purpose is to abstract IOCP on
@@ -89,9 +88,14 @@ make check
%{_libdir}/%{name}.a
%changelog
+* Mon Jan 25 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.40.0-1
+- Rebase to 1.40.0
+- Resolves: RHBZ#1895872
+- Ship libuv-devel
+
* Wed Sep 23 2020 Honza Horak <hhorak@redhat.com> - 1:1.38.0-2
- Fix max path size by not using _POSIX_PATH_MAX
- Resolves: #1879330
+ Resolves: #1881870
Fixes: CVE-2020-8252
* Tue Jun 09 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.38.0-1