Merge pull request #675 from onekey-sec/fix-e2fsprogs

move e2fsprogs dependency to onekey maintained fork.
onekey-sec · Nov 13, 2023 · d68c9d6 · d68c9d6
2 parents 14db866 + 8394a7f
commit d68c9d6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/docs/installation.md b/docs/installation.md
@@ -132,11 +132,16 @@ There is a handy `install-deps.sh` script included in the repository and PyPI pa
 
 2.  If you need **squashfs support**, install sasquatch:
 
-        curl -L -o sasquatch_1.0_amd64.deb https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v4.5.1-4/sasquatch_1.0_amd64.deb
-        sudo dpkg -i sasquatch_1.0_amd64.deb
-        rm sasquatch_1.0_amd64.deb
-3. If you need **squashfs(arm64) support**, install sasquatch(arm64):
-
-       curl -L -o sasquatch_1.0_arm64.deb https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v4.5.1-4/sasquatch_1.0_arm64.deb
-       sudo dpkg -i sasquatch_1.0_arm64.deb
-       rm sasquatch_1.0_arm64.deb
+        curl -L -o sasquatch_1.0.deb "https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v4.5.1-4/sasquatch_1.0_$(dpkg --print-architecture).deb"
+        sudo dpkg -i sasquatch_1.0.deb
+        rm sasquatch_1.0.deb
+
+4. We maintain a fork of e2fsprogs based on Debian upstream, with some security fixes. You can install it this way:
+
+        curl -L -o libext2fs2_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/libext2fs2_1.47.0-3.ok1_$(dpkg --print-architecture).deb"
+        dpkg -i libext2fs2_1.47.0-3.ok1.deb
+        rm -f libext2fs2_1.47.0-3.ok1.deb
+
+        curl -L -o e2fsprogs_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/e2fsprogs_1.47.0-3.ok1_$(dpkg --print-architecture).deb"
+        dpkg -i e2fsprogs_1.47.0-3.ok1.deb
+        rm -f e2fsprogs_1.47.0-3.ok1.deb
diff --git a/overlay.nix b/overlay.nix
@@ -9,6 +9,12 @@ inputs: final: prev:
     (super: {
       pname = "e2fsprogs-nofortify";
       hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
+
+      version = "1.47.0-3.ok1";
+      src = prev.fetchurl {
+        url = "https://github.com/onekey-sec/e2fsprogs/archive/refs/tags/v1.47.0-3.ok1.tar.gz";
+        hash = "sha256-fsLUySjAdgnRp5m405a4Egso+LXNLxR9Y7WHt8qAvFM=";
+      };
     });
 
   # Own package updated independently of nixpkgs

diff --git a/unblob/install-deps.sh b/unblob/install-deps.sh
@@ -15,6 +15,14 @@ apt-get install --no-install-recommends -y \
     libmagic1 \
     zstd
 
-curl -L -o sasquatch_1.0_amd64.deb https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v4.5.1-4/sasquatch_1.0_amd64.deb
-dpkg -i sasquatch_1.0_amd64.deb
-rm -f sasquatch_1.0_amd64.deb
+curl -L -o sasquatch_1.0.deb "https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v4.5.1-4/sasquatch_1.0_$(dpkg --print-architecture).deb"
+dpkg -i sasquatch_1.0.deb
+rm -f sasquatch_1.0.deb
+
+curl -L -o libext2fs2_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/libext2fs2_1.47.0-3.ok1_$(dpkg --print-architecture).deb"
+dpkg -i libext2fs2_1.47.0-3.ok1.deb
+rm -f libext2fs2_1.47.0-3.ok1.deb
+
+curl -L -o e2fsprogs_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/e2fsprogs_1.47.0-3.ok1_$(dpkg --print-architecture).deb"
+dpkg -i e2fsprogs_1.47.0-3.ok1.deb
+rm -f e2fsprogs_1.47.0-3.ok1.deb