Hi,
Simple update to syncthing's latest.
Note that the cli binary was merged into the main program. Use it with
`synchting cli <args>`.
Tests passing on amd64. I'll be use testing it over the next few days.
Commments or OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 8 Mar 2021 13:59:25 -0000 1.34
+++ Makefile 11 Jun 2021 20:52:36 -0000
@@ -4,10 +4,9 @@ BROKEN-aarch64 =golang.org/x/Sys/cpu pan
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}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo 14 Jan 2021 23:39:51 -0000 1.23
+++ distinfo 10 Jun 2021 10:34:28 -0000
@@ -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
Index: patches/patch-build_go
===================================================================
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.13
diff -u -p -r1.13 patch-build_go
--- patches/patch-build_go 14 Jan 2021 23:39:51 -0000 1.13
+++ patches/patch-build_go 11 Jun 2021 20:48:23 -0000
@@ -2,33 +2,12 @@ $OpenBSD: patch-build_go,v 1.13 2021/01/
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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/syncthing/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 10 Nov 2019 12:06:38 -0000 1.7
+++ pkg/PLIST 11 Jun 2021 20:54:38 -0000
@@ -8,7 +8,6 @@
@extraunexec rm -rf ${VARBASE}/syncthing/{.,}*
@owner
@group
-@bin bin/stcli
@bin bin/stdiscosrv
@bin bin/strelaysrv
@bin bin/syncthing
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
