geoview: update to 0.2.2

Co-authored-by: smallprogram <smallprogram@foxmail.com>

.github/workflows/Auto cache software release jsons.yml

@@ -6,7 +6,7 @@ name: Auto Cache Software Release JSONs
 
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '0 */2 * * *'
   workflow_dispatch:
 
 env:
@@ -17,15 +17,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Initialization environment
         run: |
           sudo timedatectl set-timezone "$TZ"
 
+      - name: Install GitHub CLI
+        run: sudo apt-get update && sudo apt-get install -y gh
+
       - name: Fetch GitHub release JSONs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          mkdir -p output
+          mkdir -p output old_json
+
           declare -A repos
           repos["geoview"]="snowie2000/geoview"
           repos["chinadns-ng"]="zfl9/chinadns-ng"
@@ -33,14 +39,62 @@ jobs:
           repos["sing-box"]="SagerNet/sing-box"
           repos["hysteria"]="HyNetwork/hysteria"
 
+          echo "Downloading previous api-cache release assets (if exists)..."
+          gh release download api-cache --dir old_json --pattern "*.json" || echo "No previous release found"
+
           for name in "${!repos[@]}"; do
             repo="${repos[$name]}"
-            echo "Fetching release JSONs for $name from $repo ..."
+            echo "Processing $name from $repo ..."
+
+            for t in release pre-release; do
+              old="old_json/${name}-${t}-api.json"
+              if [ -f "$old" ]; then
+                cp "$old" "output/${name}-${t}-api.json.bak"
+              fi
+            done
+
             curl -sL "https://api.github.com/repos/$repo/releases/latest" -o "output/${name}-release-api.json"
             curl -sL "https://api.github.com/repos/$repo/releases?per_page=1" -o "output/${name}-pre-release-api.json"
+
+            for t in release pre-release; do
+              file="output/${name}-${t}-api.json"
+
+              TAG_NAME=$(grep -oP '"tag_name": "\K[^"]+' "$file" || true)
+
+              if [ -z "$TAG_NAME" ]; then
+                echo "❌ ${file} No tag_name, restore old files..."
+                rm -f "$file"
+
+                if [ -f "${file}.bak" ]; then
+                  mv "${file}.bak" "$file"
+                fi
+              else
+                echo "✅ ${file} Verification successful, delete bak."
+                rm -f "${file}.bak"
+              fi
+            done
           done
 
+      - name: Check output directory
+        id: check_output
+        run: |
+          if [ -z "$(ls -A output 2>/dev/null)" ]; then
+            echo "empty=true" >> $GITHUB_OUTPUT
+            echo "⚠️ The output directory is empty, and subsequent Upload/Release steps will be skipped."
+          else
+            echo "empty=false" >> $GITHUB_OUTPUT
+            echo "✔ The output directory contains files."
+          fi
+
+      - name: Delete old release and tag
+        if: steps.check_output.outputs.empty == 'false'
+        run: |
+          gh release delete api-cache --cleanup-tag -y || echo "No existing release to delete."
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload to release
+        if: steps.check_output.outputs.empty == 'false'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: api-cache
@@ -61,5 +115,5 @@ jobs:
           token: ${{ github.token }}
           repository: ${{ github.repository }}
           retain_days: 0
-          keep_minimum_runs: 6
+          keep_minimum_runs: 5
           delete_workflow_pattern: 'Auto Cache Software Release JSONs'

.github/workflows/Auto compilation testing.yml

@@ -22,7 +22,7 @@ env:
 
 jobs:
   job_auto_compile:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: test build (${{ matrix.platform }})
     strategy:
       fail-fast: false
@@ -135,10 +135,17 @@ jobs:
 
     - name: Initialization ${{ matrix.platform }} compile environment
       run: |
-        sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android
+        sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /usr/local/lib/android
         echo "install packages!!!!!!"
         sudo -E apt-get -qq update
-        sudo -E apt-get -qq install build-essential clang flex bison g++ gawk gcc-multilib g++-multilib gettext git libncurses-dev libssl-dev python3-distutils python3-setuptools rsync swig unzip zlib1g-dev file wget
+        sudo -E apt-get -qq install ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \
+            bzip2 ccache clang cmake cpio curl device-tree-compiler ecj fastjar flex gawk gettext gcc-multilib \
+            g++-multilib git gnutls-dev gperf haveged help2man intltool lib32gcc-s1 libc6-dev-i386 libelf-dev \
+            libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses-dev libpython3-dev \
+            libreadline-dev libssl-dev libtool libyaml-dev libz-dev lld llvm lrzsz mkisofs msmtp nano \
+            ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-ply python3-docutils \
+            python3-pyelftools qemu-utils re2c rsync scons squashfs-tools subversion swig texinfo uglifyjs \
+            upx-ucl unzip vim wget xmlto xxd zlib1g-dev zstd
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
 
@@ -156,17 +163,44 @@ jobs:
     - name: ${{ matrix.platform }} feeds configuration packages
       run: |
         cd sdk
-        echo "src-git base https://github.com/openwrt/openwrt.git;openwrt-${{ matrix.sdk_ver }}" > feeds.conf
-        echo "src-git packages https://github.com/openwrt/packages.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf
-        echo "src-git luci https://github.com/openwrt/luci.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf
-        echo "src-git routing https://github.com/openwrt/routing.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf
-        echo "src-git passwall_packages https://github.com/${{ env.packages }}.git;main" >> feeds.conf
+        cat > feeds.conf.default << EOF
+        src-git passwall_packages https://github.com/${{ env.packages }}.git;main
+        src-git base https://github.com/openwrt/openwrt.git;openwrt-${{ matrix.sdk_ver }}
+        src-git packages https://github.com/openwrt/packages.git;openwrt-${{ matrix.sdk_ver }}
+        src-git luci https://github.com/openwrt/luci.git;openwrt-${{ matrix.sdk_ver }}
+        src-git routing https://github.com/openwrt/routing.git;openwrt-${{ matrix.sdk_ver }}
+        src-git telephony https://github.com/openwrt/telephony.git;openwrt-${{ matrix.sdk_ver }}
+        EOF
 
         ./scripts/feeds update -a
-        ./scripts/feeds install -a -f -p passwall_packages
+        ./scripts/feeds install -a
 
+        #--------------------------------------begin_patches------------------------------------------
+        echo "Start applying the patch"
+
+
+        rm -rf temp_resp
+        git clone -b master --single-branch https://github.com/openwrt/packages.git temp_resp
+        echo "update golang version"
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+        cp -r temp_resp/lang/golang feeds/packages/lang
+        echo "update rust version"
+        rm -rf feeds/packages/lang/rust
+        cp -r temp_resp/lang/rust feeds/packages/lang
+        rm -rf temp_resp
+
+        git clone -b main --single-branch https://github.com/openwrt/openwrt.git temp_resp
+        cp -f temp_resp/scripts/patch-kernel.sh scripts/
+        rm -rf temp_resp
+
+
+        echo "fixed rust host build error"
+        sed -i 's/--set=llvm\.download-ci-llvm=false/--set=llvm.download-ci-llvm=true/' feeds/packages/lang/rust/Makefile
+        grep -q -- '--ci false \\' feeds/packages/lang/rust/Makefile || sed -i '/x\.py \\/a \        --ci false \\' feeds/packages/lang/rust/Makefile
+
+
+        echo "Patch application completed"
+        #--------------------------------------end_patches--------------------------------------------
 
         echo "CONFIG_ALL_NONSHARED=n" > .config
         echo "CONFIG_ALL_KMODS=n" >> .config

.github/workflows/Auto update packages v2.yml

@@ -30,7 +30,7 @@ env:
 
 jobs:
   job_init:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@main
@@ -57,7 +57,7 @@ jobs:
   job_auto_update_packages:
     if: ${{ always() }}
     needs: job_init
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Auto-update-${{ matrix.pakcages }} 
     strategy:
       fail-fast: false
@@ -212,9 +212,9 @@ jobs:
             hash_head: \  HASH:=
             version_line:
             hash_line: 21
-            release_api_command: curl -sL "https://api.github.com/repos/v2fly/geoip/releases" | jq -r 'map(select(.prerelease|not)) | first | .tag_name' | sed -e 's/.*v//'
-            prerelease_api_command: curl -sL "https://api.github.com/repos/v2fly/geoip/releases" | jq -r 'first | .tag_name' | sed -e 's/.*v//'
-            release_download_url: https://github.com/v2fly/geoip/releases/download/
+            release_api_command: curl -sL "https://api.github.com/repos/Loyalsoldier/geoip/releases" | jq -r 'map(select(.prerelease|not)) | first | .tag_name' | sed -e 's/.*v//'
+            prerelease_api_command: curl -sL "https://api.github.com/repos/Loyalsoldier/geoip/releases" | jq -r 'first | .tag_name' | sed -e 's/.*v//'
+            release_download_url: https://github.com/Loyalsoldier/geoip/releases/download/
             file_name: /geoip.dat
 
           - pakcages: v2ray-geosite
@@ -223,10 +223,10 @@ jobs:
             hash_head: \  HASH:=
             version_line:
             hash_line: 30
-            release_api_command: curl -sL "https://api.github.com/repos/v2fly/domain-list-community/releases" | jq -r 'map(select(.prerelease|not)) | first | .tag_name' | sed -e 's/.*v//'
-            prerelease_api_command: curl -sL "https://api.github.com/repos/v2fly/domain-list-community/releases" | jq -r 'first | .tag_name' | sed -e 's/.*v//'
-            release_download_url: https://github.com/v2fly/domain-list-community/releases/download/
-            file_name: /dlc.dat
+            release_api_command: curl -sL "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases" | jq -r 'map(select(.prerelease|not)) | first | .tag_name' | sed -e 's/.*v//'
+            prerelease_api_command: curl -sL "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases" | jq -r 'first | .tag_name' | sed -e 's/.*v//'
+            release_download_url: https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/
+            file_name: /geosite.dat
 
           # - pakcages: dns2tcp
           #   folder: dns2tcp
@@ -344,20 +344,35 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: steps.check.outputs.status == 'success' && steps.check.outputs.New_PKG_VERSION != '' && steps.update.outputs.branch_exists == '' && !cancelled()
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "${{ matrix.pakcages }}: update to ${{ steps.update.outputs.version }}"
-          committer: smallprogram <smallprogram@foxmail.com>
-          author: smallprogram <smallprogram@foxmail.com>
-          signoff: false
-          branch: patches-${{ matrix.pakcages }}-${{ steps.update.outputs.version }}
-          base: main
-          delete-branch: true
-          body: |
-            ${{ matrix.pakcages }}: update to ${{ steps.update.outputs.version }}
-          title: "${{ matrix.pakcages }}: update to ${{ steps.update.outputs.version }}"
-          labels: |
-            automated-pr
-          draft: false
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          branch="patches-${{ matrix.pakcages }}-${{ steps.update.outputs.version }}"
+          title="${{ matrix.pakcages }}: update to ${{ steps.update.outputs.version }}"
+          EXISTING=$(gh pr list \
+            --state open \
+            --base main \
+            --json number,title \
+            --jq ".[] | select(.title == \"$title\") | .number" \
+            || echo "")
 
+          if [ -n "$EXISTING" ]; then
+            echo "Duplicate PR with title '$TITLE' already exists: #$EXISTING"
+          else
+            git config --global user.email "smallprogram@foxmail.com"
+            git config --global user.name "smallprogram"
+
+            
+            echo "No duplicate found, will create PR."
+            git checkout -b "$branch"
+            git add .
+            git commit -m "${{ matrix.pakcages }}: update to ${{ steps.update.outputs.version }}"
+            git push origin $branch
+
+            gh pr create \
+            --title "$title" \
+            --body "$title" \
+            --base main \
+            --head "$branch" \
+            --label "automated-pr"
+          fi

.github/workflows/Close stale issues and Prs.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/stale@v7.0.0
+      - uses: actions/stale@v10
         with:
           stale-issue-message: "Stale Issue"
           stale-pr-message: "Stale PR"

chinadns-ng/Makefile

@@ -1,64 +1,64 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chinadns-ng
-PKG_VERSION:=2025.06.20
+PKG_VERSION:=2025.08.09
 PKG_RELEASE:=1
 
 ifeq ($(ARCH),aarch64)
   ifeq ($(BOARD),rockchip)
     PKG_ARCH:=chinadns-ng+wolfssl@aarch64-linux-musl@generic+v8a@fast+lto
-    PKG_HASH:=224494b4505ac8dd347a70b298b853b677c0e247887d6edcf46b08bb153de017
+    PKG_HASH:=3fe0217615dd7060b7287d2b6b31d2a0b364137398bfb335a03bead322eac716
   else
     PKG_ARCH:=chinadns-ng+wolfssl_noasm@aarch64-linux-musl@generic+v8a@fast+lto
-    PKG_HASH:=7639fae8e77ea36e377352179acb19e2fdf9010c2c373a9e02f03f637e99140c
+    PKG_HASH:=42ddd494200ec6d88b35902927688d316bc23e06e6c08d9e01eb2412196ab845
   endif
 else ifeq ($(ARCH),arm)
   ifeq ($(CONFIG_arm_v6),y)
     PKG_ARCH:=chinadns-ng+wolfssl@arm-linux-musleabi@generic+v6+soft_float@fast+lto
-    PKG_HASH:=00fe09cf6309377a4bc90f3a5b909c5266c63181cc268912b4e32f92f58ec6cd
+    PKG_HASH:=0a401d1dc11129481b2baf86f847d55d66bd7e725cba4bf57875fdad27ef0052
   else ifeq ($(CONFIG_arm_v7),y)
     ifeq ($(CONFIG_HAS_FPU),y)
       PKG_ARCH:=chinadns-ng+wolfssl@arm-linux-musleabihf@generic+v7a@fast+lto
-      PKG_HASH:=1acd9129d7efd99bf9952ac6dd932e10108fb27a2a059f03e80bf520300b3741
+      PKG_HASH:=dfa1f6ba80fb0925613822f4c4e00df8da68e7b8b772048d26a0d1a9d07d346b
     else
       PKG_ARCH:=chinadns-ng+wolfssl@arm-linux-musleabi@generic+v6+soft_float@fast+lto
-      PKG_HASH:=00fe09cf6309377a4bc90f3a5b909c5266c63181cc268912b4e32f92f58ec6cd
+      PKG_HASH:=0a401d1dc11129481b2baf86f847d55d66bd7e725cba4bf57875fdad27ef0052
     endif
   else
     PKG_ARCH:=chinadns-ng+wolfssl@arm-linux-musleabi@generic+v5te+soft_float@fast+lto
-    PKG_HASH:=01b5209a662824bd1c7586dccd95c9999e703cbb4704c623211e09c98becdce4
+    PKG_HASH:=dc104953fcd95c1c98b7b2b54b0b6731565e0650f81230e6de127a486803f42f
   endif
 else ifeq ($(ARCH),mips)
   PKG_ARCH:=chinadns-ng+wolfssl@mips-linux-musl@mips32+soft_float@fast+lto
-  PKG_HASH:=fa468c04e58b47d7f6bb893ed6bdc41f9929d5a2e500c768e82e0f4a459b047c
+  PKG_HASH:=b610821a8f61b0ed3c8c7e82e10d401348a9de17f900988589024a37c4099c8e
 else ifeq ($(ARCH),mipsel)
   ifeq ($(CONFIG_HAS_FPU),)
     PKG_ARCH:=chinadns-ng+wolfssl@mipsel-linux-musl@mips32+soft_float@fast+lto
-    PKG_HASH:=294917a5009a315cf5ad04cdda8f66714c60c928e2186a6846323e04aa4a798f
+    PKG_HASH:=760544a88724e3b1b9eac79c9400231e81aa8786f8f00a979229e175811ffe6d
   else
     PKG_ARCH:=chinadns-ng+wolfssl@mipsel-linux-musl@mips32@fast+lto
-    PKG_HASH:=23c40248c3aa301a26c37cdb66e2141d2d73d4f0c5c03c066324263510d959ac
+    PKG_HASH:=ec547c31a884e0967437ceb90a5c270864efe81b0e40939e0ec2810c7bfd6653
   endif
 else ifeq ($(ARCH),mips64)
   PKG_ARCH:=chinadns-ng+wolfssl@mips64-linux-musl@mips64+soft_float@fast+lto
-  PKG_HASH:=f65bf9e495384afaf8aadd35395a2b9cdb2eedecb2602a0c522039dc4707350d
+  PKG_HASH:=2d0fce18a7ef1d74fdc12738767e66998a52c2b30d8790da760933853fe8726e
 else ifeq ($(ARCH),mips64el)
   PKG_ARCH:=chinadns-ng+wolfssl@mips64el-linux-musl@mips64+soft_float@fast+lto
-  PKG_HASH:=44bd1a96d5a0ce02b8c5c5d941339958af2bf2d1c5e5d90ed87214ac0d900543
+  PKG_HASH:=a301d8d200d06582c60bbe0e487a28f5b41e6f0997a548cf882a7b078dab089c
 else ifeq ($(ARCH),i386)
   ifneq ($(CONFIG_TARGET_x86_geode)$(CONFIG_TARGET_x86_legacy),)
     PKG_ARCH:=chinadns-ng+wolfssl@i386-linux-musl@i686@fast+lto
-    PKG_HASH:=25a215e1b5c18f8b4f0e7f0a0925fd1c959bbfdfeb3383830d2b645a94077fc6
+    PKG_HASH:=85e057dd0a0e8913b30471737436ab8b71834c494ed9f9e53544261b1ffdc8d6
   else
     PKG_ARCH:=chinadns-ng+wolfssl@i386-linux-musl@pentium4@fast+lto
-    PKG_HASH:=e78feedf8fafc60749dfca576acd05b3df8e4b99912aa77a320971011ca77b1d
+    PKG_HASH:=2d0f1a05c82f2e21e71a6618c7f1d2e7f46aa6a21535d774d517e87ec00c989b
   endif
 else ifeq ($(ARCH),x86_64)
   PKG_ARCH:=chinadns-ng+wolfssl@x86_64-linux-musl@x86_64@fast+lto
-  PKG_HASH:=9ad100ef18f7acaecad1aaa07b07029e9e50679fc8f119977878211b1ceb96f0
+  PKG_HASH:=842ea4e9816efd91d39bc76ead5c4a42e79011757e37c521b4270b675cfcb30c
 else ifeq ($(ARCH),riscv64)
   PKG_ARCH:=chinadns-ng+wolfssl@riscv64-linux-musl@baseline_rv64@fast+lto
-  PKG_HASH:=ed4d2cf72c2d48f19dd7678f419ce726bc2a793afc62afd6345e735dd262ca96
+  PKG_HASH:=7056f47f4d6b20109e007792694dc83e5eac44c9265d7be20f6dc10375b35a9b
 else
   PKG_HASH:=dummy
 endif

dns2socks/Makefile

@@ -8,8 +8,8 @@ PKG_NAME:=dns2socks
 PKG_VERSION:=2.1
 PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
-PKG_SOURCE_URL:=@SF/dns2socks/SourceCode.zip?
+PKG_SOURCE:=SourceCode.zip
+PKG_SOURCE_URL:=https://github.com/xiaorouji/openwrt-passwall-packages/releases/download/dns2socks
 PKG_SOURCE_DATE:=2020-02-18
 PKG_HASH:=406b5003523577d39da66767adfe54f7af9b701374363729386f32f6a3a995f4
 

geoview/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=geoview
-PKG_VERSION:=0.1.10
+PKG_VERSION:=0.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/snowie2000/geoview/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=9221df928df68030893125a60bdf6d8a1fef2b199fa58ed80772cb3c17225fc5
+PKG_HASH:=3cdec7da60d5ec84f71e086fdc77f43287d064371f51d49bcfe09abd50604343
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

hysteria/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hysteria
-PKG_VERSION:=2.6.2
+PKG_VERSION:=2.6.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)?
-PKG_HASH:=4699431f0bc826da2bbd3939c0a78c4e7bfc02773fc3a62b24615c37ee89b266
+PKG_HASH:=21a04ef8ce640d7c60c3b8678500b6e6481862d9af62f9ce2663b772211718d0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-app-v$(PKG_VERSION)
 
 PKG_LICENSE:=MIT

microsocks/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=microsocks
 PKG_VERSION:=1.0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/rofl0r/microsocks/tar.gz/v$(PKG_VERSION)?
@@ -25,7 +25,7 @@ define Package/microsocks
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
-  TITLE:=Tiny, portable SOCKS5 server
+  TITLE:=Tiny, portable SOCKS5 server. Support forwarding rules
   URL:=https://github.com/rofl0r/microsocks
   DEPENDS:=+libpthread
 endef
@@ -33,6 +33,7 @@ endef
 define Package/microsocks/description
   A SOCKS5 service that you can run on your remote boxes to tunnel connections
   through them, if for some reason SSH doesn't cut it for you.
+  This version supports forwarding rules.
 endef
 
 define Package/microsocks/install

microsocks/patches/100-Add-SOCKS5-forwarding-rules-support.patch

@@ -0,0 +1,428 @@
+--- a/sockssrv.c
++++ b/sockssrv.c
+@@ -33,8 +33,10 @@
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <sys/time.h>
+ #include "server.h"
+ #include "sblist.h"
++#define MICROSOCKS_VERSION "1.0.5-forward"
+ 
+ /* timeout in microseconds on resource exhaustion to prevent excessive
+    cpu usage. */
+@@ -71,6 +73,7 @@
+ static pthread_rwlock_t auth_ips_lock = PTHREAD_RWLOCK_INITIALIZER;
+ static const struct server* server;
+ static union sockaddr_union bind_addr = {.v4.sin_family = AF_UNSPEC};
++static sblist *fwd_rules;
+ 
+ enum socksstate {
+ 	SS_1_CONNECTED,
+@@ -97,6 +100,17 @@
+ 	EC_ADDRESSTYPE_NOT_SUPPORTED = 8,
+ };
+ 
++struct fwd_rule {
++	char *match_name;
++	short match_port;
++	char *auth_buf; /* Username/Password request buffer (RFC-1929) */
++	size_t auth_len;
++	char *upstream_name;
++	short upstream_port;
++	char *req_buf; /* Client Connection Request buffer to send to upstream */
++	size_t req_len;
++};
++
+ struct thread {
+ 	pthread_t pt;
+ 	struct client client;
+@@ -116,6 +130,109 @@
+ static void dolog(const char* fmt, ...) { }
+ #endif
+ 
++static int upstream_handshake(const struct fwd_rule* rule, unsigned char *client_buf, size_t client_buf_len, 
++							int client_fd, int upstream_fd, unsigned short client_port) {
++	unsigned char sbuf[512];
++	ssize_t r;
++
++	if(rule->auth_buf) {
++		unsigned char handshake[4] = {5, 2, 0, 2};
++		if (write(upstream_fd, handshake, 4) != 4) {
++			close(upstream_fd);
++			return -1;
++		}
++	} else {
++		unsigned char handshake[3] = {5, 1, 0};
++		if (write(upstream_fd, handshake, 3) != 3) {
++			close(upstream_fd);
++			return -1;
++		}
++	}
++
++	if (read(upstream_fd, sbuf, 2) != 2 || sbuf[0] != 5) {
++		close(upstream_fd);
++		return -1;
++	}
++
++	if (sbuf[1] == 2) {
++		if (!rule->auth_buf) {
++			close(upstream_fd);
++			return -1;
++		}
++		if (write(upstream_fd, rule->auth_buf, rule->auth_len) != (ssize_t)rule->auth_len) {
++			close(upstream_fd);
++			return -1;
++		}
++		if (read(upstream_fd, sbuf, 2) != 2 || sbuf[0] != 1 || sbuf[1] != 0) {
++			close(upstream_fd);
++			return -1;
++		}
++	} else if (sbuf[1] != 0) {
++		close(upstream_fd);
++		return -1;
++	}
++
++	if (write(upstream_fd, client_buf, client_buf_len) != (ssize_t)client_buf_len) {
++		close(upstream_fd);
++		return -1;
++	}
++
++	size_t total = 0;
++	size_t need = 4;
++
++	while (total < need) {
++		r = read(upstream_fd, sbuf + total, need - total);
++		if (r <= 0) {
++			close(upstream_fd);
++			return -1;
++		}
++		total += r;
++	}
++
++	if (sbuf[1] != 0) {
++		close(upstream_fd);
++		return -sbuf[1];
++	}
++
++	size_t need_more = 0;
++	switch (sbuf[3]) {
++		case 1:
++			need_more = 4 + 2;
++			break;
++		case 4:
++			need_more = 16 + 2;
++			break;
++		case 3:
++			r = read(upstream_fd, sbuf + total, 1);
++			if (r != 1) {
++				close(upstream_fd);
++				return -1;
++			}
++			total += r;
++			need_more = sbuf[4] + 2;
++			break;
++		default:
++			close(upstream_fd);
++			return -EC_ADDRESSTYPE_NOT_SUPPORTED;
++	}
++
++	while (total < need + need_more) {
++		r = read(upstream_fd, sbuf + total, (need + need_more) - total);
++		if (r <= 0) {
++			close(upstream_fd);
++			return -1;
++		}
++		total += r;
++	}
++
++	if (write(client_fd, sbuf, total) != (ssize_t)total) {
++		close(upstream_fd);
++		return -1;
++	}
++
++	return upstream_fd;
++}
++
+ static struct addrinfo* addr_choose(struct addrinfo* list, union sockaddr_union* bindaddr) {
+ 	int af = SOCKADDR_UNION_AF(bindaddr);
+ 	if(af == AF_UNSPEC) return list;
+@@ -125,7 +242,9 @@
+ 	return list;
+ }
+ 
+-static int connect_socks_target(unsigned char *buf, size_t n, struct client *client) {
++static int connect_socks_target(unsigned char *buf, size_t n, struct client *client, int *used_rule) {
++	*used_rule = 0;
++
+ 	if(n < 5) return -EC_GENERAL_FAILURE;
+ 	if(buf[0] != 5) return -EC_GENERAL_FAILURE;
+ 	if(buf[1] != 1) return -EC_COMMAND_NOT_SUPPORTED; /* we support only CONNECT method */
+@@ -158,6 +277,29 @@
+ 	}
+ 	unsigned short port;
+ 	port = (buf[minlen-2] << 8) | buf[minlen-1];
++
++	size_t i;
++	struct fwd_rule *rule = NULL;
++	char original_name[256];
++	unsigned short original_port = port;
++	strncpy(original_name, namebuf, sizeof(original_name) - 1);
++	original_name[sizeof(original_name) - 1] = '\0';
++	if(fwd_rules) {
++		for(i=0;i<sblist_getsize(fwd_rules);++i) {
++			struct fwd_rule* r = (struct fwd_rule*)sblist_get(fwd_rules, i);
++			int name_match = (r->match_name[0]=='\0' || strcmp(r->match_name, namebuf) == 0);
++			int port_match = (r->match_port == 0 || r->match_port == port);
++			if(name_match && port_match) {
++				rule = r;
++				*used_rule = 1;
++				strncpy(namebuf, r->upstream_name, sizeof(namebuf)-1);
++				namebuf[sizeof(namebuf)-1] = '\0';
++				port = r->upstream_port;
++				break;
++			}
++		}
++	}
++
+ 	/* there's no suitable errorcode in rfc1928 for dns lookup failure */
+ 	if(resolve(namebuf, port, &remote)) return -EC_GENERAL_FAILURE;
+ 	struct addrinfo* raddr = addr_choose(remote, &bind_addr);
+@@ -186,6 +328,11 @@
+ 			return -EC_GENERAL_FAILURE;
+ 		}
+ 	}
++
++	struct timeval tv = {5, 0};
++	setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv));
++	setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (const char*)&tv, sizeof(tv));
++
+ 	if(SOCKADDR_UNION_AF(&bind_addr) == raddr->ai_family &&
+ 	   bindtoip(fd, &bind_addr) == -1)
+ 		goto eval_errno;
+@@ -198,9 +345,22 @@
+ 		af = SOCKADDR_UNION_AF(&client->addr);
+ 		void *ipdata = SOCKADDR_UNION_ADDRESS(&client->addr);
+ 		inet_ntop(af, ipdata, clientname, sizeof clientname);
+-		dolog("client[%d] %s: connected to %s:%d\n", client->fd, clientname, namebuf, port);
++		if (rule) {
++			dolog("client[%d] %s: %s:%d -> via %s:%d\n", client->fd, clientname, original_name, original_port, rule->upstream_name, rule->upstream_port);
++		} else {
++			dolog("client[%d] %s: connected to %s:%d\n", client->fd, clientname, namebuf, port);
++		}
+ 	}
+-	return fd;
++
++	if (rule) {
++		int result = upstream_handshake(rule, buf, n, client->fd, fd, original_port);
++		if (result < 0) {
++			close(fd);
++			return result;
++		}
++		return result;
++	}
++    return fd;
+ }
+ 
+ static int is_authed(union sockaddr_union *client, union sockaddr_union *authedip) {
+@@ -322,6 +482,7 @@
+ 	ssize_t n;
+ 	int ret;
+ 	enum authmethod am;
++	int used_rule = 0;
+ 	t->state = SS_1_CONNECTED;
+ 	while((n = recv(t->client.fd, buf, sizeof buf, 0)) > 0) {
+ 		switch(t->state) {
+@@ -345,12 +506,14 @@
+ 				}
+ 				break;
+ 			case SS_3_AUTHED:
+-				ret = connect_socks_target(buf, n, &t->client);
++				ret = connect_socks_target(buf, n, &t->client, &used_rule);
+ 				if(ret < 0) {
+ 					send_error(t->client.fd, ret*-1);
+ 					return -1;
+ 				}
+-				send_error(t->client.fd, EC_SUCCESS);
++				if (!used_rule) {
++					send_error(t->client.fd, EC_SUCCESS);
++				}
+ 				return ret;
+ 		}
+ 	}
+@@ -382,11 +545,131 @@
+ 	}
+ }
+ 
++static short host_get_port(char *name) {
++	int p,n;
++	char *c;
++	if((c = strrchr(name, ':')) && sscanf(c+1,"%d%n",&p, &n)==1 && n == (int)(strlen(c + 1)) && p >= 0 && p < USHRT_MAX)
++		return (*c='\0'),(short)p;
++	else
++		return -1;
++}
++
++static int fwd_rules_add(char *str) {
++	char *match = NULL, *upstream = NULL, *remote = NULL;
++	unsigned short match_port, upstream_port, remote_port;
++	int ncred;
++
++	if(sscanf(str, "%m[^,],%n%m[^,],%ms\n", &match, &ncred, &upstream, &remote) != 3)
++		return 1;
++
++	match_port = host_get_port(match);
++	upstream_port = host_get_port(upstream);
++	remote_port = host_get_port(remote);
++
++	if(match_port < 0 || upstream_port <= 0 || remote_port < 0) {
++		free(match);
++		free(upstream);
++		free(remote);
++		return 1;
++	}
++
++	char *match_copy = strdup(match);
++	char *upstream_copy = strdup(upstream);
++	char *remote_copy = strdup(remote);
++
++	struct fwd_rule *rule = (struct fwd_rule*)malloc(sizeof(struct fwd_rule));
++	if (!rule) {
++		free(match_copy);
++		free(upstream_copy);
++		free(remote_copy);
++		free(match);
++		free(upstream);
++		free(remote);
++		return 1;
++	}
++
++	if(strcmp(match_copy, "0.0.0.0") == 0 || strcmp(match_copy, "*") == 0) {
++		free(match_copy);
++		rule->match_name = strdup("");
++	} else {
++		rule->match_name = match_copy;
++	}
++	rule->match_port = match_port;
++	rule->auth_buf = NULL;
++	rule->auth_len = 0;
++
++	char *at_sign = strchr(upstream_copy, '@');
++	if (at_sign) {
++		*at_sign = '\0';
++		char *auth_part = upstream_copy;
++		char *host_part = at_sign + 1;
++		char *colon = strchr(auth_part, ':');
++		if (!colon) {
++			free(rule);
++			free(upstream_copy);
++			free(remote_copy);
++			free(match);
++			free(upstream);
++			free(remote);
++			return 1;
++		}
++		*colon++ = '\0';
++		char *username = auth_part;
++		char *password = colon;
++		size_t ulen = strlen(username);
++		size_t plen = strlen(password);
++		if (ulen > 255 || plen > 255) {
++			free(rule);
++			free(upstream_copy);
++			free(remote_copy);
++			free(match);
++			free(upstream);
++			free(remote);
++			return 1;
++		}
++		rule->auth_len = 1 + 1 + ulen + 1 + plen;
++		rule->auth_buf = malloc(rule->auth_len);
++		rule->auth_buf[0] = 1;
++		rule->auth_buf[1] = ulen;
++		memcpy(&rule->auth_buf[2], username, ulen);
++		rule->auth_buf[2 + ulen] = plen;
++		memcpy(&rule->auth_buf[3 + ulen], password, plen);
++		rule->upstream_name = strdup(host_part);
++		rule->upstream_port = upstream_port;
++		/* hide from ps */
++		memset(str+ncred, '*', ulen+1+plen);
++	} else {
++		rule->upstream_name = strdup(upstream_copy);
++		rule->upstream_port = upstream_port;
++	}
++
++	free(upstream_copy);
++	short rlen = strlen(remote_copy);
++	rule->req_len = 3 + 1 + 1 + rlen + 2;
++	rule->req_buf = (char*)malloc(rule->req_len);
++	rule->req_buf[0] = 5;
++	rule->req_buf[1] = 1;
++	rule->req_buf[2] = 0;
++	rule->req_buf[3] = 3;
++	rule->req_buf[4] = rlen;
++	memcpy(&rule->req_buf[5], remote_copy, rlen);
++	unsigned short rport = remote_port ? remote_port : 0;
++	rule->req_buf[5 + rlen]     = (rport >> 8) & 0xFF;
++	rule->req_buf[5 + rlen + 1] = (rport & 0xFF);
++	free(remote_copy);
++	sblist_add(fwd_rules, rule);
++	free(match);
++	free(upstream);
++	free(remote);
++
++	return 0;
++}
++
+ static int usage(void) {
+ 	dprintf(2,
+ 		"MicroSocks SOCKS5 Server\n"
+ 		"------------------------\n"
+-		"usage: microsocks -1 -q -i listenip -p port -u user -P pass -b bindaddr -w ips\n"
++		"usage: microsocks -1 -q -i listenip -p port -u user -P pass -b bindaddr -w ips -f fwdrule\n"
+ 		"all arguments are optional.\n"
+ 		"by default listenip is 0.0.0.0 and port 1080.\n\n"
+ 		"option -q disables logging.\n"
+@@ -401,6 +684,12 @@
+ 		" this is handy for programs like firefox that don't support\n"
+ 		" user/pass auth. for it to work you'd basically make one connection\n"
+ 		" with another program that supports it, and then you can use firefox too.\n"
++		"option -f specifies a forwarding rule of the form\n"
++		"  match_name:match_port,[user:password@]upstream_name:upstream_port,remote_name:remote_port\n"
++		" this will cause requests that /match/ to be renamed to /remote/\n"
++		" and sent to the /upstream/ SOCKS5 proxy server.\n"
++		" this option may be specified multiple times.\n"
++		"option -V prints version information and exits.\n"
+ 	);
+ 	return 1;
+ }
+@@ -416,7 +705,7 @@
+ 	const char *listenip = "0.0.0.0";
+ 	char *p, *q;
+ 	unsigned port = 1080;
+-	while((ch = getopt(argc, argv, ":1qb:i:p:u:P:w:")) != -1) {
++	while((ch = getopt(argc, argv, ":1qb:i:p:u:P:w:f:V")) != -1) {
+ 		switch(ch) {
+ 			case 'w': /* fall-through */
+ 			case '1':
+@@ -456,11 +745,20 @@
+ 			case 'p':
+ 				port = atoi(optarg);
+ 				break;
++			case 'f':
++				if(!fwd_rules)
++					fwd_rules = sblist_new(sizeof(struct fwd_rule), 16);
++				if(fwd_rules_add(optarg))
++					return dprintf(2, "error: could not parse forwarding rule %s\n", optarg), 1;
++				break;
+ 			case ':':
+ 				dprintf(2, "error: option -%c requires an operand\n", optopt);
+ 				/* fall through */
+ 			case '?':
+ 				return usage();
++			case 'V':
++				dprintf(1, "MicroSocks %s\n", MICROSOCKS_VERSION);
++				return 0;
+ 		}
+ 	}
+ 	if((auth_user && !auth_pass) || (!auth_user && auth_pass)) {

naiveproxy/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=138.0.7204.35
-PKG_RELEASE:=1
+PKG_VERSION:=143.0.7499.109
+PKG_RELEASE:=2
 
 ARCH_PREBUILT:=$(ARCH_PACKAGES)
 
@@ -25,47 +25,47 @@ PKG_SOURCE:=naiveproxy-v$(PKG_VERSION)-$(PKG_RELEASE)-openwrt-$(ARCH_PREBUILT).t
 PKG_SOURCE_URL:=https://github.com/klzgrad/naiveproxy/releases/download/v$(PKG_VERSION)-$(PKG_RELEASE)/
 
 ifeq ($(ARCH_PREBUILT),aarch64_cortex-a53)
-  PKG_HASH:=45c8b1f19d53f3e0c30bd591a0ba29e511295f7eb9c5ebeaee9dcb483e477d44
+  PKG_HASH:=e5eec05d7e799c4b6f93adb02129246142a88e427d76d6275a0312872031a1db
 else ifeq ($(ARCH_PREBUILT),aarch64_cortex-a72)
-  PKG_HASH:=2eb876e77a067f93e50370a1d7ebef497f948e76a732a698aac17b777c2e02da
+  PKG_HASH:=ca7975f7b711d1936d44b7a3676d4ddec59dd84339da0e28aa8bbc1fa738523a
 else ifeq ($(ARCH_PREBUILT),aarch64_generic)
-  PKG_HASH:=b0303b6c1147d563454605e3e2fda651aa40a8a7189b3c15245389557539b516
+  PKG_HASH:=a4b34126901ad577a018332dd8cfa015ca5de1dcbbcf445465fb5a89a29a6b29
 else ifeq ($(ARCH_PREBUILT),arm_arm1176jzf-s_vfp)
-  PKG_HASH:=11f3aa85008935a7bce61e69117d0fec66b31ce7a8394d1ccb47f1fb66d00c35
+  PKG_HASH:=ec0a9a76bc51d7608897db9d87c3e52a889989856b3456cf1b35c4a42891fc40
 else ifeq ($(ARCH_PREBUILT),arm_arm926ej-s)
-  PKG_HASH:=c5838f4149efbc7b2e01d6f2c94f7585edc3b51ebc072e88f4e8d6e709125b02
+  PKG_HASH:=bdd03cdec1f7215369cafdc7922f3d78ecd570a59d5cd04e829cab33c6dbc68e
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a15_neon-vfpv4)
-  PKG_HASH:=a514d92010d2999ddbfe073e61dc9ea7f58414845077114979950ff5078a72ee
+  PKG_HASH:=fce86759321a06cc373ceef1a38fee456cf0383cc466a3762671b9a0fc4e13ba
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a5_vfpv4)
-  PKG_HASH:=1e2677d68d9c81b7505ada6ed146177e53dca708fa878c5105b87812df20c797
+  PKG_HASH:=3bb0eef45955ccb656c0b074db40024e35a96c0588250534d25468242b21e067
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a7)
-  PKG_HASH:=e9047f458ecba7cfc4c722d0180c1a4d823d9edbde41e4abce0f293c52712b0f
+  PKG_HASH:=42c95ce44d9abb1472f4817b5839252fc418cecd3b1d683a0211ca98e7e9a21f
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a7_neon-vfpv4)
-  PKG_HASH:=954cea8e06240e6391d7057765335c6ac20fdbc42dcde9d20c2e4aa55a75a9e1
+  PKG_HASH:=7222d40cc5b0f29e5858e6023e713cc69174672b2489a8c8525d031822b38230
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a7_vfpv4)
-  PKG_HASH:=6d739e11f4df930139744d982ee9e98050cf6778ff0af90bf5e128f789f26b61
+  PKG_HASH:=1c15ceeb689d686e198afd0c1bb72b6c54ef89bde5b347205d6c2cedf359f37a
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a8_vfpv3)
-  PKG_HASH:=8f3de0015d28c341d8dd303bd770ffaf4cf05767a4af3612218da78a54d01c6e
+  PKG_HASH:=a5f370df608aba401cb5a761c17f994d27d1a912be1aa9c7bcc0417314ecfb62
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a9)
-  PKG_HASH:=bf15aaaf307ac86cbd3fc9c9a8a107103d2682ba227f54fd2d2a2def252b8fca
+  PKG_HASH:=f5df82bd5d3a45e8869026977c2d30bac6ccc258dadb7046e3306d4e54395741
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a9_neon)
-  PKG_HASH:=c5788e9ce8eef9d526390ef04966668ffd9e9f40af194257fb9600362585032f
+  PKG_HASH:=7600df27693dda5f43c7d38715b9d4664db77ed4488c77da822c690cb28fcf90
 else ifeq ($(ARCH_PREBUILT),arm_cortex-a9_vfpv3-d16)
-  PKG_HASH:=5c93593112ad72c75d35fc41b6d6ed3c1115dcf8aa30f9bc61303696f31fa551
+  PKG_HASH:=c010124d705e19da53e0df4658c23a5ad0ff71e89f8819e01f9e7011160042fa
 else ifeq ($(ARCH_PREBUILT),arm_mpcore)
-  PKG_HASH:=ee481d71ff9735e221f8a58601690f11315613f4e77678bbe3ab25236d5ad36a
+  PKG_HASH:=6ccbf7cf6b17b4cf4ab7b29b12a279b1fc79257f2fc569e81a5af6bda18819f4
 else ifeq ($(ARCH_PREBUILT),arm_xscale)
-  PKG_HASH:=3719a7d151c1d80250388cea32f74165772d8cc21b8bfa9c6a8db312ae19a0b8
+  PKG_HASH:=5367433f1759aa0b947f6180c9d1944205629d7829db9f3466bd38d40da57ae0
 else ifeq ($(ARCH_PREBUILT),mipsel_24kc)
-  PKG_HASH:=1aa0c1fbe81242cf4c14a6c83fd32f8548a3691233c2078a640619c2b3bfd7c4
+  PKG_HASH:=444a59288e3e7e80b2ca04fb4d6fb9a046a624cb01a9cea2314834c736561433
 else ifeq ($(ARCH_PREBUILT),mipsel_mips32)
-  PKG_HASH:=9f909d879602a0feeb2535e0859339a0496cdd948fb2f64c491bc5cf324f93f0
+  PKG_HASH:=fa568b8a8ed8505a99d5ca30568cbdb2539cc48d218c338a321fba116632daa1
 else ifeq ($(ARCH_PREBUILT),riscv64)
-  PKG_HASH:=df183679a499ce65f3ff2e7561a551dd890c4acd6bfdeb97fdf729c97d195bac
+  PKG_HASH:=13c1a43e58cef7219baf828250afb9390fd2ed9379d30f7d7b182db61492fe69
 else ifeq ($(ARCH_PREBUILT),x86)
-  PKG_HASH:=f9ca7ee068b2317c8a9e1155ed692cb99d3ba35f5ea4e0dcb56d63efa8764839
+  PKG_HASH:=8088dd1ea80321109248f68f6f1a7c45f5b4dc0982992aabde725c3503a5b442
 else ifeq ($(ARCH_PREBUILT),x86_64)
-  PKG_HASH:=c6a6526432d76a2a19412869fd37a99ffa9f832c992791fc26983965ad3f0726
+  PKG_HASH:=5681e13c833757cfb5769755fd93d1906c47448af190585067bde9de590bdb2e
 else
   PKG_HASH:=dummy
 endif

naiveproxy/files/naiveproxy.init

@@ -1,34 +1,28 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2021 ImmortalWrt
 
-. /lib/functions.sh
-. /lib/functions/procd.sh
-
 USE_PROCD=1
-
 START=99
-STOP=10
 
-init_conf() {
-	config_load "naiveproxy"
-	config_get "enable" "config" "enable" "0"
+NAME="naiveproxy"
+
+start_service() {
+	config_load "$NAME"
+	config_get_bool "enable" "config" "enable" "0"
+	[ "$enable" -eq "1" ] || return 1
+
 	config_get "listen_addr" "config" "listen_addr"
 	config_get "server_addr" "config" "server_addr"
 	config_get "extra_argument" "config" "extra_argument"
-}
-
-start_service() {
-	init_conf
-	[ "${enable}" == "1" ] || return 0
 
 	procd_open_instance naiveproxy
 
 	procd_set_param command naive
-	procd_append_param command --listen="${listen_addr}"
-	procd_append_param command --proxy="${server_addr}"
-	[ -n "${extra_argument}" ] && procd_append_param command "${extra_argument}"
+	procd_append_param command --listen="$listen_addr"
+	procd_append_param command --proxy="$server_addr"
+	[ -n "$extra_argument" ] && procd_append_param command $extra_argument
 
-	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+	procd_set_param respawn
 	procd_set_param limits core="unlimited"
 	procd_set_param stdout 1
 	procd_set_param stderr 1
@@ -36,12 +30,6 @@ start_service() {
 	procd_close_instance
 }
 
-reload_service()
-{
-	stop
-	start
-}
-
 service_triggers() {
-        procd_add_reload_trigger "naiveproxy"
+        procd_add_reload_trigger "$NAME"
 }

shadowsocks-libev/Makefile

@@ -20,8 +20,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev.git
 PKG_SOURCE_DATE:=2025-1-20
 PKG_SOURCE_VERSION:=9afa3cacf947f910be46b69fc5a7a1fdd02fd5e6
-PKG_MIRROR_HASH:=575b21803b28db8ab59ecbdb2cf21c4282881507b3a4267cc24f55bad12819cb
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=b56d015394a3217750ec232570e012461a30af17de20d5598c3b026c8fcaa5b5
 
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
 

shadowsocks-rust/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadowsocks-rust
-PKG_VERSION:=1.23.5
+PKG_VERSION:=1.24.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/shadowsocks/shadowsocks-rust/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=edeef2408ae54108fa176b4e59cb04b4ef4dbe62da96d2459d9821b238ad94e8
+PKG_HASH:=a89865d1c5203de1b732017dd032e85f943d1592e8d3152eb7d2c4f3fca387bf
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MIT

shadowsocksr-libev/Makefile

@@ -14,8 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev
 PKG_SOURCE_DATE:=2018-03-07
 PKG_SOURCE_VERSION:=d63ff863800a5645aca4309d5dd5962bd1e95543
-PKG_MIRROR_HASH:=34308ed827a5dd4f4e35619914102d55b00604faa44fda051d1d25fb4a319325
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=146fa4511a52da2aaa1e11ea0294cfb450e62643156c5da3b10e037ef43961f6
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=LICENSE

simple-obfs/Makefile

@@ -1,6 +1,9 @@
 #
 # Copyright (C) 2017-2019 Jian Chang <aa65535@live.com>
 #
+# Copyright (C) 2021 ImmortalWrt
+# <https://immortalwrt.org>
+#
 # This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
@@ -9,55 +12,49 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simple-obfs
 PKG_VERSION:=0.0.5
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/shadowsocks/simple-obfs.git
-PKG_MIRROR_HASH:=ea8f2b9825bbb87d5d860524e29bade265141687338db2dbf7ecd32690cf02fc
+PKG_SOURCE_DATE:=2019-08-17
 PKG_SOURCE_VERSION:=486bebd9208539058e57e23a12f23103016e09b4
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=bc97eba511b86a089ab4bcf0ac78d9e4a39c59046d5cde77b79a118245daa0ba
 
 PKG_LICENSE:=GPL-3.0-or-later
-PKG_LICENSE_FILES:=COPYING LICENSE
+PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jian Chang <aa65535@live.com>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-PKG_USE_MIPS16:=0
-PKG_BUILD_FLAGS:=no-mips16
-PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=libev
-
-PKG_CONFIG_DEPENDS:= CONFIG_SIMPLE_OBFS_STATIC_LINK
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/simple-obfs
+define Package/simple-obfs/template
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=Simple-obfs
 	URL:=https://github.com/shadowsocks/simple-obfs
-	DEPENDS:=+libpthread +!SIMPLE_OBFS_STATIC_LINK:libev
+	DEPENDS:=+libpthread +libev
 endef
 
-Package/simple-obfs-server = $(Package/simple-obfs)
+define Package/simple-obfs-client
+	$(call Package/simple-obfs/template)
+	TITLE+= (client)
+	PROVIDES:=simple-obfs
+endef
 
-define Package/simple-obfs-server/config
-menu "Simple-obfs Compile Configuration"
-	depends on PACKAGE_simple-obfs || PACKAGE_simple-obfs-server
-	config SIMPLE_OBFS_STATIC_LINK
-		bool "enable static link libraries."
-		default n
-endmenu
+define Package/simple-obfs-server
+	$(call Package/simple-obfs/template)
+	TITLE+= (server)
 endef
 
 define Package/simple-obfs/description
-Simple-obfs is a simple obfusacting tool, designed as plugin server of shadowsocks.
+	Simple-obfs is a simple obfusacting tool, designed as plugin server of shadowsocks.
 endef
 
+Package/simple-obfs-client/description = $(Package/simple-obfs/description)
 Package/simple-obfs-server/description = $(Package/simple-obfs/description)
 
 CONFIGURE_ARGS += \
@@ -65,21 +62,15 @@ CONFIGURE_ARGS += \
 	--disable-documentation \
 	--disable-assert
 
-ifeq ($(CONFIG_SIMPLE_OBFS_STATIC_LINK),y)
-	CONFIGURE_ARGS += \
-		--with-ev="$(STAGING_DIR)/usr" \
-		LDFLAGS="-Wl,-static -static -static-libgcc"
-endif
-
-define Package/simple-obfs/install
+define Package/simple-obfs-client/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/obfs-local $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/obfs-local $(1)/usr/bin/obfs-local
 endef
 
 define Package/simple-obfs-server/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/obfs-server $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/obfs-server $(1)/usr/bin/obfs-server
 endef
 
-$(eval $(call BuildPackage,simple-obfs))
+$(eval $(call BuildPackage,simple-obfs-client))
 $(eval $(call BuildPackage,simple-obfs-server))

simple-obfs/patches/001-convert-arguments-of-isdigit-to-int.patch

@@ -0,0 +1,22 @@
+From bc8014cd6637798ee96b9394c716eff46115c002 Mon Sep 17 00:00:00 2001
+From: DDoSolitary <DDoSolitary@gmail.com>
+Date: Thu, 12 Mar 2020 12:15:37 +0800
+Subject: [PATCH] Convert arguments of isdigit to int.
+
+---
+ src/utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index 67cc250..514a001 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -92,7 +92,7 @@ int
+ ss_isnumeric(const char *s) {
+     if (!s || !*s)
+         return 0;
+-    while (isdigit(*s))
++    while (isdigit((int)*s))
+         ++s;
+     return *s == '\0';
+ }

sing-box/Makefile

@@ -1,141 +1,132 @@
+# SPDX-License-Identifier: GPL-3.0-only
 #
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2022-2023 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sing-box
-PKG_VERSION:=1.12.3
+PKG_VERSION:=1.12.14
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3dce8ee383655908451f7f193714f0c8f90b8fd4baecb8e7e3948d263d766359
+PKG_HASH:=f19761d09f88e2d33aadfdb3c4ff471654f34b28561826e4786b9859654ca887
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_SING_BOX_BUILD_ACME \
+	CONFIG_SING_BOX_BUILD_CLASH_API \
+	CONFIG_SING_BOX_BUILD_DHCP \
+	CONFIG_SING_BOX_BUILD_EMBEDDED_TOR \
+	CONFIG_SING_BOX_BUILD_GRPC \
+	CONFIG_SING_BOX_BUILD_GVISOR \
+	CONFIG_SING_BOX_BUILD_QUIC \
+	CONFIG_SING_BOX_BUILD_TAILSCALE \
+	CONFIG_SING_BOX_BUILD_UTLS \
+	CONFIG_SING_BOX_BUILD_V2RAY_API \
+	CONFIG_SING_BOX_BUILD_WIREGUARD
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
 PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=github.com/sagernet/sing-box
 GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/sing-box
-GO_PKG_LDFLAGS_X:=$(GO_PKG)/constant.Version=v$(PKG_VERSION)
+GO_PKG_LDFLAGS_X:=$(GO_PKG)/constant.Version=$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-define Package/$(PKG_NAME)
+define Package/sing-box
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
-  TITLE:=The universal proxy platform.
-  URL:=https://sing-box.sagernet.org
+  TITLE:=The universal proxy platform
+  URL:=https://sing-box.sagernet.org/
   DEPENDS:=$(GO_ARCH_DEPENDS) \
     +ca-bundle \
     +kmod-inet-diag \
     +kmod-netlink-diag \
-    +kmod-tun
+    +SING_BOX_BUILD_GVISOR:kmod-tun
+  USERID:=sing-box=5566:sing-box=5566
 endef
 
-define Package/$(PKG_NAME)/description
-  Sing-box is a universal proxy platform which supports hysteria, SOCKS,
-  Shadowsocks, ShadowTLS, Tor, trojan, VLess, VMess, WireGuard and so on.
+define Package/sing-box/description
+  Sing-box is a universal proxy platform which supports hysteria, SOCKS, Shadowsocks,
+  ShadowTLS, Tor, trojan, VLess, VMess, WireGuard and so on.
 endef
 
-GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=1
+define Package/sing-box/config
+  if PACKAGE_sing-box
+    config SING_BOX_BUILD_ACME
+    bool "Build with ACME TLS certificate issuer support"
+    default y
 
-define Package/$(PKG_NAME)/config
-  menu "Customizing build tags"
-    depends on PACKAGE_sing-box
+    config SING_BOX_BUILD_CLASH_API
+    bool "Build with Clash API support"
+    default y
 
-    config SING_BOX_WITH_ACME
-      bool "Build with ACME TLS certificate issuer support"
-      default n
+    config SING_BOX_BUILD_DHCP
+    bool "Build with DHCP support"
 
-    config SING_BOX_WITH_CLASH_API
-      bool "Build with Clash API support (EXPERIMENTAL!!!)"
-      default y
+    config SING_BOX_BUILD_EMBEDDED_TOR
+    bool "Build with embedded Tor support"
+    depends on BROKEN
 
-    config SING_BOX_WITH_DHCP
-      bool "Build with DHCP support"
-      default y
+    config SING_BOX_BUILD_GRPC
+    bool "Build with standard gPRC support"
+    help
+      Standard gRPC has good compatibility but poor performance.
 
-    config SING_BOX_WITH_ECH
-      bool "Build with TLS ECH extension support"
-      default y
+    config SING_BOX_BUILD_GVISOR
+    bool "Build with gVisor support"
+    default y
 
-    config SING_BOX_WITH_GRPC
-      bool "Build with standard gRPC support"
-      default n
-      help
-      sing-box has better performance gun-lite gRPC built-in by default.
-      This standard gRPC has better compatibility but poor performance.
+    config SING_BOX_BUILD_QUIC
+    bool "Build with QUIC support"
+    default y
+    help
+      Required by HTTP3 DNS transports, Naive inbound,
+      Hysteria inbound / outbound, and v2ray QUIC transport.
 
-    config SING_BOX_WITH_GVISOR
-      bool "Build with gVisor support"
-      default y
+    config SING_BOX_BUILD_TAILSCALE
+    bool "Build with Tailscale support"
+    default y
 
-    config SING_BOX_WITH_QUIC
-      bool "Build with QUIC support"
-      default y
-      help
-        Required by HTTP3 DNS transports, Naive inbound,
-        Hysteria inbound / outbound, and v2ray QUIC transport.
+    config SING_BOX_BUILD_UTLS
+    bool "Build with uTLS support"
+    default y
 
-    config SING_BOX_WITH_REALITY_SERVER
-      bool "Build with reality TLS server support"
-      default n
+    config SING_BOX_BUILD_V2RAY_API
+    bool "Build with V2Ray API support"
 
-    config SING_BOX_WITH_UTLS
-      bool "Build with uTLS support"
-      default y
-
-    config SING_BOX_WITH_V2RAY_API
-      bool "Build with V2Ray API support (EXPERIMENTAL!!!)"
-      default n
-
-    config SING_BOX_WITH_WIREGUARD
-      bool "Build with WireGuard support"
-      default y
-
-  endmenu
+    config SING_BOX_BUILD_WIREGUARD
+    bool "Build with WireGuard support"
+    default y
+  endif
 endef
 
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_SING_BOX_WITH_ACME \
-	CONFIG_SING_BOX_WITH_CLASH_API \
-	CONFIG_SING_BOX_WITH_DHCP \
-	CONFIG_SING_BOX_WITH_ECH \
-	CONFIG_SING_BOX_WITH_GRPC \
-	CONFIG_SING_BOX_WITH_GVISOR \
-	CONFIG_SING_BOX_WITH_QUIC \
-	CONFIG_SING_BOX_WITH_REALITY_SERVER \
-	CONFIG_SING_BOX_WITH_UTLS \
-	CONFIG_SING_BOX_WITH_V2RAY_API \
-	CONFIG_SING_BOX_WITH_WIREGUARD
-
 GO_PKG_TAGS:=$(subst $(space),$(comma),$(strip \
-	$(if $(CONFIG_SING_BOX_WITH_ACME),with_acme) \
-	$(if $(CONFIG_SING_BOX_WITH_CLASH_API),with_clash_api) \
-	$(if $(CONFIG_SING_BOX_WITH_DHCP),with_dhcp) \
-	$(if $(CONFIG_SING_BOX_WITH_ECH),with_ech) \
-	$(if $(CONFIG_SING_BOX_WITH_GRPC),with_grpc) \
-	$(if $(CONFIG_SING_BOX_WITH_GVISOR),with_gvisor) \
-	$(if $(CONFIG_SING_BOX_WITH_QUIC),with_quic) \
-	$(if $(CONFIG_SING_BOX_WITH_REALITY_SERVER),with_reality_server) \
-	$(if $(CONFIG_SING_BOX_WITH_UTLS),with_utls) \
-	$(if $(CONFIG_SING_BOX_WITH_V2RAY_API),with_v2ray_api) \
-	$(if $(CONFIG_SING_BOX_WITH_WIREGUARD),with_wireguard) \
+	$(if $(CONFIG_SING_BOX_BUILD_ACME),with_acme) \
+	$(if $(CONFIG_SING_BOX_BUILD_CLASH_API),with_clash_api) \
+	$(if $(CONFIG_SING_BOX_BUILD_DHCP),with_dhcp) \
+	$(if $(CONFIG_SING_BOX_BUILD_EMBEDDED_TOR),with_embedded_tor) \
+	$(if $(CONFIG_SING_BOX_BUILD_GRPC),with_grpc) \
+	$(if $(CONFIG_SING_BOX_BUILD_GVISOR),with_gvisor) \
+	$(if $(CONFIG_SING_BOX_BUILD_QUIC),with_quic) \
+	$(if $(CONFIG_SING_BOX_BUILD_TAILSCALE),with_tailscale) \
+	$(if $(CONFIG_SING_BOX_BUILD_UTLS),with_utls) \
+	$(if $(CONFIG_SING_BOX_BUILD_V2RAY_API),with_v2ray_api) \
+	$(if $(CONFIG_SING_BOX_BUILD_WIREGUARD),with_wireguard) \
 ))
 
-define Package/$(PKG_NAME)/conffiles
+define Package/sing-box/conffiles
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/sing-box/install
 	$(call GoPackage/Package/Install/Bin,$(1))
 endef
 

tcping/Makefile

@@ -1,46 +1,36 @@
+# SPDX-License-Identifier: GPL-3.0-only
 #
-# Copyright (C) 2014 OpenWrt-dist
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2021 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
-
 PKG_NAME:=tcping
 PKG_VERSION:=0.3
 PKG_RELEASE:=1
 
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/Lienol/tcping.git
+PKG_SOURCE_DATE:=2020-07-04
+PKG_SOURCE_VERSION:=db9101834732dac9aaa59dbb7fb9c74612dbf723
+PKG_MIRROR_HASH:=36776bf64c41d0c2c2aeb79525499532831133f7b5e174fc51e9e2d7202d5776
+
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=license.txt
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/Lienol/tcping
-PKG_MIRROR_HASH:=79414cd8e1d124422a36b8fe36a1f296b7d9bde99807b2c90ad81bbd65e200e0
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=db9101834732dac9aaa59dbb7fb9c74612dbf723
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tcping
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=tcping measures the latency of a tcp-connection
-	URL:=https://github.com/jlyo/tcping
-endef
-
-define Package/tcping/description
-endef
-
-define Package/tcping/conffiles
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=tcping measures the latency of a tcp-connection
+  URL:=https://github.com/jlyo/tcping
 endef
 
 define Package/tcping/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,tcping))

trojan-plus/Makefile

@@ -14,8 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/peter-tank/trojan-plus.git
 PKG_SOURCE_DATE:=2020-09-06
 PKG_SOURCE_VERSION:=a6394cdd718669b0c7491493a78e61f6f0f899b3
-PKG_MIRROR_HASH:=2d37d09fe6d39d7981116ad387706f58f2b30b74a34e27fc5608f267dacc9208
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=0bc832390044668dc163e9fec3c6cf7ac3037dc30a706e94292d974446c43d97
 
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=openssl
@@ -26,6 +25,7 @@ PKG_MAINTAINER:=Trojan-Plus-Group
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
+include ./boost-version.mk
 
 TARGET_CXXFLAGS += -Wall -Wextra
 TARGET_CXXFLAGS += $(FPIC)
@@ -59,7 +59,8 @@ define Package/trojan-plus
 	URL:=https://github.com/Trojan-Plus-Group/trojan-plus
 	DEPENDS:= \
 		+libpthread +libstdcpp +libopenssl \
-		+boost +boost-system +boost-program_options
+		+boost +boost-program_options \
+		$(if $(filter y,$(NEED_BOOST_SYSTEM)),,+boost-system)
 endef
 
 define Package/trojan-plus/install

trojan-plus/boost-version.mk

@@ -0,0 +1,12 @@
+# boost-version.mk
+BOOST_MAKEFILE := $(firstword $(shell find -L $(TOPDIR) -type f -path "*/boost/Makefile"))
+
+BOOST_PKG_VERSION := $(shell grep '^PKG_VERSION:=' $(BOOST_MAKEFILE) | head -n1 | cut -d= -f2)
+
+BOOST_VER_MAJOR := $(word 1,$(subst ., ,$(BOOST_PKG_VERSION)))
+BOOST_VER_MINOR := $(word 2,$(subst ., ,$(BOOST_PKG_VERSION)))
+BOOST_VER_PATCH := $(word 3,$(subst ., ,$(BOOST_PKG_VERSION)))
+
+BOOST_VERSION_CODE := $(shell echo $$(($(BOOST_VER_MAJOR)*100000 + $(BOOST_VER_MINOR)*100 + $(BOOST_VER_PATCH))))
+
+NEED_BOOST_SYSTEM := $(if $(shell [ $(BOOST_VERSION_CODE) -ge 108900 ] && echo y),y,n)

trojan-plus/patches/002-Fix-boost1.89-build.patch

@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -184,26 +184,45 @@ endif()
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ 
+ if (ANDROID)
+-    set(ANDROID_MY_LIBS ${PROJECT_SOURCE_DIR}/trojan-plus-android-libs) 
++    set(ANDROID_MY_LIBS ${PROJECT_SOURCE_DIR}/trojan-plus-android-libs)
++
++    find_path(BOOST_INCLUDE_DIR
++        NAMES boost/version.hpp
++        HINTS ${ANDROID_MY_LIBS}/include
++    )
++
+     set(ANDROID_MY_LIBS_LIBRARIES 
+         ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libssl.a 
+         ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libcrypto.a
+-        ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_system.a
+         ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_program_options.a)
+ 
++    if(BOOST_INCLUDE_DIR)
++        file(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp" BOOST_VERSION_LINE REGEX "^#define BOOST_VERSION ")
++        string(REGEX REPLACE "^#define BOOST_VERSION ([0-9]+)" "\\1" BOOST_VERSION ${BOOST_VERSION_LINE})
++
++        if(${BOOST_VERSION} VERSION_LESS 108900)
++            list(APPEND ANDROID_MY_LIBS_LIBRARIES ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_system.a)
++        endif()
++    endif()
++
+     set(OPENSSL_VERSION 1.1.1)
+ 
+     include_directories(${ANDROID_MY_LIBS}/include)
+     target_link_libraries(trojan ${ANDROID_MY_LIBS_LIBRARIES})
+ else()
+-    find_package(Boost 1.66.0 REQUIRED COMPONENTS system program_options)
++    find_package(Boost 1.66.0 REQUIRED)
++    if (Boost_MAJOR_VERSION LESS_EQUAL 1 AND Boost_MINOR_VERSION LESS 89)
++        find_package(Boost 1.66.0 REQUIRED COMPONENTS system program_options)
++    else()
++        find_package(Boost 1.66.0 REQUIRED COMPONENTS program_options)
++    endif()
+     include_directories(${Boost_INCLUDE_DIR})
+     target_link_libraries(trojan ${Boost_LIBRARIES})
+     if(MSVC)
+         add_definitions(-DBOOST_DATE_TIME_NO_LIB)
+     endif()
+ 
+-    find_package(OpenSSL 1.1.0 REQUIRED)
++    find_package(OpenSSL 1.1.1 REQUIRED)
+     include_directories(${OPENSSL_INCLUDE_DIR})
+     target_link_libraries(trojan ${OPENSSL_LIBRARIES})
+ endif()

v2ray-geodata/Makefile

@@ -5,29 +5,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-geodata
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202507050144
+GEOIP_VER:=202512180020
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
-  URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
+  URL:=https://github.com/Loyalsoldier/geoip/releases/download/$(GEOIP_VER)/
   URL_FILE:=geoip.dat
   FILE:=$(GEOIP_FILE)
-  HASH:=d77289a7465b6e59df39a2d46bd02b30b4fa7dd70939c13d431fd2bd8f448e10
+  HASH:=63c20c159aeec8a13d61be9b89d0d1c82fecf4675f1c177db67e97477c89199d
 endef
 
-GEOSITE_VER:=20250627153051
-GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
+GEOSITE_VER:=202512202213
+GEOSITE_FILE:=geosite.dat.$(GEOSITE_VER)
 define Download/geosite
-  URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
-  URL_FILE:=dlc.dat
+  URL:=https://github.com/Loyalsoldier/v2ray-rules-dat/releases/download/$(GEOSITE_VER)/
+  URL_FILE:=geosite.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=01dae2a9c31b5c74ba7e54d8d51e0060688ed22da493eaf09f6eeeec89db395e
+  HASH:=3f43687438bde815719ce0bcd9ed21c7fa807b69caa98ee1c7d6ed8954a8ff1a
 endef
 
 define Package/v2ray-geodata/template

v2ray-plugin/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-plugin
-PKG_VERSION:=5.37.0
+PKG_VERSION:=5.41.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=7796924dc2dbd1ec392953467b3ff432cdcd266bf8d1c61b5a693fdc9e9a9230
+PKG_HASH:=75d83f24e60fb7e71e7774732f6ebcfbc00a1b3ae27f4702f75afb14055ce606
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

xray-core/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=Xray-core
-PKG_VERSION:=25.7.26
+PKG_VERSION:=25.12.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=99f9bc67fd22a6e4fde277a4ba05fd873146154851aeebb6b4f406a59d3b0bc3
+PKG_HASH:=d4519b2d9bb1871f4d7612aa7a8db1c451573b5a44ac824219bb44d63f404e61
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MPL-2.0