From b8d8567fd5778a31da4c586058678b64eab604d8 Mon Sep 17 00:00:00 2001 From: QU35T-code Date: Mon, 20 Jan 2025 11:29:32 +0100 Subject: [PATCH 1/3] Add xq --- sources/install/package_base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/install/package_base.sh b/sources/install/package_base.sh index cb4e67462..795fe2500 100644 --- a/sources/install/package_base.sh +++ b/sources/install/package_base.sh @@ -449,7 +449,7 @@ function package_base() { colorecho "Starting main programs install" fapt man git lsb-release pciutils pkg-config zip unzip kmod gnupg2 wget \ libffi-dev zsh asciinema npm gem automake autoconf make cmake time gcc g++ file lsof \ - less x11-apps net-tools vim nano jq iputils-ping iproute2 tidy mlocate libtool \ + less x11-apps net-tools vim nano jq xq iputils-ping iproute2 tidy mlocate libtool \ dos2unix ftp sshpass telnet nfs-common ncat netcat-traditional socat rdate putty \ screen p7zip-full p7zip-rar unrar xz-utils xsltproc parallel tree ruby ruby-dev ruby-full bundler \ nim perl libwww-perl openjdk-17-jdk openvpn openresolv \ From ac95130c4c04cb58215590c715e7baf1c26f1ab4 Mon Sep 17 00:00:00 2001 From: QU35T-code Date: Mon, 20 Jan 2025 11:49:27 +0100 Subject: [PATCH 2/3] Remove blackbird (ARM arch) --- sources/install/package_osint.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sources/install/package_osint.sh b/sources/install/package_osint.sh index 5699f0ca2..322655617 100644 --- a/sources/install/package_osint.sh +++ b/sources/install/package_osint.sh @@ -486,8 +486,19 @@ function install_blackbird() { cd /opt/tools/blackbird || exit sed -i "s#data.json#/opt/tools/blackbird/data.json#" blackbird.py sed -i "s#useragents.txt#/opt/tools/blackbird/useragents.txt#" blackbird.py + dos2unix requirements.txt python3 -m venv --system-site-packages ./venv source ./venv/bin/activate + # spacy 3.8.2 uses blis 1.2.0 as dependency. This version of blis in the ARM architecture has issues during build. + local temp_fix_limit="2025-02-20" + if [[ "$(date +%Y%m%d)" -gt "$(date -d $temp_fix_limit +%Y%m%d)" ]]; then + criticalecho "Temp fix expired. Exiting." + else + if [[ $(uname -m) = 'aarch64' ]] + then + criticalecho-noexit "This installation function doesn't support architecture $(uname -m)" && return + fi + fi pip3 install -r requirements.txt deactivate add-aliases blackbird From 0b7982c8284832b93ccabe399f71ffd4d2b2aa9c Mon Sep 17 00:00:00 2001 From: QU35T-code Date: Mon, 20 Jan 2025 13:35:45 +0100 Subject: [PATCH 3/3] Fix tool branch --- sources/install/package_ad.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/install/package_ad.sh b/sources/install/package_ad.sh index 05a65697d..ab48b6ebc 100644 --- a/sources/install/package_ad.sh +++ b/sources/install/package_ad.sh @@ -1283,7 +1283,7 @@ function install_LDAPWordlistHarvester() { function install_pywerview() { # CODE-CHECK-WHITELIST=add-aliases colorecho "Installing pywerview" - pipx install --system-site-packages git+https://github.com/the-useless-one/pywerview + pipx install --system-site-packages git+https://github.com/the-useless-one/pywerview@master add-history pywerview add-test-command "pywerview --help" add-to-list "pywerview,https://github.com/the-useless-one/pywerview,A (partial) Python rewriting of PowerSploit's PowerView."