Merge branch 'bepass-org:master' into master

Author: Ptechgithub

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/go-build.yaml

@@ -83,30 +83,6 @@ jobs:
           go-version: '1.22'
           check-latest: true
 
-      - name: Cache wintun
-        id: cache
-        uses: actions/cache@v4
-        if: matrix.goos == 'windows'
-        env:
-          cache-name: cache-wintun
-        with:
-          path: ~/wintun-0.14.1.zip
-          key: wintun-0.14.1.zip
-
-      - name: Download wintun
-        if: matrix.goos == 'windows' && steps.cache.outputs.cache-hit != 'true'
-        run: |
-          curl -LO https://www.wintun.net/builds/wintun-0.14.1.zip --output-dir ~/
-          ls -lah ~/
-
-      - name: Validate wintun
-        if: matrix.goos == 'windows'
-        run: |
-          pushd ~/
-          echo "07c256185d6ee3652e09fa55c0b673e2624b565e02c4b9091c79ca7d2f24ef51 wintun-0.14.1.zip" | sha256sum --check --status
-          unzip ~/wintun-0.14.1.zip -d ~/wintun
-          popd
-
       - name: Build warp-plus
         run: |
           go build -v -o warp-plus_${{ env.ASSET_NAME }}/ -trimpath -ldflags "-s -w -buildid= -X main.version=${{ github.ref }}" ./cmd/warp-plus
@@ -117,17 +93,6 @@ jobs:
           cp ${GITHUB_WORKSPACE}/README.md ./warp-plus_${{ env.ASSET_NAME }}/README.md
           cp ${GITHUB_WORKSPACE}/LICENSE ./warp-plus_${{ env.ASSET_NAME }}/LICENSE
 
-      - name: Redistribute wintun.dll
-        if: matrix.goos == 'windows'
-        run: |
-          if [ "$GOARCH" = "amd64" ]; then
-            mv ~/wintun/wintun/bin/amd64/wintun.dll ./warp-plus_${{ env.ASSET_NAME }}/
-          elif [ "$GOARCH" = "arm64" ]; then
-            mv ~/wintun/wintun/bin/arm64/wintun.dll ./warp-plus_${{ env.ASSET_NAME }}/
-          elif [ "$GOARCH" = "386" ]; then
-            mv ~/wintun/wintun/bin/x86/wintun.dll ./warp-plus_${{ env.ASSET_NAME }}/
-          fi
-
       - name: Create ZIP archive
         shell: bash
         run: |

.gitignore

@@ -4,4 +4,3 @@
 /warp-scan.exe
 .idea
 stuff/
-wintun.dll

README.md

@@ -32,24 +32,24 @@ FLAGS
       --dns STRING         DNS address (default: 1.1.1.1)
       --gool               enable gool mode (warp in warp)
       --cfon               enable psiphon mode (must provide country as well)
-      --country STRING     psiphon country code (valid values: [AT BE BG BR CA CH CZ DE DK EE ES FI FR GB HR HU IE IN IT JP LV NL NO PL PT RO RS SE SG SK UA US]) (default: AT)
+      --country STRING     psiphon country code (valid values: [AT AU BE BG CA CH CZ DE DK EE ES FI FR GB HR HU IE IN IT JP LV NL NO PL PT RO RS SE SG SK US]) (default: AT)
       --scan               enable warp scanning
       --rtt DURATION       scanner rtt limit (default: 1s)
       --cache-dir STRING   directory to store generated profiles
-      --tun-experimental   enable tun interface (experimental)
-      --fwmark UINT        set linux firewall mark for tun mode (default: 4981)
+      --fwmark UINT        set linux firewall mark for tun mode (requires sudo/root/CAP_NET_ADMIN) (default: 0)
       --reserved STRING    override wireguard reserved value (format: '1,2,3')
       --wgconf STRING      path to a normal wireguard config
+      --test-url STRING    connectivity test url (default: http://connectivity.cloudflareclient.com/cdn-cgi/trace)
   -c, --config STRING      path to config file
       --version            displays version number
 ```
 
 ### Country Codes for Psiphon
 
 - Austria (AT)
+- Australia (AU)
 - Belgium (BE)
 - Bulgaria (BG)
-- Brazil (BR)
 - Canada (CA)
 - Switzerland (CH)
 - Czech Republic (CZ)
@@ -60,8 +60,8 @@ FLAGS
 - Finland (FI)
 - France (FR)
 - United Kingdom (GB)
-- Hungary (HU)
 - Croatia (HR)
+- Hungary (HU)
 - Ireland (IE)
 - India (IN)
 - Italy (IT)
@@ -76,7 +76,6 @@ FLAGS
 - Sweden (SE)
 - Singapore (SG)
 - Slovakia (SK)
-- Ukraine (UA)
 - United States (US)
 ![0](https://raw.githubusercontent.com/Ptechgithub/configs/main/media/line.gif)
 ### Termux