Merge pull request #772 from onekey-sec/751-update-e2fsprogs

chore(deps): upgrade e2fsprogs to v1.47.0-3.ok2.
onekey-sec · Feb 15, 2024 · d013f69 · d013f69
2 parents 2e6a7ae + e5d16dd
commit d013f69
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/docs/installation.md b/docs/installation.md
@@ -138,10 +138,13 @@ There is a handy `install-deps.sh` script included in the repository and PyPI pa
 
 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.ok2.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok2/e2fsprogs_1.47.0-3.ok2_$(dpkg --print-architecture).deb"
+        curl -L -o libext2fs2_1.47.0-3.ok2.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok2/libext2fs2_1.47.0-3.ok2_$(dpkg --print-architecture).deb"
+        curl -L -o libss2_1.47.0-3.ok2.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok2/libss2_1.47.0-3.ok2_$(dpkg --print-architecture).deb"
+        sudo dpkg -i libext2fs2_1.47.0-3.ok2.deb libss2_1.47.0-3.ok2.deb e2fsprogs_1.47.0-3.ok2.deb
+        rm -f libext2fs2_1.47.0-3.ok2.deb libss2_1.47.0-3.ok2.deb e2fsprogs_1.47.0-3.ok2.de
 
-        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
+   In case you already had e2fsprogs installed, you might need to upgrade some more packages from e2fsprogs.
+   You can get the names of the installed e2fsprogs binary packages this way:
+
+        sudo dpkg-query -W -f '${db:Status-Abbrev}\t${source:Package}\t${Package}\n' | grep '^i...e2fsprogs' | cut -f3
diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json
@@ -13,11 +13,11 @@
             "name": null,
             "owner": "onekey-sec",
             "repo": "e2fsprogs",
-            "rev": "v1.47.0-3.ok1",
-            "sha256": "sha256-lGv1l9/guOEskvIE6DIsg/nRiDTvORZI0h7n623/fgU=",
+            "rev": "v1.47.0-3.ok2",
+            "sha256": "sha256-LvPWZlrH/P4PHupC+e+R1v9C41FBBqKp3cRaqHxkNTw=",
             "type": "github"
         },
-        "version": "v1.47.0-3.ok1"
+        "version": "v1.47.0-3.ok2"
     },
     "jefferson": {
         "cargoLocks": null,
@@ -48,11 +48,11 @@
             "name": null,
             "owner": "lief-project",
             "repo": "LIEF",
-            "rev": "0.13.2",
-            "sha256": "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg=",
+            "rev": "0.14.1",
+            "sha256": "sha256-briOqt/S3YUl6Aon5sKXhutL8VFUSgnK2Wy4UKnHE20=",
             "type": "github"
         },
-        "version": "0.13.2"
+        "version": "0.14.1"
     },
     "pyfatfs": {
         "cargoLocks": null,
@@ -99,4 +99,4 @@
         },
         "version": "0.8.9"
     }
-}
+}
diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix
@@ -3,13 +3,13 @@
 {
   e2fsprogs = {
     pname = "e2fsprogs";
-    version = "v1.47.0-3.ok1";
+    version = "v1.47.0-3.ok2";
     src = fetchFromGitHub {
       owner = "onekey-sec";
       repo = "e2fsprogs";
-      rev = "v1.47.0-3.ok1";
+      rev = "v1.47.0-3.ok2";
       fetchSubmodules = false;
-      sha256 = "sha256-lGv1l9/guOEskvIE6DIsg/nRiDTvORZI0h7n623/fgU=";
+      sha256 = "sha256-LvPWZlrH/P4PHupC+e+R1v9C41FBBqKp3cRaqHxkNTw=";
     };
   };
   jefferson = {

diff --git a/unblob/install-deps.sh b/unblob/install-deps.sh
@@ -18,10 +18,8 @@ curl -L -o sasquatch_1.0.deb "https://github.com/onekey-sec/sasquatch/releases/d
 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
+curl -L -o libext2fs2_1.47.0-3.ok2.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok2/libext2fs2_1.47.0-3.ok2_$(dpkg --print-architecture).deb"
+curl -L -o e2fsprogs_1.47.0-3.ok2.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok2/e2fsprogs_1.47.0-3.ok2_$(dpkg --print-architecture).deb"
+curl -L -o libss2_1.47.0-3.ok2.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok2/libss2_1.47.0-3.ok2_$(dpkg --print-architecture).deb"
+dpkg -i libext2fs2_1.47.0-3.ok2.deb libss2_1.47.0-3.ok2.deb e2fsprogs_1.47.0-3.ok2.deb
+rm -f libext2fs2_1.47.0-3.ok2.deb libss2_1.47.0-3.ok2.deb e2fsprogs_1.47.0-3.ok2.deb