From 941adb2208cf32b56c5f3e798cca84cc027057c8 Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Tue, 10 Jan 2023 11:09:05 +0100
Subject: [PATCH] syncthing: update from 1.22.2 to 1.23.0

- now with building cache cleanup
---
 syncthing.be0 | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/syncthing.be0 b/syncthing.be0
index a03ccd0a6..e451323ac 100755
--- a/syncthing.be0
+++ b/syncthing.be0
@@ -1,17 +1,16 @@
 #!/bin/env beesh
 
-# BEE_VERSION syncthing-1.22.2-0
+# BEE_VERSION syncthing-1.23.0-0
 
 ## The source URL(s) array
 SRCURL[0]="https://github.com/syncthing/syncthing/releases/download/v${PKGVERSION}/syncthing-source-v${PKGVERSION}.tar.gz syncthing-v${PKGVERSION}.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/e76c2a4a7ebe0e972afe8bb42cf51aa0/syncthing-v1.22.2.tar.gz"
-
+SRCURL[0]="https://beehive.molgen.mpg.de/39949305d527c0e74dea8ff7da455122/syncthing-v1.23.0.tar.gz"
 
 ## Add URLs/paths to patch files
 # PATCHURL+=()
 
 ## uncomment to change default
-build_in_sourcedir
+#build_in_sourcedir
 
 ## specify different source directory
 # sourcesubdir_append src
@@ -29,7 +28,13 @@ build_in_sourcedir
 #}
 
 mee_build() {
-    export GOPATH=${F}
+
+    export GOCACHE="${B}/.cache/go-build"
+    export GOENV="${B}/.config/go/env"
+    export GOMODCACHE="${B}/pkg/mod"
+
+    # we build in source dir but we don't 8-)
+    cd ${S}
     # go clean -r -x build.go # NEVER EVER run this as root
     go run -v build.go
     go run -v build.go -no-upgrade build syncthing
@@ -40,8 +45,16 @@ mee_build() {
 
 mee_install() {
     mkdir -p ${D}/usr/bin
-    cp ${S}/syncthing ${D}/usr/bin
-    for b in stevents stcompdirs stvanity stfindignored stfileinfo stwatchfile stsigtool stdisco stdiscosrv stfinddevice stgenfiles stwatchfile; do
+
+    # not packaged:
+    #  stcrahcreceiver
+    #  strelaypoolsrv
+    #  strelaysrv
+    #  uraggregate
+    #  ursrv
+    #  stupgrades
+
+    for b in stcompdirs stdisco stdiscosrv stevents stfileinfo stfinddevice stfindignored stgenfiles stsigtool stvanity stwatchfile syncthing; do
         cp ${S}/bin/$b ${D}/usr/bin
     done