diff --git a/DESCRIPTION b/DESCRIPTION index b056909d1..ef3769021 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: nanonext Type: Package Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library -Version: 1.4.0.9000 +Version: 1.4.0.9001 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is a socket library implementing 'Scalability Protocols', a reliable, high-performance standard for common communications patterns including diff --git a/NEWS.md b/NEWS.md index 380eec33c..cba848e3e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,9 @@ -# nanonext 1.4.0.9000 (development) +# nanonext 1.4.0.9001 (development) #### Updates * Removes partial matching from using `$`, `[[` or `[` on an object inheriting from class 'nano'. +* Updates bundled 'libnng' to v1.10.0 pre-release. # nanonext 1.4.0 diff --git a/README.Rmd b/README.Rmd index 533b7baaf..477ac58ec 100644 --- a/README.Rmd +++ b/README.Rmd @@ -146,7 +146,7 @@ install.packages("nanonext", repos = "https://shikokuchuo.r-universe.dev") #### Linux / Mac / Solaris -Installation from source requires 'libnng' >= v1.6.0 and 'libmbedtls' >= 2.5.0 (suitable installations are automatically detected), or else 'cmake' to compile 'libnng' v1.9.0 and 'libmbedtls' v3.5.2 included within the package sources. +Installation from source requires 'libnng' >= v1.6.0 and 'libmbedtls' >= 2.5.0 (suitable installations are automatically detected), or else 'cmake' to compile 'libnng' v1.10.0 pre-release and 'libmbedtls' v3.5.2 included within the package sources. **It is recommended for optimal performance and stability to let the package automatically compile bundled versions of 'libmbedtls' and 'libnng' during installation.** To ensure the libraries are compiled from source even if system installations are present, set the `NANONEXT_LIBS` environment variable prior to installation e.g. by `Sys.setenv(NANONEXT_LIBS = 1)`. @@ -156,7 +156,7 @@ As system libraries, 'libnng' is available as libnng-dev (deb) or nng-devel (rpm #### Windows -For R >= 4.2 using the 'Rtools42' or newer toolchains, 'libnng' v1.9.0 and 'libmbedtls' v3.5.2 will be automatically compiled from the package sources during installation. +For R >= 4.2 using the 'Rtools42' or newer toolchains, 'libnng' v1.10.0 pre-release and 'libmbedtls' v3.5.2 will be automatically compiled from the package sources during installation. For previous R versions, pre-compiled 'libnng' v1.9.0 and 'libmbedtls' v3.5.2 libraries are downloaded and used for installation instead. diff --git a/README.md b/README.md index fa0cc033c..74741bbac 100644 --- a/README.md +++ b/README.md @@ -178,8 +178,8 @@ install.packages("nanonext", repos = "https://shikokuchuo.r-universe.dev") Installation from source requires ‘libnng’ \>= v1.6.0 and ‘libmbedtls’ \>= 2.5.0 (suitable installations are automatically detected), or else -‘cmake’ to compile ‘libnng’ v1.9.0 and ‘libmbedtls’ v3.5.2 included -within the package sources. +‘cmake’ to compile ‘libnng’ v1.10.0 pre-release and ‘libmbedtls’ v3.5.2 +included within the package sources. **It is recommended for optimal performance and stability to let the package automatically compile bundled versions of ‘libmbedtls’ and @@ -201,9 +201,9 @@ OpenCSW - refer to the ‘cmake’ website for the latest source file.* #### Windows -For R \>= 4.2 using the ‘Rtools42’ or newer toolchains, ‘libnng’ v1.9.0 -and ‘libmbedtls’ v3.5.2 will be automatically compiled from the package -sources during installation. +For R \>= 4.2 using the ‘Rtools42’ or newer toolchains, ‘libnng’ v1.10.0 +pre-release and ‘libmbedtls’ v3.5.2 will be automatically compiled from +the package sources during installation. For previous R versions, pre-compiled ‘libnng’ v1.9.0 and ‘libmbedtls’ v3.5.2 libraries are downloaded and used for installation instead. diff --git a/configure b/configure index 8a3f555a9..16fc9306f 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #!/bin/sh # Library versions -LIB_VER="190" +LIB_VER="7643626" TLS_VER="daca7a3" # Initialise diff --git a/configure.ucrt b/configure.ucrt index e61d3cb77..dd587c253 100755 --- a/configure.ucrt +++ b/configure.ucrt @@ -1,5 +1,5 @@ # Library versions -LIB_VER="190" +LIB_VER="7643626" TLS_VER="daca7a3" tar -xf src/mbedtls-$TLS_VER.tar.xz diff --git a/src/nng-190.tar.xz b/src/nng-190.tar.xz deleted file mode 100644 index b5af9da2b..000000000 Binary files a/src/nng-190.tar.xz and /dev/null differ diff --git a/src/nng-7643626.tar.xz b/src/nng-7643626.tar.xz new file mode 100644 index 000000000..cc3fa0867 Binary files /dev/null and b/src/nng-7643626.tar.xz differ