UPDATE: net/syncthing

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: net/syncthing

Edd Barrett-3
Hi,

The Syncthing test failures on OpenBSD have now been addressed by
upstream, so I think we can go ahead with updating the port again :)

Apparently the inotify library they use doesn't quite behave as they
expected on OpenBSD (something to do with kqueue):
https://github.com/rjeczalik/notify/issues/172

I've checked with upstream that this does not cripple syncthing for us:
https://github.com/syncthing/syncthing/issues/5077#issuecomment-454933086

And it looks like it may be fixed in the future:
https://github.com/rjeczalik/notify/issues/172#issuecomment-454930655

Here's a diff to update our package to version 1.0.0, with a patch
back-ported to address test failures.

Note that `make update-plist` wanted to re-order the @unexec/@sample
bits. I think that's fine.

I'll be testing this over the next few days.

A big thanks to Audrius Butkevicius from upstream for looking into the
test failures!



Index: Makefile
===================================================================
RCS file: /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 20 Jan 2019 12:18:02 -0000
@@ -2,10 +2,9 @@
 
 COMMENT = open decentralized synchronization utility
 
-V = 0.14.47
+V = 1.0.0
 DISTNAME = syncthing-${V}
 DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
-REVISION = 0
 
 CATEGORIES = net
 HOMEPAGE = https://syncthing.net/
Index: distinfo
===================================================================
RCS file: /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 20 Jan 2019 12:19:21 -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.0.tar.gz) = J0NfnvfCdnNuwWeBrWsn/ssoBTuP+xbguuQMHpu2IiU=
+SIZE (syncthing-source-v1.0.0.tar.gz) = 10801212
Index: patches/patch-build_go
===================================================================
RCS file: /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 20 Jan 2019 13:12:59 -0000
@@ -2,7 +2,7 @@ $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
+@@ -490,7 +490,7 @@ func appendParameters(args []string, tags []string, ta
 
  if !debugBinary {
  // Regular binaries get version tagged and skip some debug symbols
Index: patches/patch-lib_fs_basicfs_watch_test_go
===================================================================
RCS file: patches/patch-lib_fs_basicfs_watch_test_go
diff -N patches/patch-lib_fs_basicfs_watch_test_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_fs_basicfs_watch_test_go 20 Jan 2019 13:14:11 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+From upstream:
+https://github.com/syncthing/syncthing/commit/96bd691f55d9f4bfc54a211b44a301c7392b1a9a
+
+Issue:
+https://github.com/syncthing/syncthing/issues/5246
+
+Index: lib/fs/basicfs_watch_test.go
+--- lib/fs/basicfs_watch_test.go.orig
++++ lib/fs/basicfs_watch_test.go
+@@ -57,7 +57,8 @@ func TestMain(m *testing.M) {
+ }
+
+ const (
+- testDir = "testdata"
++ testDir        = "testdata"
++ failsOnOpenBSD = "Fails on OpenBSD. See https://github.com/rjeczalik/notify/issues/172"
+ )
+
+ var (
+@@ -66,6 +67,9 @@ var (
+ )
+
+ func TestWatchIgnore(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "ignore"
+
+ file := "file"
+@@ -87,6 +91,9 @@ func TestWatchIgnore(t *testing.T) {
+ }
+
+ func TestWatchInclude(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "include"
+
+ file := "file"
+@@ -111,6 +118,9 @@ func TestWatchInclude(t *testing.T) {
+ }
+
+ func TestWatchRename(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "rename"
+
+ old := createTestFile(name, "oldfile")
+@@ -203,6 +213,9 @@ func TestWatchSubpath(t *testing.T) {
+
+ // TestWatchOverflow checks that an event at the root is sent when maxFiles is reached
+ func TestWatchOverflow(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "overflow"
+
+ expectedEvents := []Event{
Index: pkg/PLIST
===================================================================
RCS file: /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 20 Jan 2019 13:16:38 -0000
@@ -1,6 +1,13 @@
 @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
 @man man/man1/stdiscosrv.1
 @man man/man1/strelaysrv.1
@@ -19,8 +26,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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/syncthing

Edd Barrett-3
Hi everyone,

On Sun, Jan 20, 2019 at 02:06:46PM +0000, Edd Barrett wrote:
> I'll be testing this over the next few days.

I got OKs for this, but delayed the commit, as I was seeing test
failures on one of my machines (but not others).

I've spoken to upstream about it. They've had a look and told me that
the failures are actually bugs in the test suite itself! Furthermore I
quote:

"Are you delaying updating Syncthing due to this? If so really just
don’t please. There are known bugs fixed" [0]

Of course, we continue to work with upstream on fixing the test suite,
hopefully for the next release. What I'm saying is, these failures
should not block the update.

In the meantime, Syncthing-1.0.1 has been released. Below is an updated
diff. Let's get this in.

OK?

[0] https://forum.syncthing.net/t/openbsd-test-debugging/12799/18?u=vext01


Index: Makefile
===================================================================
RCS file: /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 5 Feb 2019 22:18:34 -0000
@@ -2,10 +2,9 @@
 
 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,6 +30,9 @@ 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
 
Index: distinfo
===================================================================
RCS file: /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 5 Feb 2019 22:10:39 -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: /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 5 Feb 2019 22:11:58 -0000
@@ -2,7 +2,7 @@ $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
+@@ -464,7 +464,7 @@ func appendParameters(args []string, tags []string, ta
 
  if !debugBinary {
  // Regular binaries get version tagged and skip some debug symbols
Index: patches/patch-lib_fs_basicfs_watch_test_go
===================================================================
RCS file: patches/patch-lib_fs_basicfs_watch_test_go
diff -N patches/patch-lib_fs_basicfs_watch_test_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_fs_basicfs_watch_test_go 5 Feb 2019 22:07:02 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+From upstream:
+https://github.com/syncthing/syncthing/commit/96bd691f55d9f4bfc54a211b44a301c7392b1a9a
+
+Issue:
+https://github.com/syncthing/syncthing/issues/5246
+
+Index: lib/fs/basicfs_watch_test.go
+--- lib/fs/basicfs_watch_test.go.orig
++++ lib/fs/basicfs_watch_test.go
+@@ -57,7 +57,8 @@ func TestMain(m *testing.M) {
+ }
+
+ const (
+- testDir = "testdata"
++ testDir        = "testdata"
++ failsOnOpenBSD = "Fails on OpenBSD. See https://github.com/rjeczalik/notify/issues/172"
+ )
+
+ var (
+@@ -66,6 +67,9 @@ var (
+ )
+
+ func TestWatchIgnore(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "ignore"
+
+ file := "file"
+@@ -87,6 +91,9 @@ func TestWatchIgnore(t *testing.T) {
+ }
+
+ func TestWatchInclude(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "include"
+
+ file := "file"
+@@ -111,6 +118,9 @@ func TestWatchInclude(t *testing.T) {
+ }
+
+ func TestWatchRename(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "rename"
+
+ old := createTestFile(name, "oldfile")
+@@ -203,6 +213,9 @@ func TestWatchSubpath(t *testing.T) {
+
+ // TestWatchOverflow checks that an event at the root is sent when maxFiles is reached
+ func TestWatchOverflow(t *testing.T) {
++ if runtime.GOOS == "openbsd" {
++ t.Skip(failsOnOpenBSD)
++ }
+ name := "overflow"
+
+ expectedEvents := []Event{
Index: pkg/PLIST
===================================================================
RCS file: /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 5 Feb 2019 22:07:02 -0000
@@ -1,6 +1,13 @@
 @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
 @man man/man1/stdiscosrv.1
 @man man/man1/strelaysrv.1
@@ -19,8 +26,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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/syncthing

Alex Holst
Hey Edd. Thanks for working on this. Comments below.

Quoting Edd Barrett ([hidden email]):

> RCS file: /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 5 Feb 2019 22:07:02 -0000
> @@ -1,6 +1,13 @@
>  @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

I am pretty sure those blank @owner and @group need to go.

I have also been running with a diff that includes the stcli command in
the package, which I need for most of my remote Syncthing systems.

I'll follow up with that diff.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/syncthing

Stuart Henderson
On 2019/02/05 23:44, Alex Holst wrote:

> Hey Edd. Thanks for working on this. Comments below.
>
> Quoting Edd Barrett ([hidden email]):
> > RCS file: /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 5 Feb 2019 22:07:02 -0000
> > @@ -1,6 +1,13 @@
> >  @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
>
> I am pretty sure those blank @owner and @group need to go.

No, you don't want the following files (binaries, manuals etc) owned by
_syncthing.

> I have also been running with a diff that includes the stcli command in
> the package, which I need for most of my remote Syncthing systems.
>
> I'll follow up with that diff.
>

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/syncthing

Edd Barrett-3
In reply to this post by Alex Holst
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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/syncthing

Aaron Bieber-2

Edd Barrett writes:

> 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.

OK abieber@ after REVISION is whacked!

>
> 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/{.,}*


--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE