<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d057c24dd03fb2eed38f84734ee7fa79913ccfeb">https://github.com/macports/macports-ports/commit/d057c24dd03fb2eed38f84734ee7fa79913ccfeb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d057c24dd03 R-fs: update to 1.6.1, fix build on darwin 11–14
</span>d057c24dd03 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d057c24dd03fb2eed38f84734ee7fa79913ccfeb
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Feb 9 02:01:03 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-fs: update to 1.6.1, fix build on darwin 11–14
</span>---
R/R-fs/Portfile | 17 +--
R/R-fs/files/0001-fs-fix-libuv-for-10.7.patch | 142 +++++++++++++--------
.../files/0002-core.c-patch-close_nocancel.patch | 30 ++---
.../files/0003-libuv-link-to-legacysupport.patch | 11 +-
4 files changed, 117 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-fs/Portfile b/R/R-fs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05f3a53fa51..9918341a241 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-fs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-fs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,14 @@ PortSystem 1.0
</span> PortGroup legacysupport 1.1
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# strnlen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen, lutimes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TARGET_OS_* macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 14
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github r-lib fs 1.5.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github r-lib fs 1.6.1 v
</span> revision 0
# libuv version used:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set uv_ver 1.38.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set uv_ver 1.44.2
</span> categories-append sysutils
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,15 +21,15 @@ long_description fs provides a cross-platform, uniform interface to file syst
</span> which brings the benefit of extensive real-world use and rigorous cross-platform testing. \
The name, and some of the interface, is partially inspired by Rust’s fs module.
homepage https://fs.r-lib.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3ea8208774b7a7add9fc229e21b70725cb50dbca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce94478380c8f127e8de5a2363ab2709846bc7fee11c02c75be4087de887a177 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 779924
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e698dbb32f7fba0f7b8efff8a738ea96fc249de1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9491c6293cd6469110ea188cc39d75704937fd3bcbd3ec0853a59c4b146ca25a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1159301
</span>
patch.pre_args -p1
patchfiles 0001-fs-fix-libuv-for-10.7.patch \
0002-core.c-patch-close_nocancel.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> patchfiles-append \
0003-libuv-link-to-legacysupport.patch
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-fs/files/0001-fs-fix-libuv-for-10.7.patch b/R/R-fs/files/0001-fs-fix-libuv-for-10.7.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d09befc730b..ea051f287bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-fs/files/0001-fs-fix-libuv-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-fs/files/0001-fs-fix-libuv-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5e5b9e299adc909eb9a7c5c62130f8bb2ff5125c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c3e209ec3cc55c92e6c5f16a7502d0c9639778a7 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 4 Dec 2022 12:06:35 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 9 Feb 2023 01:37:14 +0700
</span> Subject: [PATCH 1/3] fs: fix libuv for <10.7
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libuv-1.38.1/src/unix/darwin-proctitle.c | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libuv-1.38.1/src/unix/fs.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libuv-1.38.1/src/unix/tty.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libuv-1.38.1/src/unix/udp.c | 6 ++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 9 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libuv-1.44.2/src/unix/darwin-proctitle.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libuv-1.44.2/src/unix/fs.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libuv-1.44.2/src/unix/process.c | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libuv-1.44.2/src/unix/tty.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libuv-1.44.2/src/unix/udp.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 13 insertions(+), 5 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libuv-1.38.1/src/unix/darwin-proctitle.c b/src/libuv-1.38.1/src/unix/darwin-proctitle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libuv-1.44.2/src/unix/darwin-proctitle.c b/src/libuv-1.44.2/src/unix/darwin-proctitle.c
</span> index 5288083e..c1aa0531 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/libuv-1.38.1/src/unix/darwin-proctitle.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/libuv-1.38.1/src/unix/darwin-proctitle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libuv-1.44.2/src/unix/darwin-proctitle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libuv-1.44.2/src/unix/darwin-proctitle.c
</span> @@ -41,9 +41,11 @@ static int uv__pthread_setname_np(const char* name) {
strncpy(namebuf, name, sizeof(namebuf) - 1);
namebuf[sizeof(namebuf) - 1] = '\0';
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,20 +27,20 @@ index 5288083e..c1aa0531 100644
</span>
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libuv-1.38.1/src/unix/fs.c b/src/libuv-1.38.1/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dd08ea54..bc83ca42 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/libuv-1.38.1/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/libuv-1.38.1/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1021,7 +1021,7 @@ static ssize_t uv__fs_lutime(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts[0] = uv__fs_to_timespec(req->atime);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts[1] = uv__fs_to_timespec(req->mtime);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return utimensat(AT_FDCWD, req->path, ts, AT_SYMLINK_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__FreeBSD_kernel__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1272,7 +1272,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libuv-1.44.2/src/unix/fs.c b/src/libuv-1.44.2/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 933c9c0d..aae15f01 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libuv-1.44.2/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libuv-1.44.2/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1061,7 +1061,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD_kernel__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1441,7 +1441,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span> dst->st_blksize = src->st_blksize;
dst->st_blocks = src->st_blocks;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +49,55 @@ index dd08ea54..bc83ca42 100644
</span> dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libuv-1.38.1/src/unix/tty.c b/src/libuv-1.38.1/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6f60abaa..0dc9a485 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/libuv-1.38.1/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/libuv-1.38.1/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@ static int uv__tty_is_slave(const int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libuv-1.44.2/src/unix/process.c b/src/libuv-1.44.2/src/unix/process.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f8415368..2a20b21c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libuv-1.44.2/src/unix/process.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libuv-1.44.2/src/unix/process.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <poll.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <spawn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <paths.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/kauth.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,7 +389,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct uv__posix_spawn_fncs_tag {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*addchdir_np)(const posix_spawn_file_actions_t *, const char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -588,9 +590,11 @@ static int uv__spawn_set_posix_spawn_file_actions(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fd == use_fd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = posix_spawn_file_actions_addinherit_np(actions, fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = posix_spawn_file_actions_adddup2(actions, use_fd, fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(err != ENOSYS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -839,7 +843,7 @@ static int uv__spawn_and_init_child(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int exec_errorno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uv_once(&posix_spawn_init_once, uv__spawn_init_posix_spawn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Special child process spawn case for macOS Big Sur (11.0) onwards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libuv-1.44.2/src/unix/tty.c b/src/libuv-1.44.2/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b4150525..0cb9a938 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libuv-1.44.2/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libuv-1.44.2/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@ static int uv__tty_is_slave(const int fd) {
</span> int dummy;
result = ioctl(fd, TIOCGPTN, &dummy) != 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,30 +106,23 @@ index 6f60abaa..0dc9a485 100644
</span> char dummy[256];
result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libuv-1.38.1/src/unix/udp.c b/src/libuv-1.38.1/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1f39b77a..b82aaa7a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/libuv-1.38.1/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/libuv-1.38.1/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -854,7 +854,8 @@ static int uv__udp_set_membership6(uv_udp_t* handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libuv-1.44.2/src/unix/udp.c b/src/libuv-1.44.2/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4d985b88..ac847544 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libuv-1.44.2/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libuv-1.44.2/src/unix/udp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -938,6 +938,7 @@ static int uv__udp_set_membership6(uv_udp_t* handle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__ANDROID__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__DragonFly__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__QNX__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__GNU__)
</span> static int uv__udp_set_source_membership4(uv_udp_t* handle,
const struct sockaddr_in* multicast_addr,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* interface_addr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1033,7 +1034,8 @@ int uv_udp_set_source_membership(uv_udp_t* handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* interface_addr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* source_addr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uv_membership membership) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1131,6 +1132,7 @@ int uv_udp_set_source_membership(uv_udp_t* handle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__ANDROID__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__DragonFly__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__QNX__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !defined(__GNU__)
</span> int err;
union uv__sockaddr mcast_addr;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- union uv__sockaddr src_addr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.38.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-fs/files/0002-core.c-patch-close_nocancel.patch b/R/R-fs/files/0002-core.c-patch-close_nocancel.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f19f538da0..d1baff174f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-fs/files/0002-core.c-patch-close_nocancel.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-fs/files/0002-core.c-patch-close_nocancel.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f0ad715f11763de5ef47ee401d31d7784178cb66 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 826887a15be3e16a8912ec3863cc38edd0b6a9b3 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 5 Dec 2022 20:33:31 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 9 Feb 2023 01:40:13 +0700
</span> Subject: [PATCH 2/3] core.c: patch close_nocancel
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libuv-1.38.1/src/unix/core.c | 26 +++++++++++++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 19 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libuv-1.44.2/src/unix/core.c | 27 ++++++++++++++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 20 insertions(+), 7 deletions(-)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libuv-1.38.1/src/unix/core.c b/src/libuv-1.38.1/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dbe15069..f1ea4084 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/libuv-1.38.1/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/libuv-1.38.1/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -519,18 +519,30 @@ int uv__accept(int sockfd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libuv-1.44.2/src/unix/core.c b/src/libuv-1.44.2/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 95d14271..d7e13d3d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libuv-1.44.2/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libuv-1.44.2/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -553,18 +553,31 @@ int uv__accept(int sockfd) {
</span> * will unwind the thread when it's in the cancel state. Work around that
* by making the system call directly. Musl libc is unaffected.
*/
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#if defined(__GNUC__)
+# define GCC_VERSION \
+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,14 +42,11 @@ index dbe15069..f1ea4084 100644
</span> extern int close$NOCANCEL$UNIX2003(int);
return close$NOCANCEL$UNIX2003(fd);
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic pop
</span> +# endif
+# if defined(GCC_DIAGNOSTIC_AVAILABLE)
+# pragma GCC diagnostic pop
+# endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.38.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__) && defined(__SANITIZE_THREAD__) && defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long rc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __sanitizer_syscall_pre_close(fd);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-fs/files/0003-libuv-link-to-legacysupport.patch b/R/R-fs/files/0003-libuv-link-to-legacysupport.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9734429d963..c5be9344bf4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-fs/files/0003-libuv-link-to-legacysupport.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-fs/files/0003-libuv-link-to-legacysupport.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6889ef022e21e329bedb0b524a32ad8752f61584 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a617eaf5b848b9afaf87baffafe7cc80576bad1a Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 5 Dec 2022 21:51:18 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 9 Feb 2023 01:41:55 +0700
</span> Subject: [PATCH 3/3] libuv: link to legacysupport
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,18 +8,15 @@ Subject: [PATCH 3/3] libuv: link to legacysupport
</span> 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makevars b/src/Makevars
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a1915d7c..d58b7dda 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dd892c7d..6eb0a5cc 100644
</span> --- a/src/Makevars
+++ b/src/Makevars
@@ -29,7 +29,7 @@ $(SHLIB): $(LIBUV)/.libs/libuv.a
$(LIBUV)/Makefile:
(cd $(LIBUV) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPPFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPPFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet)
</span> + && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPPFLAGS) -I@PREFIX@/include/LegacySupport $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS) -lMacportsLegacySupport" ./configure --quiet)
$(LIBUV)/.libs/libuv.a: $(LIBUV)/Makefile
$(MAKE) --directory=$(LIBUV) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.38.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>