Skip to content

Commit f935a50

Browse files
cjihrigzcbenz
authored andcommitted
deps: upgrade to libuv 1.34.1
Notable changes: - uv_fs_copyfile() now supports CIFS share destinations. - isatty() now works on IBMi - TTYs are opened with the O_NOCTTY flag. Fixes: nodejs/node#31170 PR-URL: nodejs/node#31332 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 7d014ab commit f935a50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+369
-2204
lines changed

deps/uv/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -412,3 +412,4 @@ ZYSzys <zyszys98@gmail.com>
412412
Carl Lei <xecycle@gmail.com>
413413
Stefan Bender <stefan.bender@ntnu.no>
414414
nia <nia@NetBSD.org>
415+
virtualyw <virtualyw@gmail.com>

deps/uv/ChangeLog

+67
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
2020.01.13, Version 1.34.1 (Stable), 8aa5636ec72990bb2856f81e14c95813024a5c2b
2+
3+
Changes since version 1.34.0:
4+
5+
* unix: fix -Wstrict-aliasing compiler warning (Ben Noordhuis)
6+
7+
* unix: cache address of dlsym("mkostemp") (Ben Noordhuis)
8+
9+
* build: remove -pedantic from compiler flags (Ben Noordhuis)
10+
11+
* Revert "darwin: assume pthread_setname_np() is available" (Ben Noordhuis)
12+
13+
* Revert "darwin: speed up uv_set_process_title()" (Ben Noordhuis)
14+
15+
* darwin: assume pthread_setname_np() is available (Ben Noordhuis)
16+
17+
* ibmi: fix the false isatty() issue on IBMi (Xu Meng)
18+
19+
* test: fix test failure under NetBSD and OpenBSD (David Carlier)
20+
21+
* test: skip some test cases on IBMi (Xu Meng)
22+
23+
* test: skip uv_(get|set)_process_title on IBMi (Xu Meng)
24+
25+
* doc: remove binaries for Windows from README (Richard Lau)
26+
27+
* unix: fix -Wunused-but-set-variable warning (George Zhao)
28+
29+
* unix: pass sysctl size arg using ARRAY_SIZE macro (David Carlier)
30+
31+
* test: disallow running the test suite as root (cjihrig)
32+
33+
* unix: suppress -Waddress-of-packed-member warning (Ben Noordhuis)
34+
35+
* misc: make more tags "not-stale" (Jameson Nash)
36+
37+
* test: fix pthread memory leak (Trevor Norris)
38+
39+
* docs: delete socks5-proxy sample (Jameson Nash)
40+
41+
* ibmi: fix the CMSG length issue (Xu Meng)
42+
43+
* docs: fix formatting (Jameson Nash)
44+
45+
* unix: squelch fchmod() EPERM on CIFS share (Ben Noordhuis)
46+
47+
* docs: fix linkcheck (Jameson Nash)
48+
49+
* docs: switch from linux.die.net to man7.org (Jameson Nash)
50+
51+
* win: remove abort when non-IFS LSP detection fails (virtualyw)
52+
53+
* docs: clarify that uv_pipe_t is a pipe (Jameson Nash)
54+
55+
* win,tty: avoid regressions in utf-8 handling (Jameson Nash)
56+
57+
* win: remove bad assert in uv_loop_close (Jameson Nash)
58+
59+
* test: fix -fno-common build errors (Ben Noordhuis)
60+
61+
* build: turn on -fno-common to catch regressions (Ben Noordhuis)
62+
63+
* test: fix fs birth time test failure (Ben Noordhuis)
64+
65+
* tty,unix: avoid affecting controlling TTY (Jameson Nash)
66+
67+
168
2019.12.05, Version 1.34.0 (Stable), 15ae750151ac9341e5945eb38f8982d59fb99201
269

370
Changes since version 1.33.1:

deps/uv/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ EXTRA_DIST = test/fixtures/empty_file \
123123
include \
124124
docs \
125125
img \
126-
samples \
127126
android-configure-arm \
128127
android-configure-arm64 \
129128
android-configure-x86 \

deps/uv/README.md

-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ libuv can be downloaded either from the
116116
[GitHub repository](https://github.com/libuv/libuv)
117117
or from the [downloads site](http://dist.libuv.org/dist/).
118118

119-
Starting with libuv 1.7.0, binaries for Windows are also provided. This is to
120-
be considered EXPERIMENTAL.
121-
122119
Before verifying the git tags or signature files, importing the relevant keys
123120
is necessary. Key IDs are listed in the
124121
[MAINTAINERS](https://github.com/libuv/libuv/blob/master/MAINTAINERS.md)

deps/uv/common.gypi

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
'conditions': [
3737
['OS != "zos"', {
38-
'cflags': [ '-O0', '-fwrapv' ]
38+
'cflags': [ '-O0', '-fno-common', '-fwrapv' ]
3939
}],
4040
['OS == "android"', {
4141
'cflags': [ '-fPIE' ],
@@ -80,9 +80,10 @@
8080
'conditions': [
8181
['OS != "zos"', {
8282
'cflags': [
83-
'-fomit-frame-pointer',
8483
'-fdata-sections',
8584
'-ffunction-sections',
85+
'-fno-common',
86+
'-fomit-frame-pointer',
8687
],
8788
}],
8889
]

deps/uv/configure.ac

+1-4
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.34.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.34.1], [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])
@@ -24,9 +24,6 @@ AC_ENABLE_SHARED
2424
AC_ENABLE_STATIC
2525
AC_PROG_CC
2626
AM_PROG_CC_C_O
27-
AS_IF([AS_CASE([$host_os],[openedition*], [false], [true])], [
28-
CC_CHECK_CFLAGS_APPEND([-pedantic])
29-
])
3027
CC_FLAG_VISIBILITY #[-fvisibility=hidden]
3128
CC_CHECK_CFLAGS_APPEND([-g])
3229
CC_CHECK_CFLAGS_APPEND([-std=gnu89])

deps/uv/docs/src/design.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Unlike network I/O, there are no platform-specific file I/O primitives libuv cou
126126
so the current approach is to run blocking file I/O operations in a thread pool.
127127

128128
For a thorough explanation of the cross-platform file I/O landscape, checkout
129-
`this post <http://blog.libtorrent.org/2012/10/asynchronous-disk-io/>`_.
129+
`this post <https://blog.libtorrent.org/2012/10/asynchronous-disk-io/>`_.
130130

131131
libuv currently uses a global thread pool on which all loops can queue work. 3 types of
132132
operations are currently run on this pool:

deps/uv/docs/src/fs.rst

+11-11
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ API
403403
.. c:function:: int uv_fs_utime(uv_loop_t* loop, uv_fs_t* req, const char* path, double atime, double mtime, uv_fs_cb cb)
404404
.. c:function:: int uv_fs_futime(uv_loop_t* loop, uv_fs_t* req, uv_file file, double atime, double mtime, uv_fs_cb cb)
405405
406-
Equivalent to :man:`utime(2)` and :man:`futime(2)` respectively.
406+
Equivalent to :man:`utime(2)` and :man:`futimes(3)` respectively.
407407
408408
.. note::
409409
AIX: This function only works for AIX 7.1 and newer. It can still be called on older
@@ -435,7 +435,7 @@ API
435435
436436
.. c:function:: int uv_fs_realpath(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb)
437437
438-
Equivalent to :man:`realpath(3)` on Unix. Windows uses `GetFinalPathNameByHandle <https://msdn.microsoft.com/en-us/library/windows/desktop/aa364962(v=vs.85).aspx>`_.
438+
Equivalent to :man:`realpath(3)` on Unix. Windows uses `GetFinalPathNameByHandle <https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfinalpathnamebyhandlea>`_.
439439
The resulting string is stored in `req->ptr`.
440440
441441
.. warning::
@@ -512,7 +512,7 @@ Helper functions
512512
.. c:function:: uv_os_fd_t uv_get_osfhandle(int fd)
513513
514514
For a file descriptor in the C runtime, get the OS-dependent handle.
515-
On UNIX, returns the ``fd`` intact. On Windows, this calls `_get_osfhandle <https://msdn.microsoft.com/en-us/library/ks2530z6.aspx>`_.
515+
On UNIX, returns the ``fd`` intact. On Windows, this calls `_get_osfhandle <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/get-osfhandle?view=vs-2019>`_.
516516
Note that the return value is still owned by the C runtime,
517517
any attempts to close it or to use it after closing the fd may lead to malfunction.
518518
@@ -521,7 +521,7 @@ Helper functions
521521
.. c:function:: int uv_open_osfhandle(uv_os_fd_t os_fd)
522522
523523
For a OS-dependent handle, get the file descriptor in the C runtime.
524-
On UNIX, returns the ``os_fd`` intact. On Windows, this calls `_open_osfhandle <https://msdn.microsoft.com/en-us/library/bdts1c9x.aspx>`_.
524+
On UNIX, returns the ``os_fd`` intact. On Windows, this calls `_open_osfhandle <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/open-osfhandle?view=vs-2019>`_.
525525
Note that the return value is still owned by the CRT,
526526
any attempts to close it or to use it after closing the handle may lead to malfunction.
527527
@@ -547,7 +547,7 @@ File open constants
547547
548548
.. note::
549549
`UV_FS_O_DIRECT` is supported on Linux, and on Windows via
550-
`FILE_FLAG_NO_BUFFERING <https://msdn.microsoft.com/en-us/library/windows/desktop/cc644950.aspx>`_.
550+
`FILE_FLAG_NO_BUFFERING <https://docs.microsoft.com/en-us/windows/win32/fileio/file-buffering>`_.
551551
`UV_FS_O_DIRECT` is not supported on macOS.
552552
553553
.. c:macro:: UV_FS_O_DIRECTORY
@@ -564,7 +564,7 @@ File open constants
564564
565565
.. note::
566566
`UV_FS_O_DSYNC` is supported on Windows via
567-
`FILE_FLAG_WRITE_THROUGH <https://msdn.microsoft.com/en-us/library/windows/desktop/cc644950.aspx>`_.
567+
`FILE_FLAG_WRITE_THROUGH <https://docs.microsoft.com/en-us/windows/win32/fileio/file-buffering>`_.
568568
569569
.. c:macro:: UV_FS_O_EXCL
570570
@@ -631,7 +631,7 @@ File open constants
631631
632632
.. note::
633633
`UV_FS_O_RANDOM` is only supported on Windows via
634-
`FILE_FLAG_RANDOM_ACCESS <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
634+
`FILE_FLAG_RANDOM_ACCESS <https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea>`_.
635635
636636
.. c:macro:: UV_FS_O_RDONLY
637637
@@ -648,15 +648,15 @@ File open constants
648648
649649
.. note::
650650
`UV_FS_O_SEQUENTIAL` is only supported on Windows via
651-
`FILE_FLAG_SEQUENTIAL_SCAN <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
651+
`FILE_FLAG_SEQUENTIAL_SCAN <https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea>`_.
652652
653653
.. c:macro:: UV_FS_O_SHORT_LIVED
654654
655655
The file is temporary and should not be flushed to disk if possible.
656656
657657
.. note::
658658
`UV_FS_O_SHORT_LIVED` is only supported on Windows via
659-
`FILE_ATTRIBUTE_TEMPORARY <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
659+
`FILE_ATTRIBUTE_TEMPORARY <https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea>`_.
660660
661661
.. c:macro:: UV_FS_O_SYMLINK
662662
@@ -669,15 +669,15 @@ File open constants
669669
670670
.. note::
671671
`UV_FS_O_SYNC` is supported on Windows via
672-
`FILE_FLAG_WRITE_THROUGH <https://msdn.microsoft.com/en-us/library/windows/desktop/cc644950.aspx>`_.
672+
`FILE_FLAG_WRITE_THROUGH <https://docs.microsoft.com/en-us/windows/win32/fileio/file-buffering>`_.
673673
674674
.. c:macro:: UV_FS_O_TEMPORARY
675675
676676
The file is temporary and should not be flushed to disk if possible.
677677
678678
.. note::
679679
`UV_FS_O_TEMPORARY` is only supported on Windows via
680-
`FILE_ATTRIBUTE_TEMPORARY <https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858.aspx>`_.
680+
`FILE_ATTRIBUTE_TEMPORARY <https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea>`_.
681681
682682
.. c:macro:: UV_FS_O_TRUNC
683683

deps/uv/docs/src/fs_event.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the best backend for the job on each platform.
2323
creation/deletion within a directory that is being monitored.
2424
See the `IBM Knowledge centre`_ for more details.
2525

26-
.. _documentation: http://www.ibm.com/developerworks/aix/library/au-aix_event_infrastructure/
26+
.. _documentation: https://developer.ibm.com/articles/au-aix_event_infrastructure/
2727
.. _`IBM Knowledge centre`: https://www.ibm.com/support/knowledgecenter/en/SSLTBW_2.2.0/com.ibm.zos.v2r1.bpxb100/ioc.htm
2828

2929

deps/uv/docs/src/index.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ was primarily developed for use by `Node.js`_, but it's also used by `Luvit`_,
1313
In case you find errors in this documentation you can help by sending
1414
`pull requests <https://github.com/libuv/libuv>`_!
1515

16-
.. _Node.js: http://nodejs.org
17-
.. _Luvit: http://luvit.io
18-
.. _Julia: http://julialang.org
16+
.. _Node.js: https://nodejs.org
17+
.. _Luvit: https://luvit.io
18+
.. _Julia: https://julialang.org
1919
.. _pyuv: https://github.com/saghul/pyuv
2020
.. _others: https://github.com/libuv/libuv/wiki/Projects-that-use-libuv
2121

@@ -52,7 +52,7 @@ Documentation
5252
Downloads
5353
---------
5454

55-
libuv can be downloaded from `here <http://dist.libuv.org/dist/>`_.
55+
libuv can be downloaded from `here <https://dist.libuv.org/dist/>`_.
5656

5757

5858
Installation

deps/uv/docs/src/misc.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ Data types
192192

193193
::
194194

195-
typedef struct uv_env_item_s {
196-
char* name;
197-
char* value;
198-
} uv_env_item_t;
195+
typedef struct uv_env_item_s {
196+
char* name;
197+
char* value;
198+
} uv_env_item_t;
199199

200200
.. c:type:: uv_random_t
201201
@@ -314,7 +314,7 @@ API
314314
315315
.. c:function:: void uv_loadavg(double avg[3])
316316
317-
Gets the load average. See: `<http://en.wikipedia.org/wiki/Load_(computing)>`_
317+
Gets the load average. See: `<https://en.wikipedia.org/wiki/Load_(computing)>`_
318318
319319
.. note::
320320
Returns [0,0,0] on Windows (i.e., it's not implemented).
@@ -646,7 +646,7 @@ API
646646
647647
Retrieves system information in `buffer`. The populated data includes the
648648
operating system name, release, version, and machine. On non-Windows
649-
systems, `uv_os_uname()` is a thin wrapper around :man:`uname(3)`. Returns
649+
systems, `uv_os_uname()` is a thin wrapper around :man:`uname(2)`. Returns
650650
zero on success, and a non-zero error value otherwise.
651651
652652
.. versionadded:: 1.25.0
@@ -687,7 +687,7 @@ API
687687
- Other UNIX: `/dev/urandom` after reading from `/dev/random` once.
688688
689689
:returns: 0 on success, or an error code < 0 on failure. The contents of
690-
`buf` is undefined after an error.
690+
`buf` is undefined after an error.
691691
692692
.. note::
693693
When using the synchronous version, both `loop` and `req` parameters

deps/uv/docs/src/pipe.rst

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
:c:type:`uv_pipe_t` --- Pipe handle
55
===================================
66

7-
Pipe handles provide an abstraction over local domain sockets on Unix and named
8-
pipes on Windows.
7+
Pipe handles provide an abstraction over streaming files on Unix (including
8+
local domain sockets, pipes, and FIFOs) and named pipes on Windows.
99

1010
:c:type:`uv_pipe_t` is a 'subclass' of :c:type:`uv_stream_t`.
1111

@@ -34,7 +34,8 @@ API
3434
.. c:function:: int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc)
3535
3636
Initialize a pipe handle. The `ipc` argument is a boolean to indicate if
37-
this pipe will be used for handle passing between processes.
37+
this pipe will be used for handle passing between processes (which may
38+
change the bytes on the wire).
3839
3940
.. c:function:: int uv_pipe_open(uv_pipe_t* handle, uv_file file)
4041

deps/uv/docs/src/sphinx-plugins/manpage.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
def make_link_node(rawtext, app, name, manpage_num, options):
1919
ref = app.config.man_url_regex
2020
if not ref:
21-
ref = "http://linux.die.net/man/%s/%s" % (manpage_num, name)
21+
ref = "http://man7.org/linux/man-pages/man%s/%s.%s.html" %(manpage_num, name, manpage_num)
2222
else:
2323
s = Template(ref)
2424
ref = s.substitute(num=manpage_num, topic=name)

deps/uv/docs/src/version.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ a major release. In this section you'll find all macros and functions that
1010
will allow you to write or compile code conditionally, in order to work with
1111
multiple libuv versions.
1212

13-
.. _semantic versioning: http://semver.org
13+
.. _semantic versioning: https://semver.org
1414

1515

1616
Macros

deps/uv/include/uv/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

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

deps/uv/samples/.gitignore

-22
This file was deleted.

0 commit comments

Comments
 (0)