upgrade to libuv 1.17

Author: Li ZHOU

.travis.yml

@@ -4,7 +4,7 @@ compiler:
   - clang   
 env:
     global:
-        - LIBUV_VER=1.16.0
+        - LIBUV_VER=1.17.0
         - WOLFSSL_VER=3.11.0-stable  
         - OPENSSL_VER=1.1.0
 before_install: 

CMakeLists.txt

@@ -35,11 +35,11 @@ project(mysocks)
 find_package(OpenSSL)
 IF (OPENSSL_FOUND)
 IF (OPENSSL_VERSION VERSION_LESS 1.1)
-include_directories(gnulib/lib libmd5-rfc libuv-1.16.0/include OpenSSL_1_1_0/include wolfssl-3.11.0-stable)
+include_directories(gnulib/lib libmd5-rfc libuv-1.17.0/include OpenSSL_1_1_0/include wolfssl-3.11.0-stable)
 ELSE()
-include_directories(gnulib/lib libmd5-rfc libuv-1.16.0/include ${OPENSSL_INCLUDE_DIR} wolfssl-3.11.0-stable)
+include_directories(gnulib/lib libmd5-rfc libuv-1.17.0/include ${OPENSSL_INCLUDE_DIR} wolfssl-3.11.0-stable)
 ENDIF()
-include_directories(gnulib/lib libmd5-rfc libuv-1.16.0/include OpenSSL_1_1_0/in
+include_directories(gnulib/lib libmd5-rfc libuv-1.17.0/include OpenSSL_1_1_0/in
 clude wolfssl-3.11.0-stable)
 ENDIF()
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -52,7 +52,7 @@ SET(CMAKE_C_FLAGS_RELEASE "$ENV{CFLAGS}  -DNDEBUG")
 IF (MSVC)
 set (CMAKE_C_FLAGS "-D_WIN32_WINNT=0x0600 -D_GNU_SOURCE -DHAVE_UNISTD_H=0 -DWIN32_LEAN_AND_MEAN ${CMAKE_C_FLAGS}")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
-link_directories( libuv-1.16.0/$(ConfigurationName)/lib OpenSSL_1_1_0 wolfssl-3.11.0-stable/Debug)
+link_directories( libuv-1.17.0/$(ConfigurationName)/lib OpenSSL_1_1_0 wolfssl-3.11.0-stable/Debug)
 add_executable(ssclient gnulib/lib/arcfour.c libmd5-rfc/md5.c src/client.c src/cipher.c src/getopt.c src/main.c src/s5.c src/server.c  src/util.c)
 target_link_libraries(ssclient iphlpapi psapi userenv libuv ws2_32)
 add_executable(ssclient-openssl src/client.c src/cipher-openssl.c src/getopt.c src/main.c src/s5.c src/server.c  src/util.c)
@@ -80,7 +80,7 @@ ELSE()
 SET(CMAKE_C_FLAGS "-DHAVE_UNISTD_H=1 ${CMAKE_C_FLAGS}")
 SET(CMAKE_C_FLAGS_DEBUG "-DHAVE_UNISTD_H=1 ${CMAKE_C_FLAGS_DEBUG}")
 SET(CMAKE_C_FLAGS_RELEASE "-DHAVE_UNISTD_H=1 ${CMAKE_C_FLAGS_RELEASE}")
-link_directories(libuv-1.16.0/.libs OpenSSL_1_1_0 wolfssl-3.11.0-stable/src/.libs)
+link_directories(libuv-1.17.0/.libs OpenSSL_1_1_0 wolfssl-3.11.0-stable/src/.libs)
 add_executable(ssclient gnulib/lib/arcfour.c libmd5-rfc/md5.c src/client.c src/cipher.c src/main.c src/s5.c src/server.c  src/util.c)
 target_link_libraries(ssclient uv )
 add_executable(ssclient-openssl src/client.c src/cipher-openssl.c src/main.c src/s5.c src/server.c  src/util.c)

Dockerfile

@@ -6,7 +6,7 @@ FROM alpine:3.3
 MAINTAINER lzh <[email protected]>
 
 ARG MYSOCKS_URL=https://github.com/zhou0/mysocks/archive/0.5.10.tar.gz
-ARG LIBUV_URL=https://github.com/libuv/libuv/archive/v1.16.0.tar.gz 
+ARG LIBUV_URL=https://github.com/libuv/libuv/archive/v1.17.0.tar.gz 
 ARG WOLFSSL_URL=https://github.com/wolfSSL/wolfssl/archive/v3.11.0-stable.tar.gz
 RUN set -ex && \
     apk add --no-cache --virtual .build-deps \
@@ -21,7 +21,7 @@ RUN set -ex && \
                                 openssl-dev \
                                 tar \
                                 && \
-    curl -sSL $LIBUV_URL | tar xz && cd libuv-1.16.0 && \
+    curl -sSL $LIBUV_URL | tar xz && cd libuv-1.17.0 && \
 ./autogen.sh && ./configure --prefix=/usr --disable-static && make && \
 make install && cd .. && \
     curl -sSL $WOLFSSL_URL | tar xz && cd wolfssl-3.11.0-stable && \
@@ -49,4 +49,4 @@ build/release && cd build/release && \
     cd ../../.. && \
     apk add --no-cache --virtual .run-deps $runDeps && \
     apk del .build-deps && \
-    rm -fr libuv-1.16.0 && rm -fr wolfssl-3.11.0-stable && rm -fr mysocks-0.5.10
+    rm -fr libuv-1.17.0 && rm -fr wolfssl-3.11.0-stable && rm -fr mysocks-0.5.10

github.com/libuv/libuv/archive/v1.17.0.tar.gz

@@ -26,6 +26,7 @@ Marc Schlaich <[email protected]> <[email protected]>
 Michael <[email protected]>
 Michael Neumann <[email protected]> <[email protected]>
 Nicholas Vavilov <[email protected]>
+Nick Logan <[email protected]> <[email protected]>
 Rasmus Christian Pedersen <[email protected]>
 Rasmus Christian Pedersen <[email protected]> <[email protected]>
 Robert Mustacchi <[email protected]> <[email protected]>

libuv-1.16.0/.github/ISSUE_TEMPLATE.md libuv-1.17.0/.github/ISSUE_TEMPLATE.mdlibuv-1.16.0/.github/ISSUE_TEMPLATE.md renamed to libuv-1.17.0/.github/ISSUE_TEMPLATE.md

@@ -318,3 +318,5 @@ Scott Parker <[email protected]>
 Wade Brainerd <[email protected]>
 rayrase <[email protected]>
 Pekka Nikander <[email protected]>
+Ed Schouten <[email protected]>
+Xu Meng <[email protected]>

libuv-1.16.0/.gitignore libuv-1.17.0/.gitignorelibuv-1.16.0/.gitignore renamed to libuv-1.17.0/.gitignore

@@ -1,4 +1,48 @@
-2017.11.07, Version 1.16.0 (Stable)
+2017.11.25, Version 1.17.0 (Stable)
+
+Changes since version 1.16.1:
+
+* unix: avoid malloc() call in uv_spawn() (Ben Noordhuis)
+
+* doc: clarify the description of uv_loop_alive() (Ed Schouten)
+
+* win: map UV_FS_O_EXLOCK to a share mode of 0 (Joran Dirk Greef)
+
+* win: fix build on case-sensitive file systems (Ben Noordhuis)
+
+* win: fix test runner build with mingw64 (Ben Noordhuis)
+
+* win: remove unused variable in test/test-fs.c (Ben Noordhuis)
+
+* zos: add strnlen() implementation (jBarz)
+
+* unix: keep track of bound sockets sent via spawn (jBarz)
+
+* unix,win: wait for threads to start (Ben Noordhuis)
+
+* test: add threadpool init/teardown test (Bartosz Sosnowski)
+
+* test: avoid malloc() in threadpool test (Ben Noordhuis)
+
+* test: lower number of tasks in threadpool test (Ben Noordhuis)
+
+* win: issue memory barrier in uv_thread_join() (Ben Noordhuis)
+
+* ibmi: add support for new platform (Xu Meng)
+
+* test: fix test-spawn compilation (Bartosz Sosnowski)
+
+
+2017.11.11, Version 1.16.1 (Stable), 4056fbe46493ef87237e307e0025e551db875e13
+
+Changes since version 1.16.0:
+
+* unix: move net/if.h include (cjihrig)
+
+* win: fix undeclared NDIS_IF_MAX_STRING_SIZE (Nick Logan)
+
+
+2017.11.07, Version 1.16.0 (Stable), d68779f0ea742918f653b9c20237460271c39aeb
 
 Changes since version 1.15.0: