On Tue, Feb 05, 2019 at 11:44:06PM +0100, Alex Holst wrote:
> I'll follow up with that diff.
Here's Alex's diff.
We had a private exchange, and agreed that we'd include stcli (which he
relies on).
Note that stcli used to be in a separate repo, but it moved into the
main repo. Alex's change just links it to the build.
We also agreed that we should raise an issue upstream to allow stcli to
talk via local domain socket, or at the very least, accept the password
via a prompt (instead of on the command line or via the environment).
So just looking for an OK now.
Index: Makefile
===================================================================
RCS file: /home/holsta/cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 4 Sep 2018 12:46:19 -0000 1.23
+++ Makefile 6 Feb 2019 12:17:42 -0000
@@ -2,10 +2,10 @@
COMMENT = open decentralized synchronization utility
-V = 0.14.47
+V = 1.0.1
DISTNAME = syncthing-${V}
DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
REVISION = 0
CATEGORIES = net
HOMEPAGE = https://syncthing.net/
@@ -31,11 +31,15 @@ do-build:
cd ${WRKSRC} && ${MODGO_CMD} run build.go \
-version v${V} -no-upgrade
+# Some tests fail, but they are bugs in the test suite itself, not Syncthing.
+# We are working with upstream to fix these:
+# https://forum.syncthing.net/t/openbsd-test-debugging/12799
do-test:
cd ${WRKSRC} && ${MODGO_CMD} run build.go test
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/stcli ${PREFIX}/bin/
.for sec in 1 5 7
${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/
.endfor
Index: distinfo
===================================================================
RCS file: /home/holsta/cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 4 Jun 2018 08:51:48 -0000 1.14
+++ distinfo 6 Feb 2019 12:14:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.47.tar.gz) =
krNTXKPqeyfFsux3EIiGXNbpHYEaCBa+OaYoOjBn5vM=
-SIZE (syncthing-source-v0.14.47.tar.gz) = 10496524
+SHA256 (syncthing-source-v1.0.1.tar.gz) =
w2KR786nkN+ds7Z6OaZOMqdzMkiava6CYKKV2ukBWj0=
+SIZE (syncthing-source-v1.0.1.tar.gz) = 6876569
Index: patches/patch-build_go
===================================================================
RCS file: /home/holsta/cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.6
diff -u -p -r1.6 patch-build_go
--- patches/patch-build_go 24 Feb 2018 10:14:24 -0000 1.6
+++ patches/patch-build_go 6 Feb 2019 12:14:53 -0000
@@ -2,7 +2,28 @@ $OpenBSD: patch-build_go,v 1.6 2018/02/2
Index: build.go
--- build.go.orig
+++ build.go
-@@ -461,7 +461,7 @@ func appendParameters(args []string, tags []string, ta
+@@ -186,6 +186,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",
++ buildPkg: "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},
++ },
++ },
+ }
+
+ func init() {
+@@ -490,7 +504,7 @@ func appendParameters(args []string, tags []string, ta
if !debugBinary {
// Regular binaries get version tagged and skip some debug
symbols
Index: pkg/PLIST
===================================================================
RCS file: /home/holsta/cvs/ports/net/syncthing/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:19 -0000 1.4
+++ pkg/PLIST 6 Feb 2019 12:14:59 -0000
@@ -1,7 +1,15 @@
@comment $OpenBSD: PLIST,v 1.4 2018/09/04 12:46:19 espie Exp $
@newgroup _syncthing:768
@newuser _syncthing:768:_syncthing:daemon:Syncthing
user:${VARBASE}/syncthing:/sbin/nologin
+@rcscript ${RCDIR}/syncthing
+@owner _syncthing
+@group _syncthing
+@sample ${VARBASE}/syncthing/
+@extraunexec rm -rf ${VARBASE}/syncthing/{.,}*
+@owner
+@group
@bin bin/syncthing
+@bin bin/stcli
@man man/man1/stdiscosrv.1
@man man/man1/strelaysrv.1
@man man/man1/syncthing.1
@@ -19,8 +27,3 @@
@man man/man7/syncthing-security.7
@man man/man7/syncthing-versioning.7
share/doc/pkg-readmes/${PKGSTEM}
-@rcscript ${RCDIR}/syncthing
-@owner _syncthing
-@group _syncthing
-@sample ${VARBASE}/syncthing/
-@extraunexec rm -rf ${VARBASE}/syncthing/{.,}*
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
