Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install fixes #570

Merged
merged 3 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions helpers/helpers_emba_dependency_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ dependency_check()
# patool extractor - https://wummel.github.io/patool/
check_dep_tool "patool"

# Freetz-NG
check_dep_file "Freetz-NG fwmod" "$EXT_DIR""/freetz-ng/fwmod"
# Freetz-NG - replaced by unblob
# check_dep_file "Freetz-NG fwmod" "$EXT_DIR""/freetz-ng/fwmod"

# AVM fitimg extraction script
check_dep_file "fitimg script" "$EXT_DIR""/fitimg-0.8/fitimg"
# AVM fitimg extraction script - replaced by unblob
# check_dep_file "fitimg script" "$EXT_DIR""/fitimg-0.8/fitimg"

# EnGenius decryptor - https://gist.github.com/ryancdotorg/914f3ad05bfe0c359b79716f067eaa99
check_dep_file "EnGenius decryptor" "$EXT_DIR""/engenius-decrypt.py"
Expand Down
1 change: 1 addition & 0 deletions installer/I108_stacs_password_search.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ I108_stacs_password_search() {
print_tool_info "python3-pip" 1
print_tool_info "libarchive-dev" 1
print_tool_info "pybind11-dev" 1
print_tool_info "libssl-dev" 1
# print_pip_info "stacs"
print_git_info "stacs" "stacscan/stacs" "STACS is a fast, easy to use tool for searching of password hashes in firmware files."
print_git_info "stacs-rules" "stacscan/stacs-rules" "STACS is a fast, easy to use tool for searching of password hashes in firmware files."
Expand Down
8 changes: 5 additions & 3 deletions installer/IP99_binwalk_default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ IP99_binwalk_default() {
fi

if ! [[ -d external/binwalk/sasquatch ]]; then
git clone https://github.com/EMBA-support-repos/sasquatch external/binwalk/sasquatch
# git clone https://github.com/EMBA-support-repos/sasquatch external/binwalk/sasquatch
git clone --quiet --depth 1 --branch "master" https://github.com/devttys0/sasquatch external/binwalk/sasquatch
fi
cd external/binwalk/sasquatch || ( echo "Could not install EMBA component sasquatch" && exit 1 )
# https://github.com/ReFirmLabs/binwalk/issues/618#issuecomment-1432373715
wget https://github.com/devttys0/sasquatch/pull/47.patch
patch -p1 < 47.patch
# wget https://github.com/devttys0/sasquatch/pull/47.patch
# patch -p1 < 47.patch
wget https://github.com/devttys0/sasquatch/pull/51.patch && patch -p1 <51.patch
CFLAGS="-fcommon -Wno-misleading-indentation" ./build.sh -y
cd "$HOME_PATH" || ( echo "Could not install EMBA component sasquatch" && exit 1 )

Expand Down