net/syncthing: Update to version 1.17.0.

OK bket@, thanks.

net/syncthing/Makefile

@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.34 2021/03/08 13:59:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2021/06/15 09:11:02 edd Exp $
 
 BROKEN-aarch64 =golang.org/x/Sys/cpu panic (illegal instruction)
 
 COMMENT =	open decentralized synchronization utility
 
-V =		1.12.1
+V =		1.17.0
 DISTNAME =	syncthing-${V}
 DISTFILES =	syncthing-source-v${V}${EXTRACT_SUFX}
-REVISION =	0
 
 CATEGORIES =	net
 HOMEPAGE =	https://syncthing.net/
@@ -29,7 +28,7 @@ MODGO_TYPE =		bin
 
 # Syncthing contains a lot of stuff that end users wouldn't be interested in,
 # so we package only these binaries.
-ST_CMDS =	syncthing stdiscosrv strelaysrv stcli
+ST_CMDS =	syncthing stdiscosrv strelaysrv
 
 do-build:
 .for cmd in ${ST_CMDS}

net/syncthing/distinfo

@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.12.1.tar.gz) = 9jZEETdlAxa4OAnBd++033O+AkVH4FbqA9zw7WJ9gcc=
-SIZE (syncthing-source-v1.12.1.tar.gz) = 11648726
+SHA256 (syncthing-source-v1.17.0.tar.gz) = YlQSmRcX4NRC4kvqyI5LehZUX7yMCv/+676V2+rjvjM=
+SIZE (syncthing-source-v1.17.0.tar.gz) = 12768385

net/syncthing/patches/patch-build_go

@@ -1,34 +1,13 @@
-$OpenBSD: patch-build_go,v 1.13 2021/01/14 23:39:51 edd Exp $
+$OpenBSD: patch-build_go,v 1.14 2021/06/15 09:11:02 edd Exp $
 Index: build.go
 --- build.go.orig
 +++ build.go
-@@ -202,6 +202,20 @@ var targets = map[string]target{
- 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
- 		},
- 	},
-+	"stcli": {
-+		name:        "stcli",
-+		debname:     "stcli",
-+		debdeps:     []string{"libc6"},
-+		description: "Syncthing Commandline Interface",
-+		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/stcli"},
-+		binaryName:  "stcli", // .exe will be added automatically for Windows builds
-+		archiveFiles: []archiveFile{
-+			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
-+		},
-+		installationFiles: []archiveFile{
-+			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-+		},
-+	},
- }
- 
- // These are repos we need to clone to run "go generate"
-@@ -523,7 +537,7 @@ func appendParameters(args []string, tags []string, pk
+@@ -526,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
  
  	if !debugBinary {
  		// Regular binaries get version tagged and skip some debug symbols
--		args = append(args, "-ldflags", ldflags(tags))
-+		args = append(args, "-x", "-ldflags", ldflags(tags))
+-		args = append(args, "-trimpath", "-ldflags", ldflags(tags))
++		args = append(args, "-x", "-trimpath", "-ldflags", ldflags(tags))
  	} else {
  		// -gcflags to disable optimizations and inlining. Skip -ldflags
  		// because `Could not launch program: decoding dwarf section info at

net/syncthing/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2019/11/10 12:06:38 edd Exp $
+@comment $OpenBSD: PLIST,v 1.8 2021/06/15 09:11:02 edd Exp $
 @newgroup _syncthing:768
 @newuser _syncthing:768:_syncthing:daemon:Syncthing user:${VARBASE}/syncthing:/sbin/nologin
 @rcscript ${RCDIR}/syncthing
@@ -8,7 +8,6 @@
 @extraunexec rm -rf ${VARBASE}/syncthing/{.,}*
 @owner
 @group
-@bin bin/stcli
 @bin bin/stdiscosrv
 @bin bin/strelaysrv
 @bin bin/syncthing