<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1735bb1417aa634f94d7127c4c127f3d5f50e8e9">https://github.com/macports/macports-ports/commit/1735bb1417aa634f94d7127c4c127f3d5f50e8e9</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 1735bb1 libuv: bump older systems to 1.29.1
</span>1735bb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1735bb1417aa634f94d7127c4c127f3d5f50e8e9
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue May 21 21:00:49 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> libuv: bump older systems to 1.29.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add patch for older gcc versions to not error on pragmas
</span><span style='display:block; white-space:pre;color:#404040;'> add patch for 32bit code to link correctly
</span><span style='display:block; white-space:pre;color:#404040;'> add bypass path for Tiger, that doesn't seem to have
</span><span style='display:block; white-space:pre;color:#404040;'> a non-cancellable close function available
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/58507
</span>---
devel/libuv/Portfile | 30 ++++----
.../files/patch-kqueue-on-older-mac-systems.diff | 87 ----------------------
.../patch-libuv-unix-core-close-nocancel.diff | 48 ++++++++++++
3 files changed, 63 insertions(+), 102 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/Portfile b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e3d32e..8f6a4fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,11 @@ platform darwin {
</span>
# which port version depends on which OS version
if { ${os.major} == 8 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # peg at version 1.28.0 with patches for 10.4 Tiger, updated occasionally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 1.28.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 021dfc555baec1572795c06b502228379146e580 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a115f752fb8dd2f24f8ad5a3c1a975260b550c0fc3ef525c449eb382f182358 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1219212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # peg at version 1.29.1 with patches for 10.4 Tiger, updated occasionally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 1.29.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5f287d080d93fbc98d0cf8657fb25410d2c96403 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 401f991c08df38e4239b08ea762e5de53de738952d44689a7f2c63dc95af3856 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1224239
</span> revision 0
maintainers-prepend {kencu @kencu}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ platform darwin {
</span> configure.cppflags-append -D__OPENTRANSPORTPROVIDERS__
# this patch has been sent upstream (same as Leopard/SnowLeopard)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-kqueue-on-older-mac-systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libuv-unix-core-close-nocancel.diff
</span>
# Tiger unified patch
patchfiles-append patch-libuv-1-23-2-tiger.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,20 +55,18 @@ platform darwin {
</span> depends_lib
}
} elseif { ${os.major} == 9 || ${os.major} == 10 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # peg at version 1.28.0 for 10.5 Leopard and 10.6 Snow Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # peg at version 1.29.1, updated occasionally
</span> # see https://trac.macports.org/ticket/57926
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 1.28.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 021dfc555baec1572795c06b502228379146e580 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a115f752fb8dd2f24f8ad5a3c1a975260b550c0fc3ef525c449eb382f182358 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1219212
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 1.29.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5f287d080d93fbc98d0cf8657fb25410d2c96403 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 401f991c08df38e4239b08ea762e5de53de738952d44689a7f2c63dc95af3856 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1224239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
# needed for the tests to compile correctly on Leopard
configure.cppflags-append -D__DARWIN_64_BIT_INO_T
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # this patch has been sent upstream (same as Tiger)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-kqueue-on-older-mac-systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libuv-unix-core-close-nocancel.diff
</span>
# deprecate the devel port, if installed
# can be removed after 20201010
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +92,8 @@ platform darwin {
</span>
conflicts libuv-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport libuv-devel {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-kqueue-on-older-mac-systems.diff b/devel/libuv/files/patch-kqueue-on-older-mac-systems.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1f0e8ab..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/files/patch-kqueue-on-older-mac-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,87 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f806f2b3e91907ea1cc63ce8b73fc4f29282e5be Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 3 May 2019 15:02:33 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] macOS: uv_fs_event - fall back to kqueue on older systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-newer macOS systems 10.7+ use fsevents() for the fs_event backend but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-older macOS systems don't have full functionality for this in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macOS fsevents() API. Fall back to kqueue for these systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/unix/fsevents.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/unix/kqueue.c | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 8 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/unix/fsevents.c src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c430562b37..ddacda31fe 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,9 +21,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "uv.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "internal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* macOS prior to 10.7 doesn't provide the full FSEvents API so use kqueue */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int uv__fsevents_init(uv_fs_event_t* handle) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/unix/kqueue.c src/unix/kqueue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 092005161f..c04e7a485c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unix/kqueue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unix/kqueue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@ int uv__kqueue_init(uv_loop_t* loop) {
</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(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int uv__has_forked_with_cfrunloop;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@ int uv__io_fork(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (loop->cf_state != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We cannot start another CFRunloop and/or thread in the child
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process; CF aborts if you try or if you try to touch the thread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,7 @@ int uv__io_fork(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uv__free(loop->cf_state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loop->cf_state = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* #if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return err;
</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;'>-@@ -458,7 +458,7 @@ int uv_fs_event_start(uv_fs_event_t* handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (uv__is_active(handle))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Nullify field to perform checks later */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handle->cf_cb = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handle->realpath = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -482,7 +482,7 @@ int uv_fs_event_start(uv_fs_event_t* handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* defined(__APPLE__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* #if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* TODO open asynchronously - but how do we report back errors? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd = open(path, O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -513,7 +513,7 @@ int uv_fs_event_stop(uv_fs_event_t* handle) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uv__handle_stop(handle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!uv__has_forked_with_cfrunloop)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = uv__fsevents_close(handle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff b/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..24e461f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/unix/core.c.orig 2019-05-22 12:46:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/unix/core.c 2019-05-22 12:50:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,13 +522,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * will unwind the thread when it's in the cancel state. Work around that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * by making the system call directly. Musl libc is unaffected.
</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(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GCC_VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__clang__) || (GCC_VERSION >= 40500)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* gcc diagnostic pragmas available */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GCC_DIAGNOSTIC_AVAILABLE
</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;'>+ int uv__close_nocancel(int fd) {
</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_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return close$NOCANCEL$UNIX2003(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,7 +555,6 @@
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int uv__close_nocheckstdio(int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int saved_errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rc;
</span></pre><pre style='margin:0'>
</pre>