update libnng to 1.6.0 pre-release

Author: shikokuchuo

NEWS.md

@@ -2,11 +2,13 @@
 
 #### New Features
 
-* `$context()` method added for creating new contexts from nano Objects with supported protocols (i.e. req, rep, surveyor, respondent).
+* `$context()` method added for creating new contexts from nano Objects using supported protocols (i.e. req, rep, surveyor, respondent).
 * Added convenience auxiliary functions `is_nano()` and `is_aio()`.
 
 #### Updates
 
+* NNG library used on Windows and for building from source updated to 1.6.0 pre-release.
+* Setting 'NANONEXT_TLS=1' now allows the downloaded NNG library to be built against a system mbedtls installation.
 * Deprecated `send_ctx()`, `recv_ctx()` and logging are removed.
 * Internal performance optimisations.
 

configure

@@ -14,7 +14,7 @@ if [ "$NANONEXT_ARM" ]; then
   PKG_LIBS="$PKG_LIBS -latomic"
 fi
 PKG_CFLAGS=""
-LIB_VER="1.5.2"
+LIB_VER="722bf46"
 SYS_LIB=0
 
 # Check for custom locations
@@ -66,23 +66,27 @@ elif [ -d "/usr/local/opt/nng" ]; then
 else
   echo "prior system libnng installation not found"
   echo "preparing to download and build library from source..."
-  curl -L https://github.com/nanomsg/nng/archive/refs/tags/v$LIB_VER.tar.gz -o nng.tar.gz
+  curl -L https://api.github.com/repos/nanomsg/nng/tarball/$LIB_VER -o nng.tar.gz
   gzip -dc nng.tar.gz | tar -xf -
   rm -f nng.tar.gz
-  cd nng-$LIB_VER
+  cd nanomsg-nng-$LIB_VER
   mkdir build
   cd build
   which cmake
   if [ $? -ne 0 ]; then
     export PATH=$PATH:/Applications/CMake.app/Contents/bin
   fi
-  cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..
+  if [ "$NANONEXT_TLS" ]; then
+    cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_ENABLE_TLS=1 -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..
+  else
+    cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..
+  fi
   make
   cd ../..
   mkdir lib
-  mv -f nng-$LIB_VER/build/libnng.a lib
-  mv -f nng-$LIB_VER/include ./
-  rm -rf nng-$LIB_VER
+  mv -f nanomsg-nng-$LIB_VER/build/libnng.a lib
+  mv -f nanomsg-nng-$LIB_VER/include ./
+  rm -rf nanomsg-nng-$LIB_VER
   PKG_CFLAGS="-I`pwd`/include $PKG_CFLAGS"
   PKG_LIBS="-L`pwd`/lib $PKG_LIBS"
 
@@ -119,23 +123,27 @@ if [ $? -ne 0 ]; then
   else
     echo "Attempt to use system libnng failed"
     echo "Preparing to download and build library from source..."
-    curl -L https://github.com/nanomsg/nng/archive/refs/tags/v$LIB_VER.tar.gz -o nng.tar.gz
+    curl -L https://api.github.com/repos/nanomsg/nng/tarball/$LIB_VER -o nng.tar.gz
     gzip -dc nng.tar.gz | tar -xf -
     rm -f nng.tar.gz
-    cd nng-$LIB_VER
+    cd nanomsg-nng-$LIB_VER
     mkdir build
     cd build
     which cmake
     if [ $? -ne 0 ]; then
       export PATH=$PATH:/Applications/CMake.app/Contents/bin
     fi
-    cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..
+    if [ "$NANONEXT_TLS" ]; then
+      cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_ENABLE_TLS=1 -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..
+    else
+      cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..
+    fi
     make
     cd ../..
     mkdir lib
-    mv -f nng-$LIB_VER/build/libnng.a lib
-    mv -f nng-$LIB_VER/include ./
-    rm -rf nng-$LIB_VER
+    mv -f nanomsg-nng-$LIB_VER/build/libnng.a lib
+    mv -f nanomsg-nng-$LIB_VER/include ./
+    rm -rf nanomsg-nng-$LIB_VER
     PKG_CFLAGS="-I`pwd`/include $PKG_CFLAGS"
     PKG_LIBS="-L`pwd`/lib $PKG_LIBS"
     # Test for libnng

src/Makevars.win

@@ -1,4 +1,4 @@
-RWINLIB = ../windows/rwinlib-1.5.2
+RWINLIB = ../windows/rwinlib-1.6.0-pre
 
 PKG_CFLAGS=-DNNG_STATIC_LIB -I${RWINLIB}/include $(C_VISIBILITY)
 PKG_LIBS=-L${RWINLIB}/lib${R_ARCH}${CRT} -lnng -lws2_32

tools/winlibs.R

@@ -1,13 +1,13 @@
 # nanonext - Download precompiled libnng for Windows ---------------------------
 
-if (!file.exists("../windows/rwinlib-1.5.2/include/nng.h")) {
+if (!file.exists("../windows/rwinlib-1.6.0-pre/include/nng.h")) {
 
   if (getRversion() < "3.3.0") setInternet2()
-  download.file("https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.5.2.zip", destfile = "nng-release.zip", quiet = TRUE)
+  download.file("https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.6.0-pre.zip", destfile = "nng-1.6.0-pre.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
-  unzip("nng-release.zip", exdir = "../windows")
-  unlink("nng-release.zip")
+  unzip("nng-1.6.0-pre.zip", exdir = "../windows")
+  unlink("nng-1.6.0-pre.zip")
 
 }
 
-# cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -G "MSYS Makefiles" ..
+# cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -G "MSYS Makefiles" -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..