update script

3 files changed, 45 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bf79ecf376c..121c9413889a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = clash-premium-tun
 	pkgdesc = A rule-based tunnel in Go for Linux with TUN
 	pkgver = 2022.03.21
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Dreamacro/clash
 	install = clash-premium-tun.install
 	arch = i686
@@ -21,11 +21,11 @@ pkgbase = clash-premium-tun
 	conflicts = clash
 	backup = etc/clash/config.yaml
 	backup = etc/default/clash
-	source = git+https://github.com/Kr328/clash-premium-installer.git#commit=e729951
+	source = git+https://github.com/Kr328/clash-premium-installer.git#commit=c2b80f9
 	source = arch.patch
 	source = config.yaml
 	sha512sums = SKIP
-	sha512sums = 19287a6707d90d6fb699cbbfb09ba2e44bcfda7e1260f7d5d51c8c9135cdc5584cf671d095cb1b9ac7db9489c3e33affaa2ff4c3f1b4cd67ec1ab4d692edd4df
+	sha512sums = 0139f81960af17a8c3ac43a98bc847ee429ec168a8ff2e5393e5bf42d5df779ae6ce9ed33e4301e3888f475525e1777c919044c64979987df9d92c0647f83ab8
 	sha512sums = d7d9d4ee334068c14d80f567914775d2df9638b65d34763aab228dabcaeebace9db1a16f0e42ce657ade731ae34ebb23cee9a5cac8ad18b9c378606436266ffe
 	source_i686 = clash-linux-i686-2022.03.21.gz::https://release.dreamacro.workers.dev/2022.03.21/clash-linux-386-2022.03.21.gz
 	sha512sums_i686 = b175e9e001f4525a17daf596955bcda69c8b67fe2f747c4b16961a5b495fb4f45a4c6be889c35273c0f2202533c59f6b7edae432b207ca961705232c5aae9b24
diff --git a/PKGBUILD b/PKGBUILD
index 8e612783804c..40654cf81df5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=clash-premium-tun
 pkgver=2022.03.21
-pkgrel=2
+pkgrel=3
 pkgdesc="A rule-based tunnel in Go for Linux with TUN"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/Dreamacro/clash"
@@ -13,12 +13,12 @@ makedepends=('git' 'gzip')
 provides=('clash')
 conflicts=('clash')
 backup=("etc/clash/config.yaml" "etc/default/clash")
-source=("git+https://github.com/Kr328/clash-premium-installer.git#commit=e729951"
+source=("git+https://github.com/Kr328/clash-premium-installer.git#commit=c2b80f9"
         "arch.patch"
         "config.yaml")
 
 sha512sums=('SKIP'
-            '19287a6707d90d6fb699cbbfb09ba2e44bcfda7e1260f7d5d51c8c9135cdc5584cf671d095cb1b9ac7db9489c3e33affaa2ff4c3f1b4cd67ec1ab4d692edd4df'
+            '0139f81960af17a8c3ac43a98bc847ee429ec168a8ff2e5393e5bf42d5df779ae6ce9ed33e4301e3888f475525e1777c919044c64979987df9d92c0647f83ab8'
             'd7d9d4ee334068c14d80f567914775d2df9638b65d34763aab228dabcaeebace9db1a16f0e42ce657ade731ae34ebb23cee9a5cac8ad18b9c378606436266ffe')
 source_i686=("clash-linux-i686-${pkgver}.gz::https://release.dreamacro.workers.dev/${pkgver}/clash-linux-386-${pkgver}.gz")
 source_x86_64=("clash-linux-x86_64-${pkgver}.gz::https://release.dreamacro.workers.dev/${pkgver}/clash-linux-amd64-${pkgver}.gz")
diff --git a/arch.patch b/arch.patch
index 023d7514daed..5b9746f0b398 100644
--- a/arch.patch
+++ b/arch.patch
@@ -19,22 +19,23 @@ index 606c4f1..cab10be 100755
  
  exec "$@"
 diff --git a/scripts/clash-default b/scripts/clash-default
-index eca38ad..82a78dc 100644
+index 7bc4ca8..4f4f6a6 100644
 --- a/scripts/clash-default
 +++ b/scripts/clash-default
-@@ -10,6 +10,6 @@ NETFILTER_MARK=114514
+@@ -10,5 +10,7 @@ NETFILTER_MARK=114514
  IPROUTE2_TABLE_ID=114
  
  # dns redirect
 -FORWARD_DNS_REDIRECT=1.0.0.1:53
 +FORWARD_DNS_REDIRECT=198.18.0.2:53
  
- 
++# local subnet
++LOCAL_SUBNET="{127.0.0.0/8, 224.0.0.0/4, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12}"
 diff --git a/scripts/clash.service b/scripts/clash.service
-index 552e56c..494069a 100644
+index 18fa5fc..e333382 100644
 --- a/scripts/clash.service
 +++ b/scripts/clash.service
-@@ -1,11 +1,11 @@
+@@ -1,12 +1,12 @@
  [Unit]
  Description=A rule based proxy tunnel
 -After=network-online.target nftables.service iptabels.service
@@ -42,10 +43,42 @@ index 552e56c..494069a 100644
  
  [Service]
  Type=simple
--ExecStartPre=+/usr/lib/clash/setup-cgroup.sh
+ LimitNOFILE=65535
+-ExecStartPre=/usr/lib/clash/setup-cgroup.sh
 -ExecStart=/usr/bin/bypass-proxy /usr/bin/clash -d /srv/clash
 +ExecStartPre=+/usr/share/clash/setup-cgroup.sh
 +ExecStart=/usr/share/clash/bypass-proxy /usr/bin/clash -d /etc/clash
  
  [Install]
  WantedBy=multi-user.target
+diff --git a/scripts/setup-tun.sh b/scripts/setup-tun.sh
+index 2c1a601..5587a1e 100755
+--- a/scripts/setup-tun.sh
++++ b/scripts/setup-tun.sh
+@@ -8,8 +8,6 @@ ip rule del fwmark "$NETFILTER_MARK" lookup "$IPROUTE2_TABLE_ID" > /dev/null 2>
+ ip rule add fwmark "$NETFILTER_MARK" lookup "$IPROUTE2_TABLE_ID"
+ 
+ nft -f - << EOF
+-define LOCAL_SUBNET = {127.0.0.0/8, 224.0.0.0/4, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12}
+-
+ table clash
+ flush table clash
+ 
+@@ -20,7 +18,7 @@ table clash {
+         ip protocol != { tcp, udp } accept
+         
+         meta cgroup $BYPASS_CGROUP_CLASSID accept
+-        ip daddr \$LOCAL_SUBNET accept
++        ip daddr $LOCAL_SUBNET accept
+         
+         ct state new ct mark set $NETFILTER_MARK
+         ct mark $NETFILTER_MARK mark set $NETFILTER_MARK
+@@ -32,7 +30,7 @@ table clash {
+         ip protocol != { tcp, udp } accept
+     
+         iif utun accept
+-        ip daddr \$LOCAL_SUBNET accept
++        ip daddr $LOCAL_SUBNET accept
+         
+         mark set $NETFILTER_MARK
+     }