diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 0005cc2..d585ae4 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -327,14 +327,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" -[[package]] -name = "iptables" -version = "0.6.0" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "iptables" version = "0.6.0" @@ -959,7 +951,7 @@ dependencies = [ "clap", "daemonize", "getset", - "iptables 0.6.0 (git+https://github.com/sqlerrorthing/rust-iptables.git?branch=feat%2Fadd-android)", + "iptables", "libc", "libnfqws", "log", diff --git a/rust/justfile b/rust/justfile index 474c461..8561ac1 100644 --- a/rust/justfile +++ b/rust/justfile @@ -1,4 +1,4 @@ -set shell := ["sh", "-eu", "-c"] +set shell := ["bash", "-eu", "-c"] export ANDROID_API := "21" export ANDROID_NDK_VERSION := "r27d-linux" @@ -10,7 +10,7 @@ export NETFILTER_LIBS := TARGET + "/netfilter" export NDK_HOME := TARGET + "/android-ndk-" + ANDROID_NDK_VERSION _download_android_ndk: - #!/usr/bin/env sh + #!/usr/bin/env bash if [ ! -d "{{NDK_HOME}}" ]; then echo "Downloading ndk {{ANDROID_NDK_VERSION}} to {{NDK_HOME}}" TMPFILE="{{NDK_HOME}}.tmp" @@ -33,7 +33,7 @@ _download_android_ndk: fi _build_netfilter_libs target_arch: - #!/usr/bin/env sh + #!/usr/bin/env bash if [ ! -d "{{NETFILTER_LIBS}}-{{target_arch}}" ]; then export PATCH="$(pwd)/libnetfilter_queue-android.patch" @@ -77,7 +77,7 @@ _build_netfilter_libs target_arch: fi _instal_rust_target target: - #!/usr/bin/env sh + #!/usr/bin/env bash if ! rustup target list --installed | grep -q "{{target}}"; then echo "Installing missing target: {{target}}" rustup target add "{{target}}" @@ -86,11 +86,11 @@ _instal_rust_target target: fi prepare-android: _download_android_ndk - #!/usr/bin/env sh + #!/usr/bin/env bash cargo install cargo-ndk build-android *args: prepare-android - #!/usr/bin/env sh + #!/usr/bin/env bash targets=("armv7-linux-androideabi" "aarch64-linux-android" "x86_64-linux-android")