get it building with zbox fork

.circleci/config.yml

@@ -34,22 +34,6 @@ save_cargo_cache: &save_cargo_cache
 
 version: 2
 jobs:
-  build_dependencies:
-    docker:
-      - image: circleci/rust:latest
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-lint-{{ arch }}-{{ checksum "scripts/install_lib_sodium.sh" }}
-      - run:
-          name: install sodium
-          command: scripts/install_lib_sodium.sh
-      - save_cache:
-          paths:
-            - /usr/local/lib
-          key: v1-lint-{{ arch }}-{{ checksum "scripts/install_lib_sodium.sh" }}
-
   # Job used for testing
   lint:
     docker:
@@ -62,7 +46,6 @@ jobs:
             - v6-lint-{{ arch }}-{{ checksum "Cargo.lock" }}
             - v1-lint-{{ arch }}-{{ checksum "scripts/install_lib_sodium.sh" }}
       - <<: *run_install_dependencies
-#      - <<: *run_install_sodium
       - run:
           name: Install lint deps
           command: |
@@ -408,10 +391,7 @@ workflows:
   version: 2
   main:
     jobs:
-      - build_dependencies
-      - lint:
-          requires:
-            - build_dependencies
+      - lint
       - test:
           filters:
             branches:

lib/emscripten/src/syscalls/unix/vfs.rs

@@ -779,7 +779,7 @@ pub fn ___syscall195(ctx: &mut Ctx, _which: c_int, mut varargs: VarArgs) -> c_in
     let ret = match &mut emscripten_data.vfs {
         Some(vfs) => {
             let metadata = vfs.vfs.get_path_metadata(&path).unwrap();
-            let len = metadata.len();
+            let len = metadata.content_len();
             unsafe {
                 let mut stat: stat = std::mem::zeroed();
                 stat.st_size = len as _;

lib/runtime-abi/Cargo.toml

@@ -14,7 +14,11 @@ failure = "0.1"
 tar = "0.4"
 wasmparser = "0.23.0"
 zstd = "0.4"
-zbox = "0.6.1"
+
+[dependencies.zbox]
+git = "https://github.com/wasmerio/zbox"
+branch = "bundle-libsodium"
+features = ["libsodium-bundled"]
 
 [dev-dependencies]
 tempdir = "0.3"

lib/runtime-abi/src/vfs/virtual_file.rs

@@ -33,7 +33,7 @@ impl FileLike for VirtualFile {
         self.zbox_file
             .metadata()
             .map(|m| Metadata {
-                len: m.len(),
+                len: m.content_len(),
                 is_file: m.is_file(),
             })
             .map_err(|e: zbox::Error| e.into())