From ac669b101d8d3266de104d7e9f28b716592c9328 Mon Sep 17 00:00:00 2001 From: tianrking Date: Fri, 20 Mar 2026 14:47:36 +0800 Subject: [PATCH] fix: resolve macos compile issue and debian pip policy in ci --- .github/workflows/ci.yml | 6 ++++-- proxychains/src/hook/hooks.rs | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a76660..2649659 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: if [ "${DISTRO_FAMILY}" = "deb" ]; then apt-get update DEBIAN_FRONTEND=noninteractive apt-get install -y \ - curl ca-certificates git build-essential pkg-config python3 python3-pip + curl ca-certificates git build-essential pkg-config python3 python3-pip python3-venv else dnf install -y \ curl ca-certificates git gcc gcc-c++ make pkgconf-pkg-config python3 python3-pip @@ -88,7 +88,9 @@ jobs: rustup --version cargo --version - pip3 install --no-input proxy.py pproxy + python3 -m venv /tmp/pc-venv + . /tmp/pc-venv/bin/activate + pip install --no-input proxy.py pproxy nohup python3 -m pproxy -l socks5://127.0.0.1:19080 >/tmp/pproxy-socks5.log 2>&1 & nohup python3 -m proxy --hostname 127.0.0.1 --port 18080 >/tmp/proxy-http.log 2>&1 & sleep 2 diff --git a/proxychains/src/hook/hooks.rs b/proxychains/src/hook/hooks.rs index 8dab08a..21c4f3d 100644 --- a/proxychains/src/hook/hooks.rs +++ b/proxychains/src/hook/hooks.rs @@ -74,7 +74,6 @@ fn custom_alloc_map() -> &'static Mutex const CONFIG_RELOAD_INTERVAL: Duration = Duration::from_secs(2); -#[derive(Clone)] struct HookSnapshot { config: Config, dns_resolver: crate::dns::DnsResolver,