Merge pull request #321 from DavidVujic/remove_fips_mode_check_for_al…

…l_envs

Remove the OpenSSSL FIPS_mode check for Linux, Mac OS X and Windows

.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

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

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 <yurif2003@yahoo.com>",
     "license": "MIT",
     "contributors": [

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
 ```

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,
 };
 

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`);
     }
 }