update to 2.0.0

2 files changed, 19 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 704e11b8efb5..9a68cba3f991 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = camouflage
 	pkgdesc = a mux websocket over TLS proxy
-	pkgver = 0.11.4
+	pkgver = 2.0.0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Sherlock-Holo/camouflage
 	arch = x86_64
 	license = MPL
-	makedepends = go>=2:1.12
+	makedepends = go>=2:1.14
 	makedepends = git
 	backup = etc/camouflage/example.toml
-	source = https://github.com/Sherlock-Holo/camouflage/archive/v0.11.4.tar.gz
+	source = https://github.com/Sherlock-Holo/camouflage/archive/v2.0.0.tar.gz
 	source = camouflage.install
-	md5sums = 32f72afbedd4b3f8fb72fa04f1a204fd
+	md5sums = a3b7c3ba4368ac44fadf8900aa308ef4
 	md5sums = d506ec62e984c89ddea0cec157292d42
 
 pkgname = camouflage
diff --git a/PKGBUILD b/PKGBUILD
index 8e02628c4a68..450384e9ae87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Sherlock Holo <sherlockya@gmail.com>
 pkgname=camouflage
 epoch=1
-pkgver=0.11.4
+pkgver=2.0.0
 _pkgver=v${pkgver}
 pkgrel=1
 pkgdesc="a mux websocket over TLS proxy"
 arch=('x86_64')
 license=('MPL')
 depends=()
-makedepends=('go>=2:1.12' 'git')
+makedepends=('go>=2:1.14' 'git')
 url='https://github.com/Sherlock-Holo/camouflage'
 source=(
 	"https://github.com/Sherlock-Holo/camouflage/archive/$_pkgver.tar.gz"
     "camouflage.install"
 )
 
-md5sums=('32f72afbedd4b3f8fb72fa04f1a204fd'
+md5sums=('a3b7c3ba4368ac44fadf8900aa308ef4'
          'd506ec62e984c89ddea0cec157292d42')
 
 backup=(
@@ -23,36 +23,39 @@ backup=(
 )
 
 build() {
-	rm -rf "$srcdir/go/src"
+    rm -rf "$srcdir/go/src"
 
-	mkdir -p "$srcdir/go/src"
+    mkdir -p "$srcdir/go/src"
 
-	export GOPATH="$srcdir/go"
+    export GOPATH="$srcdir/go"
 
     cd "$srcdir/$pkgname-$pkgver"
 
-	msg2 "Downloading dependencies"
+    msg2 "Downloading dependencies"
     export GO111MODULE=on
     export CGO_ENABLED=0
-	go mod download
+    export GOPROXY=https://goproxy.cn,direct
+    go mod download
+
+    export GOFLAGS="-trimpath -mod=readonly -modcacherw"
 
     msg2 "Building binary"
 
-    go build -gcflags "all=-trimpath=${PWD}" -asmflags "all=-trimpath=${PWD}" -ldflags "-w -s -extldflags ${LDFLAGS}" -v
-    
     msg2 "Cleaning residual"
     chmod 777 -R $GOPATH/pkg/mod
     rm -rf $GOPATH/pkg/mod
+
+    go build -v
 }
 
 package() {
     mkdir -p $pkgdir/usr/bin
-	install -D $srcdir/$pkgname-$pkgver/camouflage $pkgdir/usr/bin/camouflage
+    install -D $srcdir/$pkgname-$pkgver/camouflage $pkgdir/usr/bin/camouflage
 
     mkdir -p $pkgdir/etc/camouflage
     install -Dm644 $srcdir/$pkgname-$pkgver/config/example.toml $pkgdir/etc/camouflage/
 
-	mkdir -p $pkgdir/usr/lib/systemd/system
+    mkdir -p $pkgdir/usr/lib/systemd/system
     install $srcdir/$pkgname-$pkgver/systemd/camouflage-{client,server}@.service \
     -Dm644 $pkgdir/usr/lib/systemd/system/
 }