fixed build, reverted to fixed go version

3 files changed, 45 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d430880061fa..562c18b4325d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = psiphon-tunnel-core-git
 	pkgdesc = Psiphon Tunnelling Proxy
-	pkgver = 2.0.29.r3767.afd5c1b1
+	pkgver = 2.0.29.r3855.b2279f7b
 	pkgrel = 2
 	epoch = 3
 	url = https://github.com/Psiphon-Labs/psiphon-tunnel-core
@@ -18,9 +18,13 @@ pkgbase = psiphon-tunnel-core-git
 	source = client.config
 	source = psiphon-client.service
 	source = psiphon-server.service
+	source = quic_disabled.go.patch
+	source = https://storage.googleapis.com/golang/go1.19.8.linux-amd64.tar.gz
 	sha256sums = SKIP
 	sha256sums = c2c414831ad29bdeecd00313c473fbaa448f4750e70df1c10e863870bde179aa
 	sha256sums = 6711a12112a594ba70bbae51c66ee23302e08c54c4e059c92b67adba9451c037
 	sha256sums = 373c1eb939118055f799237df3e665680b8dc4b4a281505cce32e957a9554c56
+	sha256sums = 4257724404190434e6e45de83fb0ca1270d1f3e2d66ae18028bafb054b03319d
+	sha256sums = e1a0bf0ab18c8218805a1003fd702a41e2e807710b770e787e5979d1cf947aba
 
 pkgname = psiphon-tunnel-core-git
diff --git a/PKGBUILD b/PKGBUILD
index f23ba972bf16..b8aa74f675c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,9 @@
 
 _pkgname=psiphon-tunnel-core
 pkgname="$_pkgname-git"
-pkgver=2.0.29.r3767.afd5c1b1
+pkgver=2.0.29.r3855.b2279f7b
 pkgrel=2
+GOVERSION=go1.19.8
 epoch=3
 pkgdesc='Psiphon Tunnelling Proxy'
 arch=('i686' 'x86_64')
@@ -17,13 +18,17 @@ source=("git+$url.git"
         "client.config"
         "psiphon-client.service"
         "psiphon-server.service"
+        "quic_disabled.go.patch"
+        "https://storage.googleapis.com/golang/${GOVERSION}.linux-amd64.tar.gz"
         )
 install=psiphon.install
 backup=('etc/psiphon/client.config' 'usr/lib/systemd/user/psiphon-client.service' 'usr/lib/systemd/user/psiphon-server.service')
 sha256sums=('SKIP'
             'c2c414831ad29bdeecd00313c473fbaa448f4750e70df1c10e863870bde179aa'
             '6711a12112a594ba70bbae51c66ee23302e08c54c4e059c92b67adba9451c037'
-            '373c1eb939118055f799237df3e665680b8dc4b4a281505cce32e957a9554c56')
+            '373c1eb939118055f799237df3e665680b8dc4b4a281505cce32e957a9554c56'
+            '4257724404190434e6e45de83fb0ca1270d1f3e2d66ae18028bafb054b03319d'
+            'e1a0bf0ab18c8218805a1003fd702a41e2e807710b770e787e5979d1cf947aba')
 
 
 pkgver() {
@@ -34,6 +39,12 @@ pkgver() {
   printf "%s.r%s.%s" "$TAG" "$REVISION" "$COMMIT"
 }
 
+prepare(){
+  cd "$srcdir/${_pkgname}"
+  patch --strip=1 --input=../quic_disabled.go.patch
+}
+
+
 export GO111MODULE=off
 export CGO_CPPFLAGS="$CPPFLAGS"
 export CGO_CFLAGS="$CFLAGS"
@@ -44,7 +55,13 @@ console_binary=psiphon-console-client
 server_binary=psiphon-server
 
 build() {
-  export GOPATH=$srcdir/go
+  cw=$(pwd)
+  export GOPATH=$cw/home/go
+  mkdir -p $GOPATH
+  export GOROOT=$cw/go
+  mkdir -p $GOROOT
+  export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
+
   mkdir -p "${GOPATH}/src/github.com/Psiphon-Labs"
   rm -rf "${GOPATH}/src/github.com/Psiphon-Labs/${_pkgname}"
   ln -srf  "$srcdir/${_pkgname}/" "${GOPATH}/src/github.com/Psiphon-Labs/${_pkgname}"
diff --git a/quic_disabled.go.patch b/quic_disabled.go.patch
new file mode 100644
index 000000000000..05c4d5a913da
--- /dev/null
+++ b/quic_disabled.go.patch
@@ -0,0 +1,20 @@
+diff --git a/psiphon/common/quic/quic_disabled.go b/psiphon/common/quic/quic_disabled.go
+index df8f0095..d406316c 100644
+--- a/psiphon/common/quic/quic_disabled.go
++++ b/psiphon/common/quic/quic_disabled.go
+@@ -30,6 +30,7 @@ import (
+ 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
+ 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/errors"
+ 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/prng"
++	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/obfuscator"
+ )
+ 
+ // Enabled indicates if QUIC functionality is enabled.
+@@ -60,6 +61,7 @@ func Dial(
+ 	_ *prng.Seed,
+ 	_ string,
+ 	_ *prng.Seed,
++	_ *transforms.ObfuscatorSeedTransformerParameters,
+ 	_ bool) (net.Conn, error) {
+ 
+ 	return nil, errors.TraceNew("operation is not enabled")