diff --git a/.circleci/config.yml b/.circleci/config.yml index 862d86c0..27dfb26b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,6 +41,7 @@ jobs: run-on-windows: executor: win/default steps: + - run: choco install cmake -y --installargs 'ADD_CMAKE_TO_PATH=System' - checkout - nvminstall - deps diff --git a/CHANGELOG.md b/CHANGELOG.md index 60cf0246..a17fe279 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ +#### v 5.5.0 (2022-10-17) +* fix: Remove the OpenSSSL FIPS_mode check for Linux, Mac OS X and Windows. + + feat: Rebuild the prebuilds for Mac OS X and Windows, using Node.js 16.17.0. + + feat: Remove the prebuilds for Node.js 14. + + Pull request [321](https://github.com/yfinkelstein/node-zookeeper/pull/321) by @davidvujic +* fix: remove code using FIPS_mode which is not available on all distros. Pull request [318](https://github.com/yfinkelstein/node-zookeeper/pull/319) by @dreusel + #### v 5.4.0 (2022-04-18) -* feat: starting the zookeeper client in a Node.js Worker thread Pull request [310](https://github.com/yfinkelstein/node-zookeeper/pull/310) by @deepcoldy +* feat: starting the zookeeper client in a Node.js Worker thread. Pull request [310](https://github.com/yfinkelstein/node-zookeeper/pull/310) by @deepcoldy #### v 5.3.2 (2022-02-16) * fix: handle normalize path with slashes in all platforms. Pull request [305](https://github.com/yfinkelstein/node-zookeeper/pull/305) by @hufeng diff --git a/package.json b/package.json index 1ea71dd2..788376ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zookeeper", "description": "apache zookeeper client (zookeeper async API v3.4.x - v3.7.x)", - "version": "5.4.0", + "version": "5.5.0", "author": "Yuri Finkelstein ", "license": "MIT", "contributors": [ diff --git a/prebuilds/README.md b/prebuilds/README.md index 918b1a88..4313b97a 100644 --- a/prebuilds/README.md +++ b/prebuilds/README.md @@ -8,18 +8,16 @@ Each platform has prebuilds for Node.js 12 and 14. Create prebuilds for Mac OS X: ```bash -npx prebuildify --arch x64 --platform darwin --target 14.15.4 -npx prebuildify --arch x64 --platform darwin --target 16.13.1 +npx prebuildify --arch x64 --platform darwin --target 16.17.0 ``` Prebuilds for Mac OS X with the M1 processor: ```bash -npx prebuildify --arch arm64 --platform darwin --target 16.13.1 +npx prebuildify --arch arm64 --platform darwin --target 16.17.0 ``` Create prebuilds for Windows 10: ```bash -npx prebuildify --arch x64 --platform win32 --target 14.15.4 -npx prebuildify --arch x64 --platform win32 --target 16.13.1 +npx prebuildify --arch x64 --platform win32 --target 16.17.0 ``` diff --git a/prebuilds/darwin-arm64/node.abi93.node b/prebuilds/darwin-arm64/node.abi93.node index 77181a18..b819d4f7 100755 Binary files a/prebuilds/darwin-arm64/node.abi93.node and b/prebuilds/darwin-arm64/node.abi93.node differ diff --git a/prebuilds/darwin-x64/node.abi83.node b/prebuilds/darwin-x64/node.abi83.node deleted file mode 100755 index e8467b3e..00000000 Binary files a/prebuilds/darwin-x64/node.abi83.node and /dev/null differ diff --git a/prebuilds/darwin-x64/node.abi93.node b/prebuilds/darwin-x64/node.abi93.node index 352df4e4..33d1e734 100755 Binary files a/prebuilds/darwin-x64/node.abi93.node and b/prebuilds/darwin-x64/node.abi93.node differ diff --git a/prebuilds/win32-x64/node.abi83.node b/prebuilds/win32-x64/node.abi83.node deleted file mode 100644 index 0ca6ae84..00000000 Binary files a/prebuilds/win32-x64/node.abi83.node and /dev/null differ diff --git a/prebuilds/win32-x64/node.abi93.node b/prebuilds/win32-x64/node.abi93.node index 8d2395f0..7fdd79b2 100644 Binary files a/prebuilds/win32-x64/node.abi93.node and b/prebuilds/win32-x64/node.abi93.node differ diff --git a/scripts/env.js b/scripts/env.js index 8aa3820b..1c1ee2ea 100644 --- a/scripts/env.js +++ b/scripts/env.js @@ -34,7 +34,6 @@ const variables = { sourceFolder: `${rootFolder}/deps/zookeeper-client-c`, downloadedFileName, isWindows, - isLinux: process.platform === 'linux', isVerbose: !!process.env.ZK_INSTALL_VERBOSE, }; diff --git a/scripts/prepublish.js b/scripts/prepublish.js index beddff86..4ac12399 100644 --- a/scripts/prepublish.js +++ b/scripts/prepublish.js @@ -18,7 +18,9 @@ function applyPatches() { shell.sed('-i', '#include "zookeeper_log.h"', '#include "zookeeper_log.h"\n#include "winport.h"\n', `${destination}/zk_log.c`); shell.sed('-i', '#include "zookeeper.h"', '#include "winport.h"\n#include "zookeeper.h"\n', `${destination}/zk_adaptor.h`); shell.sed('-i', '#include "zk_adaptor.h"', '#include "zk_adaptor.h"\n#include "winport.h"\n', `${destination}/zookeeper.c`); - } else if (env.isLinux) { + shell.sed('-i', /(FIPS_mode\(\) == 0)/, '0 == 0', `${destination}/zookeeper.c`); + shell.sed('-i', /(FIPS mode is OFF)/, 'Disabled the FIPS check', `${destination}/zookeeper.c`); + } else { shell.exec(`patch -d ${env.rootFolder} -p0 --forward < ${env.workFolder}/no-fipsmode.patch`); } }