uppkg v1.16.11

3 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f5dbb3064ae..975b0aa99bde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = go-tun2socks
 	pkgdesc = A tun2socks implementation written in Go.
-	pkgver = 1.16.9
-	pkgrel = 1
+	pkgver = 1.16.11
+	pkgrel = 0
 	url = https://github.com/eycorsican/go-tun2socks
 	arch = x86_64
 	license = MIT
 	makedepends = go
 	makedepends = git
-	source = go-tun2socks-1.16.9.tar.gz::https://github.com/eycorsican/go-tun2socks/archive/v1.16.9.tar.gz
+	source = go-tun2socks-1.16.11.tar.gz::https://github.com/eycorsican/go-tun2socks/archive/v1.16.11.tar.gz
 	source = build-flags.patch
 	source = go-tun2socks.service
 	source = go-tun2socks.conf
 	source = go-tun2socks-setup
-	sha512sums = 31f606e3fb562001ca9a37a21c8095d3a2cb4c622b621611be8e47e3073b9741c4b1d77ca5a37bbb3ca2ec24b314d5f6a51d249593c7d8903ef71d8614c7e44b
-	sha512sums = 72a04943aa4e0cb8241c63a26d30c88cdbedf12b49f5f1c93dc97b1cb4f621c8e59736107d729f7244ab2a2c0fc926874bd19bed20e2afafabd7db8ac767e21b
+	sha512sums = e64bab61feefadfa5af1752b7b7dbad78d4d1ba706e7b07a130c1a7a78638036cc439f394fbdc92337eb718acc50f2b6b58b46eb2a248e698eaafbd75c0ceeb4
+	sha512sums = e2fdd62f9b4f6077c08f0783840294177e46874a28ff4fe5a0b09e18419f9d44e0f318f8986e8d5b12156eac01775e7d2cecdc86c17dce4f300a33575b62fc22
 	sha512sums = bed1333077c69517e6c02bfc73b62a0d87e27c8e8f7b141dedd7a0e4be87dd7fba76b10f2cf254b8efcd4aa657b2c7fa4c6b83ca2127f5a8904757aa9f5a1656
 	sha512sums = 3c878b5004f4aed59635d832b22199c2550abb46b4ede49221d904a37f0e1088cb976d4d73966c7d2826b5b86b352937d37824f1e76ce461eed1ca8ce9ca6521
 	sha512sums = 48866fe1daebaad2575cee74d43c74274a1a879d821d4b4aed08215dd1642e0a76f3a865d0e0ea6675c630b81f3a7d907edfa6112c957a47245da5e116f1fabc
diff --git a/PKGBUILD b/PKGBUILD
index bf82595f2407..bfe8f09e8e13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: DDoSolitary <DDoSolitary@gmail.com>
 pkgname=go-tun2socks
-pkgver=1.16.9
-pkgrel=1
+pkgver=1.16.11
+pkgrel=0
 pkgdesc="A tun2socks implementation written in Go."
 arch=(x86_64)
 url=https://github.com/eycorsican/go-tun2socks
@@ -15,8 +15,8 @@ source=(
 	go-tun2socks-setup
 )
 sha512sums=(
-	31f606e3fb562001ca9a37a21c8095d3a2cb4c622b621611be8e47e3073b9741c4b1d77ca5a37bbb3ca2ec24b314d5f6a51d249593c7d8903ef71d8614c7e44b
-	72a04943aa4e0cb8241c63a26d30c88cdbedf12b49f5f1c93dc97b1cb4f621c8e59736107d729f7244ab2a2c0fc926874bd19bed20e2afafabd7db8ac767e21b
+	e64bab61feefadfa5af1752b7b7dbad78d4d1ba706e7b07a130c1a7a78638036cc439f394fbdc92337eb718acc50f2b6b58b46eb2a248e698eaafbd75c0ceeb4
+	e2fdd62f9b4f6077c08f0783840294177e46874a28ff4fe5a0b09e18419f9d44e0f318f8986e8d5b12156eac01775e7d2cecdc86c17dce4f300a33575b62fc22
 	bed1333077c69517e6c02bfc73b62a0d87e27c8e8f7b141dedd7a0e4be87dd7fba76b10f2cf254b8efcd4aa657b2c7fa4c6b83ca2127f5a8904757aa9f5a1656
 	3c878b5004f4aed59635d832b22199c2550abb46b4ede49221d904a37f0e1088cb976d4d73966c7d2826b5b86b352937d37824f1e76ce461eed1ca8ce9ca6521
 	48866fe1daebaad2575cee74d43c74274a1a879d821d4b4aed08215dd1642e0a76f3a865d0e0ea6675c630b81f3a7d907edfa6112c957a47245da5e116f1fabc
diff --git a/build-flags.patch b/build-flags.patch
index 52ab8680dfb0..971ce8412947 100644
--- a/build-flags.patch
+++ b/build-flags.patch
@@ -1,20 +1,21 @@
 diff --git a/Makefile b/Makefile
-index bcb8312..38960f9 100644
+index 78d4e4f..96b58bd 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -4,13 +4,13 @@ GOBUILD=$(GOCMD) build
+@@ -4,14 +4,14 @@ GOBUILD=$(GOCMD) build
  GOCLEAN=$(GOCMD) clean
  VERSION=$(shell git describe --tags)
  DEBUG_LDFLAGS=''
 -RELEASE_LDFLAGS='-s -w -X main.version=$(VERSION)'
-+RELEASE_LDFLAGS='-s -w -X main.version=$(VERSION) -extldflags ${LDFLAGS}'
++RELEASE_LDFLAGS='-s -w -X main.version=$(VERSION) -extldflags "${LDFLAGS}"'
+ STATIC_RELEASE_LDFLAGS='-s -w -X main.version=$(VERSION) -extldflags "-static"'
  BUILD_TAGS?=socks
  BUILDDIR=$(shell pwd)/build
  CMDDIR=$(shell pwd)/cmd/tun2socks
  PROGRAM=tun2socks
  
 -BUILD_CMD="cd $(CMDDIR) && $(GOBUILD) -ldflags $(RELEASE_LDFLAGS) -o $(BUILDDIR)/$(PROGRAM) -v -tags '$(BUILD_TAGS)'"
-+BUILD_CMD="cd $(CMDDIR) && $(GOBUILD) -trimpath -ldflags $(RELEASE_LDFLAGS) -o $(BUILDDIR)/$(PROGRAM) -v -tags '$(BUILD_TAGS)'"
- XBUILD_CMD="cd $(BUILDDIR) && $(XGOCMD) -ldflags $(RELEASE_LDFLAGS) -tags '$(BUILD_TAGS)' --targets=*/* $(CMDDIR)"
++BUILD_CMD="cd $(CMDDIR) && $(GOBUILD) -trimpath -buildmode=pie -mod=readonly -modcacherw -ldflags $(RELEASE_LDFLAGS) -o $(BUILDDIR)/$(PROGRAM) -v -tags '$(BUILD_TAGS)'"
+ XBUILD_LINUX_CMD="cd $(BUILDDIR) && $(XGOCMD) -ldflags $(STATIC_RELEASE_LDFLAGS) -tags '$(BUILD_TAGS)' --targets=linux/* $(CMDDIR)"
+ XBUILD_OTHERS_CMD="cd $(BUILDDIR) && $(XGOCMD) -ldflags $(RELEASE_LDFLAGS) -tags '$(BUILD_TAGS)' --targets=darwin/*,windows/*,android/*,ios/* $(CMDDIR)"
  
- all: build