From b18f89b434d4e8ce98539984799b240a127b4b7c Mon Sep 17 00:00:00 2001 From: Caner Karaca <37447503+CanerKaraca23@users.noreply.github.com> Date: Thu, 13 Feb 2025 02:54:36 +0300 Subject: [PATCH] Updates (#151) * Update * Fix --- .github/workflows/build-kernel-a12.yml | 2 + .github/workflows/build-kernel-a14.yml | 3 + .github/workflows/build-kernel-a15.yml | 3 + .github/workflows/build-lkm.yml | 12 +-- .github/workflows/build-manager-ci.yml | 43 +++-------- .github/workflows/build-manager.yml | 43 +++-------- .github/workflows/clippy.yml | 27 +++++-- .github/workflows/ksud.yml | 79 ++++++++++++++++++++ .github/workflows/ksud_magic.yml | 61 ---------------- .github/workflows/ksud_overlayfs.yml | 61 ---------------- .github/workflows/release.yml | 3 +- manager/build.gradle.kts | 2 +- userspace/ksud_magic/Cargo.lock | 85 +++++++++++++--------- userspace/ksud_magic/Cargo.toml | 2 +- userspace/ksud_magic/src/assets.rs | 7 -- userspace/ksud_magic/src/boot_patch.rs | 5 +- userspace/ksud_overlayfs/Cargo.lock | 85 +++++++++++++--------- userspace/ksud_overlayfs/Cargo.toml | 2 +- userspace/ksud_overlayfs/src/assets.rs | 7 -- userspace/ksud_overlayfs/src/boot_patch.rs | 5 +- 20 files changed, 247 insertions(+), 290 deletions(-) create mode 100644 .github/workflows/ksud.yml delete mode 100644 .github/workflows/ksud_magic.yml delete mode 100644 .github/workflows/ksud_overlayfs.yml diff --git a/.github/workflows/build-kernel-a12.yml b/.github/workflows/build-kernel-a12.yml index 4b5483cc..eb276b79 100644 --- a/.github/workflows/build-kernel-a12.yml +++ b/.github/workflows/build-kernel-a12.yml @@ -27,6 +27,8 @@ jobs: os_patch_level: 2024-08 - sub_level: 226 os_patch_level: 2024-11 + - sub_level: 233 + os_patch_level: 2025-02 uses: ./.github/workflows/gki-kernel.yml secrets: inherit with: diff --git a/.github/workflows/build-kernel-a14.yml b/.github/workflows/build-kernel-a14.yml index 70be7752..8dfe027b 100644 --- a/.github/workflows/build-kernel-a14.yml +++ b/.github/workflows/build-kernel-a14.yml @@ -69,6 +69,9 @@ jobs: - version: "6.1" sub_level: 118 os_patch_level: 2025-01 + - version: "6.1" + sub_level: 124 + os_patch_level: 2025-02 uses: ./.github/workflows/gki-kernel.yml secrets: inherit with: diff --git a/.github/workflows/build-kernel-a15.yml b/.github/workflows/build-kernel-a15.yml index 27acb3c3..b97c78fc 100644 --- a/.github/workflows/build-kernel-a15.yml +++ b/.github/workflows/build-kernel-a15.yml @@ -39,6 +39,9 @@ jobs: - version: "6.6" sub_level: 58 os_patch_level: 2025-01 + - version: "6.6" + sub_level: 66 + os_patch_level: 2025-02 uses: ./.github/workflows/gki-kernel.yml secrets: inherit with: diff --git a/.github/workflows/build-lkm.yml b/.github/workflows/build-lkm.yml index 2d8122a3..46735284 100644 --- a/.github/workflows/build-lkm.yml +++ b/.github/workflows/build-lkm.yml @@ -15,8 +15,8 @@ jobs: matrix: include: - version: "android12-5.10" - sub_level: 226 - os_patch_level: 2024-11 + sub_level: 233 + os_patch_level: 2025-02 - version: "android13-5.10" sub_level: 228 os_patch_level: 2025-01 @@ -27,11 +27,11 @@ jobs: sub_level: 170 os_patch_level: 2025-01 - version: "android14-6.1" - sub_level: 118 - os_patch_level: 2025-01 + sub_level: 124 + os_patch_level: 2025-02 - version: "android15-6.6" - sub_level: 58 - os_patch_level: 2025-01 + sub_level: 66 + os_patch_level: 2025-02 uses: ./.github/workflows/gki-kernel.yml with: version: ${{ matrix.version }} diff --git a/.github/workflows/build-manager-ci.yml b/.github/workflows/build-manager-ci.yml index 4742af27..13f2eb32 100644 --- a/.github/workflows/build-manager-ci.yml +++ b/.github/workflows/build-manager-ci.yml @@ -15,10 +15,6 @@ on: paths: - '.github/workflows/build-manager-ci.yml' - 'manager/**' - - 'kernel/**' - - 'userspace/ksud_overlayfs**' - - 'userspace/ksud_magic/**' - - 'userspace/susfsd/**' workflow_call: workflow_dispatch: @@ -39,39 +35,27 @@ jobs: target: ${{ matrix.target }} os: ${{ matrix.os }} - build-ksud_overlayfs: + build-ksud: needs: build-susfsd strategy: matrix: include: - target: aarch64-linux-android os: ubuntu-latest - uses: ./.github/workflows/ksud_overlayfs.yml - with: - target: ${{ matrix.target }} - os: ${{ matrix.os }} - - build-ksud_magic: - needs: build-susfsd - strategy: - matrix: - include: - - target: aarch64-linux-android - os: ubuntu-latest - uses: ./.github/workflows/ksud_magic.yml + uses: ./.github/workflows/ksud.yml with: target: ${{ matrix.target }} os: ${{ matrix.os }} build-manager: - needs: [build-ksud_magic, build-ksud_overlayfs] + needs: build-ksud runs-on: ubuntu-latest defaults: run: working-directory: ./manager steps: - - name: Checkout + - name: Checkout Repository uses: actions/checkout@v4 with: fetch-depth: 0 @@ -85,7 +69,7 @@ jobs: echo "UPLOAD=false" >> $GITHUB_OUTPUT fi - - name: Write key + - name: Write Key run: | if [ ! -z "${{ secrets.KEYSTORE }}" ]; then { @@ -106,9 +90,6 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - - name: Download arm64 susfsd uses: actions/download-artifact@v4 with: @@ -152,19 +133,19 @@ jobs: chmod +x gradlew ./gradlew clean assembleRelease - - name: Upload build artifact + - name: Upload Build Artifact uses: actions/upload-artifact@v4 with: - name: manager + name: Manager path: manager/app/build/outputs/apk/release/*.apk - - name: Upload mappings + - name: Upload Mappings uses: actions/upload-artifact@v4 with: - name: "mappings" - path: "manager/app/build/outputs/mapping/release/" + name: Mappings + path: manager/app/build/outputs/mapping/release/ - - name: Bot session cache + - name: Bot Session Cache if: steps.need_upload.outputs.UPLOAD == 'true' id: bot_session_cache uses: actions/cache@v4 @@ -172,7 +153,7 @@ jobs: path: scripts/ksunextbot.session key: ${{ runner.os }}-bot-session - - name: Upload to telegram + - name: Upload to Telegram if: steps.need_upload.outputs.UPLOAD == 'true' env: API_ID: ${{ secrets.API_ID }} diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index 603c8adf..997b2bd5 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -15,10 +15,6 @@ on: # paths: # - '.github/workflows/build-manager-ci.yml' # - 'manager/**' - # - 'kernel/**' - # - 'userspace/ksud_overlayfs**' - # - 'userspace/ksud_magic/**' - # - 'userspace/susfsd/**' workflow_call: workflow_dispatch: @@ -39,39 +35,27 @@ jobs: target: ${{ matrix.target }} os: ${{ matrix.os }} - build-ksud_overlayfs: + build-ksud: needs: build-susfsd strategy: matrix: include: - target: aarch64-linux-android os: ubuntu-latest - uses: ./.github/workflows/ksud_overlayfs.yml - with: - target: ${{ matrix.target }} - os: ${{ matrix.os }} - - build-ksud_magic: - needs: build-susfsd - strategy: - matrix: - include: - - target: aarch64-linux-android - os: ubuntu-latest - uses: ./.github/workflows/ksud_magic.yml + uses: ./.github/workflows/ksud.yml with: target: ${{ matrix.target }} os: ${{ matrix.os }} build-manager: - needs: [build-ksud_magic, build-ksud_overlayfs] + needs: build-ksud runs-on: ubuntu-latest defaults: run: working-directory: ./manager steps: - - name: Checkout + - name: Checkout Repository uses: actions/checkout@v4 with: fetch-depth: 0 @@ -85,7 +69,7 @@ jobs: echo "UPLOAD=false" >> $GITHUB_OUTPUT fi - - name: Write key + - name: Write Key run: | if [ ! -z "${{ secrets.KEYSTORE }}" ]; then { @@ -106,9 +90,6 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - - name: Download arm64 susfsd uses: actions/download-artifact@v4 with: @@ -152,19 +133,19 @@ jobs: chmod +x gradlew ./gradlew clean assembleRelease - - name: Upload build artifact + - name: Upload Build Artifact uses: actions/upload-artifact@v4 with: - name: manager + name: Manager path: manager/app/build/outputs/apk/release/*.apk - - name: Upload mappings + - name: Upload Mappings uses: actions/upload-artifact@v4 with: - name: "mappings" - path: "manager/app/build/outputs/mapping/release/" + name: Mappings + path: manager/app/build/outputs/mapping/release/ - - name: Bot session cache + - name: Bot Session Cache if: steps.need_upload.outputs.UPLOAD == 'true' id: bot_session_cache uses: actions/cache@v4 @@ -172,7 +153,7 @@ jobs: path: scripts/ksunextbot.session key: ${{ runner.os }}-bot-session - - name: Upload to telegram + - name: Upload to Telegram if: steps.need_upload.outputs.UPLOAD == 'true' env: API_ID: ${{ secrets.API_ID }} diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 7140bbd3..4cdeec78 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -23,15 +23,26 @@ jobs: clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - run: rustup update stable + - name: Checkout Repository + uses: actions/checkout@v4 - - name: Install cross - run: cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 + - name: Setup Rust + run: rustup update stable - - name: Run clippy + - name: Setup Cross + run: RUSTFLAGS="" cargo install cross + + - name: Cache ksud_overlayfs + uses: Swatinem/rust-cache@v2 + with: + workspaces: userspace/ksud_overlayfs + + - name: Cache ksud_magic + uses: Swatinem/rust-cache@v2 + with: + workspaces: userspace/ksud_magic + + - name: Run Clippy run: | cross clippy --manifest-path userspace/ksud_magic/Cargo.toml --target aarch64-linux-android --release - cross clippy --manifest-path userspace/ksud_magic/Cargo.toml --target x86_64-linux-android --release - cross clippy --manifest-path userspace/ksud_overlayfs/Cargo.toml --target aarch64-linux-android --release - cross clippy --manifest-path userspace/ksud_overlayfs/Cargo.toml --target x86_64-linux-android --release \ No newline at end of file + cross clippy --manifest-path userspace/ksud_overlayfs/Cargo.toml --target aarch64-linux-android --release \ No newline at end of file diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml new file mode 100644 index 00000000..fc74da54 --- /dev/null +++ b/.github/workflows/ksud.yml @@ -0,0 +1,79 @@ +name: Build ksud +on: + workflow_call: + inputs: + target: + required: true + type: string + os: + required: false + type: string + default: ubuntu-latest + pack_lkm: + required: false + type: boolean + default: true + use_cache: + required: false + type: boolean + default: true +jobs: + build: + runs-on: ${{ inputs.os }} + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Download Artifacts + uses: actions/download-artifact@v4 + + - name: Prepare LKM Files + if: ${{ inputs.pack_lkm }} + run: | + cp android*-lkm/*_kernelsu.ko ./userspace/ksud_overlayfs/bin/aarch64/ + cp android*-lkm/*_kernelsu.ko ./userspace/ksud_magic/bin/aarch64/ + + - name: Import susfsd Libraries + run: | + cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/ + cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_magic/bin/aarch64/ + + - name: Setup Rust + run: | + rustup update stable + rustup target add aarch64-apple-darwin + + - name: Cache ksud_overlayfs + uses: Swatinem/rust-cache@v2 + with: + workspaces: userspace/ksud_overlayfs + cache-targets: false + + - name: Cache ksud_magic + uses: Swatinem/rust-cache@v2 + with: + workspaces: userspace/ksud_magic + cache-targets: false + + - name: Setup Cross + run: | + RUSTFLAGS="" cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 --force + + - name: Build ksud + run: | + CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_overlayfs/Cargo.toml + CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_magic/Cargo.toml + + - name: Upload ksud_overlayfs artifact + uses: actions/upload-artifact@v4 + with: + name: ksud_overlayfs-${{ inputs.target }} + path: userspace/ksud_overlayfs/target/**/release/ksud* + + - name: Upload ksud_magic artifact + uses: actions/upload-artifact@v4 + with: + name: ksud_magic-${{ inputs.target }} + path: userspace/ksud_magic/target/**/release/ksud* \ No newline at end of file diff --git a/.github/workflows/ksud_magic.yml b/.github/workflows/ksud_magic.yml deleted file mode 100644 index 7c76fadf..00000000 --- a/.github/workflows/ksud_magic.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Build ksud_magic -on: - workflow_call: - inputs: - target: - required: true - type: string - os: - required: false - type: string - default: ubuntu-latest - pack_lkm: - required: false - type: boolean - default: true - use_cache: - required: false - type: boolean - default: true -jobs: - build: - runs-on: ${{ inputs.os }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Download artifacts - uses: actions/download-artifact@v4 - - - name: Prepare LKM fies - if: ${{ inputs.pack_lkm }} - run: | - cp android*-lkm/*_kernelsu.ko ./userspace/ksud_magic/bin/aarch64/ - - - name: Import susfsd lib - run: | - cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_magic/bin/aarch64/ - - - name: Setup rustup - run: | - rustup update stable - rustup target add x86_64-apple-darwin - rustup target add aarch64-apple-darwin - - uses: Swatinem/rust-cache@v2 - with: - workspaces: userspace/ksud_magic - cache-targets: false - - - name: Install cross - run: | - cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 --force - - - name: Build ksud_magic - run: CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_magic/Cargo.toml - - - name: Upload ksud_magic artifact - uses: actions/upload-artifact@v4 - with: - name: ksud_magic-${{ inputs.target }} - path: userspace/ksud_magic/target/**/release/ksud* diff --git a/.github/workflows/ksud_overlayfs.yml b/.github/workflows/ksud_overlayfs.yml deleted file mode 100644 index 2b24d907..00000000 --- a/.github/workflows/ksud_overlayfs.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Build ksud_overlayfs -on: - workflow_call: - inputs: - target: - required: true - type: string - os: - required: false - type: string - default: ubuntu-latest - pack_lkm: - required: false - type: boolean - default: true - use_cache: - required: false - type: boolean - default: true -jobs: - build: - runs-on: ${{ inputs.os }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Download artifacts - uses: actions/download-artifact@v4 - - - name: Prepare LKM fies - if: ${{ inputs.pack_lkm }} - run: | - cp android*-lkm/*_kernelsu.ko ./userspace/ksud_overlayfs/bin/aarch64/ - - - name: Import susfsd lib - run: | - cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/ - - - name: Setup rustup - run: | - rustup update stable - rustup target add x86_64-apple-darwin - rustup target add aarch64-apple-darwin - - uses: Swatinem/rust-cache@v2 - with: - workspaces: userspace/ksud_overlayfs - cache-targets: false - - - name: Install cross - run: | - cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 --force - - - name: Build ksud_overlayfs - run: CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_overlayfs/Cargo.toml - - - name: Upload ksud_overlayfs artifact - uses: actions/upload-artifact@v4 - with: - name: ksud_overlayfs-${{ inputs.target }} - path: userspace/ksud_overlayfs/target/**/release/ksud* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 330a39c8..94f70789 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,7 @@ jobs: - build-a12-kernel - build-a13-kernel - build-a14-kernel + - build-a15-kernel runs-on: ubuntu-latest steps: - name: Download artifacts @@ -53,4 +54,4 @@ jobs: boot-images-*/Image-*/*.img.gz ksud_magic-* ksud_overlayfs-* - susfsd-* + susfsd-* \ No newline at end of file diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index c8a3c411..568e5aef 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -30,7 +30,7 @@ cmaker { val androidMinSdkVersion = 26 val androidTargetSdkVersion = 35 val androidCompileSdkVersion = 35 -val androidCompileNdkVersion = "27.2.12479018" +val androidCompileNdkVersion = "28.0.13004108" val androidSourceCompatibility = JavaVersion.VERSION_21 val androidTargetCompatibility = JavaVersion.VERSION_21 val managerVersionCode by extra(getVersionCode()) diff --git a/userspace/ksud_magic/Cargo.lock b/userspace/ksud_magic/Cargo.lock index 3ab7d61d..8006091f 100644 --- a/userspace/ksud_magic/Cargo.lock +++ b/userspace/ksud_magic/Cargo.lock @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -211,15 +211,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "cc" -version = "1.2.10" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" dependencies = [ "shlex", ] @@ -246,9 +246,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", "clap_derive", @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstream", "anstyle", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.24" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck", "proc-macro2", @@ -327,9 +327,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -613,13 +613,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" dependencies = [ "cfg-if", "libc", "wasi", + "windows-targets", ] [[package]] @@ -901,9 +902,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ "adler2", ] @@ -944,9 +945,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "pin-project-lite" @@ -1111,9 +1112,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "same-file" @@ -1146,9 +1147,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -1211,9 +1212,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -1222,9 +1223,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", @@ -1292,9 +1293,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-width" @@ -1332,9 +1333,12 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "wasm-bindgen" @@ -1396,9 +1400,9 @@ dependencies = [ [[package]] name = "which" -version = "7.0.1" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028" +checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283" dependencies = [ "either", "env_home", @@ -1534,6 +1538,15 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/userspace/ksud_magic/Cargo.toml b/userspace/ksud_magic/Cargo.toml index 27f06e5e..779be2fa 100644 --- a/userspace/ksud_magic/Cargo.toml +++ b/userspace/ksud_magic/Cargo.toml @@ -27,7 +27,7 @@ libc = "0.2" extattr = "1" jwalk = "0.8" is_executable = "1" -nom = "7" +nom = "=7" derive-new = "0.7" rust-embed = { version = "8", features = [ "debug-embed", diff --git a/userspace/ksud_magic/src/assets.rs b/userspace/ksud_magic/src/assets.rs index a5567eab..ce88aae3 100644 --- a/userspace/ksud_magic/src/assets.rs +++ b/userspace/ksud_magic/src/assets.rs @@ -12,13 +12,6 @@ pub const BOOTCTL_PATH: &str = concatcp!(BINARY_DIR, "bootctl"); #[allow(dead_code)] pub const SUSFSD_PATH: &str = concatcp!(BINARY_DIR, "susfsd"); -#[cfg(all(target_arch = "x86_64", target_os = "android"))] -#[derive(RustEmbed)] -#[folder = "bin/x86_64"] -struct Asset; - -// IF NOT x86_64 ANDROID, ie. macos, linux, windows, always use aarch64 -#[cfg(not(all(target_arch = "x86_64", target_os = "android")))] #[derive(RustEmbed)] #[folder = "bin/aarch64"] struct Asset; diff --git a/userspace/ksud_magic/src/boot_patch.rs b/userspace/ksud_magic/src/boot_patch.rs index 60d4a6e2..52306b1c 100644 --- a/userspace/ksud_magic/src/boot_patch.rs +++ b/userspace/ksud_magic/src/boot_patch.rs @@ -235,7 +235,10 @@ pub fn restore( ensure!(status.success(), "magiskboot unpack failed"); let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?; - ensure!(is_kernelsu_patched, "boot image is not patched by KernelSU Next"); + ensure!( + is_kernelsu_patched, + "boot image is not patched by KernelSU Next" + ); let mut new_boot = None; let mut from_backup = false; diff --git a/userspace/ksud_overlayfs/Cargo.lock b/userspace/ksud_overlayfs/Cargo.lock index 79dbd980..dc86b673 100644 --- a/userspace/ksud_overlayfs/Cargo.lock +++ b/userspace/ksud_overlayfs/Cargo.lock @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -211,15 +211,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "cc" -version = "1.2.10" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" dependencies = [ "shlex", ] @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", "clap_derive", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.27" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstream", "anstyle", @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.24" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck", "proc-macro2", @@ -333,9 +333,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -619,13 +619,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" dependencies = [ "cfg-if 1.0.0", "libc", "wasi", + "windows-targets", ] [[package]] @@ -931,9 +932,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ "adler2", ] @@ -974,9 +975,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "pin-project-lite" @@ -1141,9 +1142,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "same-file" @@ -1176,9 +1177,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -1241,9 +1242,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -1252,9 +1253,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if 1.0.0", "fastrand", @@ -1342,9 +1343,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-width" @@ -1382,9 +1383,12 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "wasm-bindgen" @@ -1446,9 +1450,9 @@ dependencies = [ [[package]] name = "which" -version = "7.0.1" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028" +checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283" dependencies = [ "either", "env_home", @@ -1584,6 +1588,15 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/userspace/ksud_overlayfs/Cargo.toml b/userspace/ksud_overlayfs/Cargo.toml index 7bb4dc4a..9c0e2489 100644 --- a/userspace/ksud_overlayfs/Cargo.toml +++ b/userspace/ksud_overlayfs/Cargo.toml @@ -27,7 +27,7 @@ libc = "0.2" extattr = "1" jwalk = "0.8" is_executable = "1" -nom = "7" +nom = "=7" derive-new = "0.7" rust-embed = { version = "8", features = [ "debug-embed", diff --git a/userspace/ksud_overlayfs/src/assets.rs b/userspace/ksud_overlayfs/src/assets.rs index a5567eab..ce88aae3 100644 --- a/userspace/ksud_overlayfs/src/assets.rs +++ b/userspace/ksud_overlayfs/src/assets.rs @@ -12,13 +12,6 @@ pub const BOOTCTL_PATH: &str = concatcp!(BINARY_DIR, "bootctl"); #[allow(dead_code)] pub const SUSFSD_PATH: &str = concatcp!(BINARY_DIR, "susfsd"); -#[cfg(all(target_arch = "x86_64", target_os = "android"))] -#[derive(RustEmbed)] -#[folder = "bin/x86_64"] -struct Asset; - -// IF NOT x86_64 ANDROID, ie. macos, linux, windows, always use aarch64 -#[cfg(not(all(target_arch = "x86_64", target_os = "android")))] #[derive(RustEmbed)] #[folder = "bin/aarch64"] struct Asset; diff --git a/userspace/ksud_overlayfs/src/boot_patch.rs b/userspace/ksud_overlayfs/src/boot_patch.rs index 4f3f1bc4..4c6eb9eb 100644 --- a/userspace/ksud_overlayfs/src/boot_patch.rs +++ b/userspace/ksud_overlayfs/src/boot_patch.rs @@ -235,7 +235,10 @@ pub fn restore( ensure!(status.success(), "magiskboot unpack failed"); let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?; - ensure!(is_kernelsu_patched, "boot image is not patched by KernelSU Next"); + ensure!( + is_kernelsu_patched, + "boot image is not patched by KernelSU Next" + ); let mut new_boot = None; let mut from_backup = false;