Skip to content

Commit 5d371cc

Browse files
committed
deps src: Automatic update
1 parent 22c8933 commit 5d371cc

24 files changed

+234
-68
lines changed

src/libuv-stamp/download-libuv.cmake

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good)
2222
set("${has_hash}" TRUE PARENT_SCOPE)
2323

2424
message(VERBOSE "verifying file...
25-
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz'")
25+
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz'")
2626

27-
file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz" actual_value)
27+
file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz" actual_value)
2828

29-
if(NOT "${actual_value}" STREQUAL "a10656a0865e2cff7a1b523fa47d0f5a9c65be963157301f814d1cc5dbd4dc1d")
29+
if(NOT "${actual_value}" STREQUAL "94312ede44c6cae544ae316557e2651aea65efce5da06f8d44685db08392ec5d")
3030
set("${hash_is_good}" FALSE PARENT_SCOPE)
3131
message(VERBOSE "SHA256 hash of
32-
/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz
32+
/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz
3333
does not match expected value
34-
expected: 'a10656a0865e2cff7a1b523fa47d0f5a9c65be963157301f814d1cc5dbd4dc1d'
34+
expected: '94312ede44c6cae544ae316557e2651aea65efce5da06f8d44685db08392ec5d'
3535
actual: '${actual_value}'")
3636
else()
3737
set("${hash_is_good}" TRUE PARENT_SCOPE)
@@ -71,32 +71,32 @@ function(sleep_before_download attempt)
7171
execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
7272
endfunction()
7373

74-
if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz")
74+
if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz")
7575
check_file_hash(has_hash hash_is_good)
7676
if(has_hash)
7777
if(hash_is_good)
7878
message(VERBOSE "File already exists and hash match (skip download):
79-
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz'
80-
SHA256='a10656a0865e2cff7a1b523fa47d0f5a9c65be963157301f814d1cc5dbd4dc1d'"
79+
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz'
80+
SHA256='94312ede44c6cae544ae316557e2651aea65efce5da06f8d44685db08392ec5d'"
8181
)
8282
return()
8383
else()
8484
message(VERBOSE "File already exists but hash mismatch. Removing...")
85-
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz")
85+
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz")
8686
endif()
8787
else()
8888
message(VERBOSE "File already exists but no hash specified (use URL_HASH):
89-
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz'
89+
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz'
9090
Old file will be removed and new file downloaded from URL."
9191
)
92-
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz")
92+
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz")
9393
endif()
9494
endif()
9595

9696
set(retry_number 5)
9797

9898
message(VERBOSE "Downloading...
99-
dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz'
99+
dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz'
100100
timeout='none'
101101
inactivity timeout='none'"
102102
)
@@ -107,7 +107,7 @@ foreach(i RANGE ${retry_number})
107107
if(status_code IN_LIST download_retry_codes)
108108
sleep_before_download(${i})
109109
endif()
110-
foreach(url IN ITEMS [====[https://github.com/libuv/libuv/archive/v1.49.0.tar.gz]====])
110+
foreach(url IN ITEMS [====[https://github.com/libuv/libuv/archive/v1.49.1.tar.gz]====])
111111
if(NOT url IN_LIST skip_url_list)
112112
message(VERBOSE "Using src='${url}'")
113113

@@ -119,7 +119,7 @@ foreach(i RANGE ${retry_number})
119119

120120
file(
121121
DOWNLOAD
122-
"${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz"
122+
"${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz"
123123

124124
# no TIMEOUT
125125
# no INACTIVITY_TIMEOUT
@@ -136,7 +136,7 @@ foreach(i RANGE ${retry_number})
136136
check_file_hash(has_hash hash_is_good)
137137
if(has_hash AND NOT hash_is_good)
138138
message(VERBOSE "Hash mismatch, removing...")
139-
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz")
139+
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz")
140140
else()
141141
message(VERBOSE "Downloading... done")
142142
return()

src/libuv-stamp/extract-libuv.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5)
55

66
# Make file names absolute:
77
#
8-
get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.0.tar.gz" ABSOLUTE)
8+
get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/libuv/v1.49.1.tar.gz" ABSOLUTE)
99
get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/libuv" ABSOLUTE)
1010

1111
message(VERBOSE "extracting...

src/libuv-stamp/libuv-urlinfo.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ method=url
66
command=/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/libuv-stamp/download-libuv.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/libuv-stamp/verify-libuv.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/libuv-stamp/extract-libuv.cmake
77
source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/libuv
88
work_dir=/home/runner/work/deps/deps/neovim/deps/build/src
9-
url(s)=https://github.com/libuv/libuv/archive/v1.49.0.tar.gz
10-
hash=SHA256=a10656a0865e2cff7a1b523fa47d0f5a9c65be963157301f814d1cc5dbd4dc1d
9+
url(s)=https://github.com/libuv/libuv/archive/v1.49.1.tar.gz
10+
hash=SHA256=94312ede44c6cae544ae316557e2651aea65efce5da06f8d44685db08392ec5d
1111
no_extract=
1212

src/libuv/.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ David Carlier <devnexen@gmail.com>
1919
Devchandra Meetei Leishangthem <dlmeetei@gmail.com>
2020
Fedor Indutny <fedor.indutny@gmail.com> <fedor@indutny.com>
2121
Frank Denis <github@pureftpd.org>
22+
Hüseyin Açacak <110401522+huseyinacacak-janea@users.noreply.github.com> <huseyin@janeasystems.com>
2223
Imran Iqbal <imrani@ca.ibm.com> <imran@imraniqbal.org>
2324
Isaac Z. Schlueter <i@izs.me>
2425
Jason Williams <necmon@yahoo.com>

src/libuv/AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,3 +585,6 @@ Ian Butterworth <i.r.butterworth@gmail.com>
585585
Zuohui Yang <274048862@qq.com>
586586
Edigleysson Silva (Edy) <edigleyssonsilva@gmail.com>
587587
Raihaan Shouhell <raihaanhimself@gmail.com>
588+
Rialbat <miha-wead@mail.ru>
589+
Adam <adam@NetBSD.org>
590+
Poul T Lomholt <ptlomholt@users.noreply.github.com>

src/libuv/ChangeLog

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
1-
2024.09.25, Version 1.49.0 (Stable)
1+
2024.10.11, Version 1.49.1 (Stable)
2+
3+
Changes since version 1.49.0:
4+
5+
* build: add darwin-syscalls.h to release tarball (Ben Noordhuis)
6+
7+
* linux: use IORING_SETUP_NO_SQARRAY when available (Ben Noordhuis)
8+
9+
* linux: use IORING_OP_FTRUNCATE when available (Ben Noordhuis)
10+
11+
* win: fix pNtQueryDirectoryFile check (Rialbat)
12+
13+
* win: fix WriteFile() error translation (Santiago Gimeno)
14+
15+
* win,fs: uv_fs_rmdir() to return ENOENT on file (Santiago Gimeno)
16+
17+
* win,pipe: ipc code does not support async read (Jameson Nash)
18+
19+
* netbsd: fix build (Adam)
20+
21+
* win,fs: fix bug in fs__readdir (Hüseyin Açacak)
22+
23+
* unix: workaround gcc bug on armv7 (Santiago Gimeno)
24+
25+
* unix: work around arm-linux-gnueabihf-gcc bug (Ben Noordhuis)
26+
27+
* unix: fix uv_tcp_keepalive in smartOS (Santiago Gimeno)
28+
29+
* unix: fix uv_getrusage ru_maxrss on solaris (Poul T Lomholt)
30+
31+
32+
2024.09.25, Version 1.49.0 (Stable), d2e56a5e8d3e39947b78405ca6e4727c70f5568a
233

334
Changes since version 1.48.0:
435

src/libuv/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ libuv_la_CFLAGS += -D_DARWIN_UNLIMITED_SELECT=1
430430
libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
431431
src/unix/darwin-proctitle.c \
432432
src/unix/darwin-stub.h \
433+
src/unix/darwin-syscalls.h \
433434
src/unix/darwin.c \
434435
src/unix/fsevents.c \
435436
src/unix/kqueue.c \

src/libuv/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,6 @@ after the process terminates unless the event loop is closed.
343343

344344
Use the `ipcrm` command to manually clear up System V resources.
345345

346-
## Known Issues
347-
348-
- A possible arm-linux-gnueabihf-gcc bug causing, sometimes, incorrect generated code on `armv7` when calling `preadv()`: https://github.com/libuv/libuv/issues/4532.
349-
350346
## Patches
351347

352348
See the [guidelines for contributing][].

src/libuv/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.49.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.49.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])

src/libuv/include/uv/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 1
3434
#define UV_VERSION_MINOR 49
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

src/libuv/src/unix/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@ int uv_getrusage(uv_rusage_t* rusage) {
10341034
#if defined(__APPLE__)
10351035
rusage->ru_maxrss /= 1024; /* macOS and iOS report bytes. */
10361036
#elif defined(__sun)
1037-
rusage->ru_maxrss /= getpagesize() / 1024; /* Solaris reports pages. */
1037+
rusage->ru_maxrss *= getpagesize() / 1024; /* Solaris reports pages. */
10381038
#endif
10391039

10401040
return 0;
@@ -1882,13 +1882,13 @@ int uv__search_path(const char* prog, char* buf, size_t* buflen) {
18821882
#if defined(__linux__) || defined (__FreeBSD__)
18831883
# define uv__cpu_count(cpuset) CPU_COUNT(cpuset)
18841884
#elif defined(__NetBSD__)
1885-
static int uv__cpu_count(cpuset_t *cpuset) {
1885+
static int uv__cpu_count(cpuset_t* set) {
18861886
int rc;
18871887
cpuid_t i;
18881888

18891889
rc = 0;
18901890
for (i = 0;; i++) {
1891-
int r = cpuset_isset(cpu, set);
1891+
int r = cpuset_isset(i, set);
18921892
if (r < 0)
18931893
break;
18941894
if (r)

src/libuv/src/unix/fs.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,12 @@ static ssize_t uv__pwritev_emul(int fd,
461461

462462
/* The function pointer cache is an uintptr_t because _Atomic void*
463463
* doesn't work on macos/ios/etc...
464+
* Disable optimization on armv7 to work around the bug described in
465+
* https://github.com/libuv/libuv/issues/4532
464466
*/
467+
#if defined(__arm__) && (__ARM_ARCH == 7)
468+
__attribute__((optimize("O0")))
469+
#endif
465470
static ssize_t uv__preadv_or_pwritev(int fd,
466471
const struct iovec* bufs,
467472
size_t nbufs,
@@ -1910,6 +1915,9 @@ int uv_fs_ftruncate(uv_loop_t* loop,
19101915
INIT(FTRUNCATE);
19111916
req->file = file;
19121917
req->off = off;
1918+
if (cb != NULL)
1919+
if (uv__iou_fs_ftruncate(loop, req))
1920+
return 0;
19131921
POST;
19141922
}
19151923

src/libuv/src/unix/internal.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ int uv__random_sysctl(void* buf, size_t buflen);
344344
/* io_uring */
345345
#ifdef __linux__
346346
int uv__iou_fs_close(uv_loop_t* loop, uv_fs_t* req);
347+
int uv__iou_fs_ftruncate(uv_loop_t* loop, uv_fs_t* req);
347348
int uv__iou_fs_fsync_or_fdatasync(uv_loop_t* loop,
348349
uv_fs_t* req,
349350
uint32_t fsync_flags);
@@ -362,6 +363,7 @@ int uv__iou_fs_symlink(uv_loop_t* loop, uv_fs_t* req);
362363
int uv__iou_fs_unlink(uv_loop_t* loop, uv_fs_t* req);
363364
#else
364365
#define uv__iou_fs_close(loop, req) 0
366+
#define uv__iou_fs_ftruncate(loop, req) 0
365367
#define uv__iou_fs_fsync_or_fdatasync(loop, req, fsync_flags) 0
366368
#define uv__iou_fs_link(loop, req) 0
367369
#define uv__iou_fs_mkdir(loop, req) 0
@@ -494,7 +496,7 @@ typedef struct {
494496
int uv__get_constrained_cpu(uv__cpu_constraint* constraint);
495497
#endif
496498

497-
#ifdef __sun
499+
#if defined(__sun) && !defined(__illumos__)
498500
#ifdef SO_FLOW_NAME
499501
/* Since it's impossible to detect the Solaris 11.4 version via OS macros,
500502
* so we check the presence of the socket option SO_FLOW_NAME that was first

0 commit comments

Comments
 (0)