Skip to content

Commit fff1167

Browse files
cjihrigtargos
authored andcommitted
deps: upgrade to libuv 1.34.0
Notable changes: - Fix handling of large files in uv_fs_copyfile(). Fixes: #30085 - Fix Android build errors. - uv_sleep() has been added. - uv_interface_addresses() IPv6 netmask support has been fixed. Fixes: #30504 - uv_fs_mkstemp() has been added. PR-URL: #30783 Fixes: #30085 Fixes: #30504 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent eb8f19a commit fff1167

26 files changed

+535
-106
lines changed

deps/uv/AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,3 +411,4 @@ Ouyang Yadong <[email protected]>
411411
412412
413413
Stefan Bender <[email protected]>
414+

deps/uv/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
275275
src/unix/linux-syscalls.c
276276
src/unix/procfs-exepath.c
277277
src/unix/pthread-fixes.c
278+
src/unix/random-getrandom.c
279+
src/unix/random-sysctl-linux.c
278280
src/unix/sysinfo-loadavg.c)
279281
endif()
280282

@@ -320,7 +322,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
320322
src/unix/linux-syscalls.c
321323
src/unix/procfs-exepath.c
322324
src/unix/random-getrandom.c
323-
src/unix/random-sysctl.c
325+
src/unix/random-sysctl-linux.c
324326
src/unix/sysinfo-loadavg.c)
325327
endif()
326328

deps/uv/ChangeLog

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
2019.12.05, Version 1.34.0 (Stable), 15ae750151ac9341e5945eb38f8982d59fb99201
2+
3+
Changes since version 1.33.1:
4+
5+
* unix: move random-sysctl to random-sysctl-linux (nia)
6+
7+
* netbsd: use KERN_ARND sysctl to get entropy (nia)
8+
9+
* unix: refactor uv__fs_copyfile() logic (cjihrig)
10+
11+
* build: fix android build, add missing sources (Ben Noordhuis)
12+
13+
* build: fix android build, fix symbol redefinition (Ben Noordhuis)
14+
15+
* build: fix android autotools build (Ben Noordhuis)
16+
17+
* fs: handle non-functional statx system call (Milad Farazmand)
18+
19+
* unix,win: add uv_sleep() (cjihrig)
20+
21+
* doc: add richardlau to maintainers (Richard Lau)
22+
23+
* aix: fix netmask for IPv6 (Richard Lau)
24+
25+
* aix: clean up after errors in uv_interface_addresses() (Richard Lau)
26+
27+
* aix: fix setting of physical addresses (Richard Lau)
28+
29+
* fs: add uv_fs_mkstemp (Saúl Ibarra Corretgé)
30+
31+
* unix: switch uv_sleep() to nanosleep() (Ben Noordhuis)
32+
33+
* unix: retry on EINTR in uv_sleep() (Ben Noordhuis)
34+
35+
* zos: fix nanosleep() emulation (Ben Noordhuis)
36+
37+
138
2019.10.20, Version 1.33.1 (Stable), 07ad32138f4d2285ba2226b5e20462b27b091a59
239

340
Changes since version 1.33.0:

deps/uv/MAINTAINERS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ libuv is currently managed by the following individuals:
1717
- GPG key: 9DFE AA5F 481B BF77 2D90 03CE D592 4925 2F8E C41A (pubkey-iwuzhere)
1818
* **Jameson Nash** ([@vtjnash](https://github.com/vtjnash))
1919
* **John Barboza** ([@jbarz](https://github.com/jbarz))
20+
* **Richard Lau** ([@richardlau](https://github.com/richardlau))
21+
- GPG key: C82F A3AE 1CBE DC6B E46B 9360 C43C EC45 C17A B93C (pubkey-richardlau)
2022
* **Santiago Gimeno** ([@santigimeno](https://github.com/santigimeno))
2123
- GPG key: 612F 0EAD 9401 6223 79DF 4402 F28C 3C8D A33C 03BE (pubkey-santigimeno)
2224
* **Saúl Ibarra Corretgé** ([@saghul](https://github.com/saghul))

deps/uv/Makefile.am

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,14 @@ endif
387387
if ANDROID
388388
uvinclude_HEADERS += include/uv/android-ifaddrs.h
389389
libuv_la_SOURCES += src/unix/android-ifaddrs.c \
390-
src/unix/pthread-fixes.c
390+
src/unix/linux-core.c \
391+
src/unix/linux-inotify.c \
392+
src/unix/linux-syscalls.c \
393+
src/unix/procfs-exepath.c \
394+
src/unix/pthread-fixes.c \
395+
src/unix/random-getrandom.c \
396+
src/unix/random-sysctl-linux.c \
397+
src/unix/sysinfo-loadavg.c
391398
endif
392399

393400
if CYGWIN
@@ -467,7 +474,7 @@ libuv_la_SOURCES += src/unix/linux-core.c \
467474
src/unix/procfs-exepath.c \
468475
src/unix/proctitle.c \
469476
src/unix/random-getrandom.c \
470-
src/unix/random-sysctl.c \
477+
src/unix/random-sysctl-linux.c \
471478
src/unix/sysinfo-loadavg.c
472479
test_run_tests_LDFLAGS += -lutil
473480
endif

deps/uv/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.33.1], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.34.0], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

deps/uv/docs/src/fs.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ Data types
9999
UV_FS_LCHOWN,
100100
UV_FS_OPENDIR,
101101
UV_FS_READDIR,
102-
UV_FS_CLOSEDIR
102+
UV_FS_CLOSEDIR,
103+
UV_FS_MKSTEMP
103104
} uv_fs_type;
104105

105106
.. c:type:: uv_statfs_t
@@ -245,10 +246,14 @@ API
245246
246247
.. c:function:: int uv_fs_mkdtemp(uv_loop_t* loop, uv_fs_t* req, const char* tpl, uv_fs_cb cb)
247248
248-
Equivalent to :man:`mkdtemp(3)`.
249+
Equivalent to :man:`mkdtemp(3)`. The result can be found as a null terminated string at `req->path`.
249250
250-
.. note::
251-
The result can be found as a null terminated string at `req->path`.
251+
.. c:function:: int uv_fs_mkstemp(uv_loop_t* loop, uv_fs_t* req, const char* tpl, uv_fs_cb cb)
252+
253+
Equivalent to :man:`mkstemp(3)`. The created file path can be found as a null terminated string at `req->path`.
254+
The file descriptor can be found as an integer at `req->result`.
255+
256+
.. versionadded:: 1.34.0
252257
253258
.. c:function:: int uv_fs_rmdir(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb)
254259

deps/uv/docs/src/misc.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@ API
679679
:man:`sysctl(2)`.
680680
- FreeBSD: `getrandom(2) <https://www.freebsd.org/cgi/man.cgi?query=getrandom&sektion=2>_`,
681681
or `/dev/urandom` after reading from `/dev/random` once.
682+
- NetBSD: `KERN_ARND` `sysctl(3) <https://netbsd.gw.com/cgi-bin/man-cgi?sysctl+3+NetBSD-current>_`
682683
- macOS, OpenBSD: `getentropy(2) <https://man.openbsd.org/getentropy.2>_`
683684
if available, or `/dev/urandom` after reading from `/dev/random` once.
684685
- AIX: `/dev/random`.
@@ -693,3 +694,9 @@ API
693694
are not used and can be set to `NULL`.
694695
695696
.. versionadded:: 1.33.0
697+
698+
.. c:function:: void uv_sleep(unsigned int msec)
699+
700+
Causes the calling thread to sleep for `msec` milliseconds.
701+
702+
.. versionadded:: 1.34.0

deps/uv/include/uv.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,8 @@ typedef enum {
12581258
UV_FS_OPENDIR,
12591259
UV_FS_READDIR,
12601260
UV_FS_CLOSEDIR,
1261-
UV_FS_STATFS
1261+
UV_FS_STATFS,
1262+
UV_FS_MKSTEMP
12621263
} uv_fs_type;
12631264

12641265
struct uv_dir_s {
@@ -1349,6 +1350,10 @@ UV_EXTERN int uv_fs_mkdtemp(uv_loop_t* loop,
13491350
uv_fs_t* req,
13501351
const char* tpl,
13511352
uv_fs_cb cb);
1353+
UV_EXTERN int uv_fs_mkstemp(uv_loop_t* loop,
1354+
uv_fs_t* req,
1355+
const char* tpl,
1356+
uv_fs_cb cb);
13521357
UV_EXTERN int uv_fs_rmdir(uv_loop_t* loop,
13531358
uv_fs_t* req,
13541359
const char* path,
@@ -1641,6 +1646,7 @@ UV_EXTERN uint64_t uv_get_total_memory(void);
16411646
UV_EXTERN uint64_t uv_get_constrained_memory(void);
16421647

16431648
UV_EXTERN uint64_t uv_hrtime(void);
1649+
UV_EXTERN void uv_sleep(unsigned int msec);
16441650

16451651
UV_EXTERN void uv_disable_stdio_inheritance(void);
16461652

deps/uv/include/uv/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
*/
3232

3333
#define UV_VERSION_MAJOR 1
34-
#define UV_VERSION_MINOR 33
35-
#define UV_VERSION_PATCH 1
34+
#define UV_VERSION_MINOR 34
35+
#define UV_VERSION_PATCH 0
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

0 commit comments

Comments
 (0)