[update] net/syncthing to 1.26.1
Update syncthing to 1.26.1
built, running on arm64
cc to maintainer@
diff /usr/ports
commit - c50f22d88b3eb92d3e4bcfedf697d5ceb0a51484
path + /usr/ports
blob - 78a40d4057fc6391b75b7f1507219bb136bb9297
file + net/syncthing/Makefile
--- net/syncthing/Makefile
+++ net/syncthing/Makefile
@@ -1,7 +1,6 @@
COMMENT = open decentralized synchronization utility
-V =1.24.0
-REVISION = 0
+V =1.26.1
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
blob - 4a0af5878fee32d548b9653fe2f79ec01e50d45e
file + net/syncthing/distinfo
--- net/syncthing/distinfo
+++ net/syncthing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.24.0.tar.gz) =
SpRZZn+bcKfR59Vyx8nQJDHvjwVWee7zaDAM4agmYI8=
-SIZE (syncthing-source-v1.24.0.tar.gz) = 18625515
+SHA256 (syncthing-source-v1.26.1.tar.gz) =
wU3n3xbzPbbndELuKY3YNq60CuCDOevifkGKG7Dr570=
+SIZE (syncthing-source-v1.26.1.tar.gz) = 15020478
blob - fc3e3b1936b697af873c05a62f496f0ced960e4f
file + net/syncthing/patches/patch-build_go
--- net/syncthing/patches/patch-build_go
+++ net/syncthing/patches/patch-build_go
@@ -1,7 +1,7 @@
Index: build.go
--- build.go.orig
+++ build.go
-@@ -562,7 +562,7 @@ func appendParameters(args []string, tags []string, pk
+@@ -568,7 +568,7 @@ func appendParameters(args []string, tags []string, pk
if !debugBinary {
// Regular binaries get version tagged and skip some debug
symbols
blob - e35e61e1c856e1b873c130a653876cb4a91dce0c
file + net/syncthing/patches/patch-lib_build_build_go
--- net/syncthing/patches/patch-lib_build_build_go
+++ net/syncthing/patches/patch-lib_build_build_go
@@ -3,12 +3,12 @@ Disable phone-home calls / anonymous usage reporting
Index: lib/build/build.go
--- lib/build/build.go.orig
+++ lib/build/build.go
-@@ -73,7 +73,7 @@ func setBuildData() {
+@@ -75,7 +75,7 @@ func setBuildData() {
exp := regexp.MustCompile(`^v\d+\.\d+\.\d+(-[a-z]+[\d\.]+)?$`)
IsRelease = exp.MatchString(Version)
- IsCandidate = strings.Contains(Version, "-rc.")
+ IsCandidate = false
IsBeta = strings.Contains(Version, "-")
+ Extra = filterString(os.Getenv("STVERSIONEXTRA"),
versionExtraAllowedChars)
- stamp, _ := strconv.Atoi(Stamp)
Re: UPDATE: net/syncthing-1.18.3
On Tue, 09 Nov 2021, Edd Barrett wrote:
> On Fri, Oct 29, 2021 at 03:19:47PM +0100, Edd Barrett wrote:
> > Hi,
> >
> > Simple update.
>
> And here's the next point release: 0.18.4.
Works for me on amd64. Sync thing against mac and linux hosts running
the same version.
ok paco@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/syncthing/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile 15 Jun 2021 09:11:02 - 1.35
> +++ Makefile 9 Nov 2021 13:04:42 -
> @@ -4,7 +4,7 @@ BROKEN-aarch64 =golang.org/x/Sys/cpu pan
>
> COMMENT =open decentralized synchronization utility
>
> -V = 1.17.0
> +V = 1.18.4
> DISTNAME = syncthing-${V}
> DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/syncthing/distinfo,v
> retrieving revision 1.24
> diff -u -p -r1.24 distinfo
> --- distinfo 15 Jun 2021 09:11:02 - 1.24
> +++ distinfo 9 Nov 2021 13:04:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (syncthing-source-v1.17.0.tar.gz) =
> YlQSmRcX4NRC4kvqyI5LehZUX7yMCv/+676V2+rjvjM=
> -SIZE (syncthing-source-v1.17.0.tar.gz) = 12768385
> +SHA256 (syncthing-source-v1.18.4.tar.gz) =
> FjGFzxIKfGb6EUk32HEoZqiRzwnFDrKZX9SXiIUMfAI=
> +SIZE (syncthing-source-v1.18.4.tar.gz) = 13006540
> Index: patches/patch-build_go
> ===
> RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
> retrieving revision 1.14
> diff -u -p -r1.14 patch-build_go
> --- patches/patch-build_go15 Jun 2021 09:11:02 - 1.14
> +++ patches/patch-build_go9 Nov 2021 13:04:11 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-build_go,v 1.14 2021/06/
> Index: build.go
> --- build.go.orig
> +++ build.go
> -@@ -526,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
> +@@ -540,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
>
> if !debugBinary {
> // Regular binaries get version tagged and skip some debug
> symbols
>
> --
> Best Regards
> Edd Barrett
>
> https://www.theunixzoo.co.uk
>
--
Paco Esteban.
0x5818130B8A6DBC03
Re: UPDATE: net/syncthing-1.18.3
On Fri, Oct 29, 2021 at 03:19:47PM +0100, Edd Barrett wrote:
> Hi,
>
> Simple update.
And here's the next point release: 0.18.4.
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile15 Jun 2021 09:11:02 - 1.35
+++ Makefile9 Nov 2021 13:04:42 -
@@ -4,7 +4,7 @@ BROKEN-aarch64 =golang.org/x/Sys/cpu pan
COMMENT = open decentralized synchronization utility
-V =1.17.0
+V =1.18.4
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo15 Jun 2021 09:11:02 - 1.24
+++ distinfo9 Nov 2021 13:04:49 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.17.0.tar.gz) =
YlQSmRcX4NRC4kvqyI5LehZUX7yMCv/+676V2+rjvjM=
-SIZE (syncthing-source-v1.17.0.tar.gz) = 12768385
+SHA256 (syncthing-source-v1.18.4.tar.gz) =
FjGFzxIKfGb6EUk32HEoZqiRzwnFDrKZX9SXiIUMfAI=
+SIZE (syncthing-source-v1.18.4.tar.gz) = 13006540
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.14
diff -u -p -r1.14 patch-build_go
--- patches/patch-build_go 15 Jun 2021 09:11:02 - 1.14
+++ patches/patch-build_go 9 Nov 2021 13:04:11 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-build_go,v 1.14 2021/06/
Index: build.go
--- build.go.orig
+++ build.go
-@@ -526,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
+@@ -540,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
if !debugBinary {
// Regular binaries get version tagged and skip some debug
symbols
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
UPDATE: net/syncthing-1.18.3
Hi,
Simple update.
This version appears to have encryption support for untrusted nodes, but I've
not played with that yet.
All tests pass amd64.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile15 Jun 2021 09:11:02 - 1.35
+++ Makefile29 Oct 2021 13:53:05 -
@@ -4,7 +4,7 @@ BROKEN-aarch64 =golang.org/x/Sys/cpu pan
COMMENT = open decentralized synchronization utility
-V =1.17.0
+V =1.18.3
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo15 Jun 2021 09:11:02 - 1.24
+++ distinfo29 Oct 2021 13:53:12 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.17.0.tar.gz) =
YlQSmRcX4NRC4kvqyI5LehZUX7yMCv/+676V2+rjvjM=
-SIZE (syncthing-source-v1.17.0.tar.gz) = 12768385
+SHA256 (syncthing-source-v1.18.3.tar.gz) =
MsEaVvRntfmkX/MNo4lTOH2hDXG008tBZDxqb1wHPHo=
+SIZE (syncthing-source-v1.18.3.tar.gz) = 12977000
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.14
diff -u -p -r1.14 patch-build_go
--- patches/patch-build_go 15 Jun 2021 09:11:02 - 1.14
+++ patches/patch-build_go 29 Oct 2021 13:54:09 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-build_go,v 1.14 2021/06/
Index: build.go
--- build.go.orig
+++ build.go
-@@ -526,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
+@@ -540,7 +540,7 @@ func appendParameters(args []string, tags []string, pk
if !debugBinary {
// Regular binaries get version tagged and skip some debug
symbols
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: UPDATE: net/syncthing
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 - 1.23
> +++ Makefile 6 Feb 2019 12:17:42 -
> @@ -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 - 1.14
> +++ distinfo 6 Feb 2019 12:14:53 -
> @@ -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_go24 Feb 2018 10:14:24 - 1.6
> +++ patches/patch-build_go6 Feb 2019 12:14:53 -
> @@ -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 - 1.4
> +++ pkg/PLIST 6 Feb 2019 12:14:59 -
> @@ -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
> @@
Re: UPDATE: net/syncthing
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
--- Makefile4 Sep 2018 12:46:19 - 1.23
+++ Makefile6 Feb 2019 12:17:42 -
@@ -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
--- distinfo4 Jun 2018 08:51:48 - 1.14
+++ distinfo6 Feb 2019 12:14:53 -
@@ -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 - 1.6
+++ patches/patch-build_go 6 Feb 2019 12:14:53 -
@@ -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 - 1.4
+++ pkg/PLIST 6 Feb 2019 12:14:59 -
@@ -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
Re: UPDATE: net/syncthing
On 2019/02/05 23:44, Alex Holst wrote:
> Hey Edd. Thanks for working on this. Comments below.
>
> Quoting Edd Barrett (e...@theunixzoo.co.uk):
> > 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 - 1.4
> > +++ pkg/PLIST 5 Feb 2019 22:07:02 -
> > @@ -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.
>
Re: UPDATE: net/syncthing
Hey Edd. Thanks for working on this. Comments below.
Quoting Edd Barrett (e...@theunixzoo.co.uk):
> 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 - 1.4
> +++ pkg/PLIST 5 Feb 2019 22:07:02 -
> @@ -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.
Re: UPDATE: net/syncthing
Hi everyone,
On Sun, Jan 20, 2019 at 02:06:46PM +, 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
--- Makefile4 Sep 2018 12:46:19 - 1.23
+++ Makefile5 Feb 2019 22:18:34 -
@@ -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
--- distinfo4 Jun 2018 08:51:48 - 1.14
+++ distinfo5 Feb 2019 22:10:39 -
@@ -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 - 1.6
+++ patches/patch-build_go 5 Feb 2019 22:11:58 -
@@ -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 -
+++ patches/patch-lib_fs_basicfs_watch_test_go 5 Feb 2019 22:07:02 -
@@ -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 :=
UPDATE: net/syncthing
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
--- Makefile4 Sep 2018 12:46:19 - 1.23
+++ Makefile20 Jan 2019 12:18:02 -
@@ -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
--- distinfo4 Jun 2018 08:51:48 - 1.14
+++ distinfo20 Jan 2019 12:19:21 -
@@ -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 - 1.6
+++ patches/patch-build_go 20 Jan 2019 13:12:59 -
@@ -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 -
+++ patches/patch-lib_fs_basicfs_watch_test_go 20 Jan 2019 13:14:11 -
@@ -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 - 1.4
+++ pkg/PLIST 20 Jan 2019 13:16:38
Re: update: net/syncthing
Good. It's all yours :)
On Thu, 12 Jul 2018 at 21:51, Gonzalo L. Rodriguez wrote:
>
> On [12/07/18] [06:24P], nayden wrote:
> >Hi ports@,
> >
> >These are the release notes for 0.14.48:
> >--
> >Bugfixes:
> >
> >#4897: Pausing on introducer removes device on other devices
> >#4901: API returns empty response if non-existing files are #included
> >#4903: Syncthing recreates the directories for deleted/missing "Folders"
> >#4915: .stignore is accidentaly overwritten by web UI on slow machines
> >#4918: GUI unresponsive or unusable with many folders or devices
> >#4941: "Watching for Changes" dialog undismissable
> >#4947: Recent Changes shows empty folder label
> >Enhancements:
> >
> >#4807: Support variable sized blocks
> >#4896: Thousand separator for numbers in GUI
> >Other issues:
> >
> >#4909: Custom Windows icon missing in latest release
> >--
> >
> >ok?
> >
> >Index: Makefile
> >===
> >RCS file: /home/nayden/cvsync/ports/net/syncthing/Makefile,v
> >retrieving revision 1.22
> >diff -u -p -r1.22 Makefile
> >--- Makefile 4 Jun 2018 08:51:48 - 1.22
> >+++ Makefile 12 Jul 2018 16:53:29 -
> >@@ -2,7 +2,7 @@
> >
> > COMMENT = open decentralized synchronization utility
> >
> >-V = 0.14.47
> >+V = 0.14.48
> > DISTNAME =syncthing-${V}
> > DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
> >
> >Index: distinfo
> >===
> >RCS file: /home/nayden/cvsync/ports/net/syncthing/distinfo,v
> >retrieving revision 1.14
> >diff -u -p -r1.14 distinfo
> >--- distinfo 4 Jun 2018 08:51:48 - 1.14
> >+++ distinfo 12 Jul 2018 16:58:02 -
> >@@ -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-v0.14.48.tar.gz) =
> >tJIlGLASqpvEazlASnHKAOW8wvDgrSGieoQaSWWpsy8=
> >+SIZE (syncthing-source-v0.14.48.tar.gz) = 10566623
> >
>
> Hey Nayden, I sent the similar to edd@ a couple days ago, but with a little
> update on the patch.
>
>
>
> --
> Sending from my toaster.
Re: update: net/syncthing
On [12/07/18] [06:24P], nayden wrote:
Hi ports@,
These are the release notes for 0.14.48:
--
Bugfixes:
#4897: Pausing on introducer removes device on other devices
#4901: API returns empty response if non-existing files are #included
#4903: Syncthing recreates the directories for deleted/missing "Folders"
#4915: .stignore is accidentaly overwritten by web UI on slow machines
#4918: GUI unresponsive or unusable with many folders or devices
#4941: "Watching for Changes" dialog undismissable
#4947: Recent Changes shows empty folder label
Enhancements:
#4807: Support variable sized blocks
#4896: Thousand separator for numbers in GUI
Other issues:
#4909: Custom Windows icon missing in latest release
--
ok?
Index: Makefile
===
RCS file: /home/nayden/cvsync/ports/net/syncthing/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile4 Jun 2018 08:51:48 - 1.22
+++ Makefile12 Jul 2018 16:53:29 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.47
+V =0.14.48
DISTNAME = syncthing-${V}
DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /home/nayden/cvsync/ports/net/syncthing/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Jun 2018 08:51:48 - 1.14
+++ distinfo12 Jul 2018 16:58:02 -
@@ -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-v0.14.48.tar.gz) =
tJIlGLASqpvEazlASnHKAOW8wvDgrSGieoQaSWWpsy8=
+SIZE (syncthing-source-v0.14.48.tar.gz) = 10566623
Hey Nayden, I sent the similar to edd@ a couple days ago, but with a little
update on the patch.
--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile4 Jun 2018 08:51:48 - 1.22
+++ Makefile9 Jul 2018 13:30:59 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.47
+V =0.14.48
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Jun 2018 08:51:48 - 1.14
+++ distinfo9 Jul 2018 13:30:59 -
@@ -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-v0.14.48.tar.gz) =
tJIlGLASqpvEazlASnHKAOW8wvDgrSGieoQaSWWpsy8=
+SIZE (syncthing-source-v0.14.48.tar.gz) = 10566623
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 - 1.6
+++ patches/patch-build_go 9 Jul 2018 13:30:59 -
@@ -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
update: net/syncthing
Hi ports@,
These are the release notes for 0.14.48:
--
Bugfixes:
#4897: Pausing on introducer removes device on other devices
#4901: API returns empty response if non-existing files are #included
#4903: Syncthing recreates the directories for deleted/missing "Folders"
#4915: .stignore is accidentaly overwritten by web UI on slow machines
#4918: GUI unresponsive or unusable with many folders or devices
#4941: "Watching for Changes" dialog undismissable
#4947: Recent Changes shows empty folder label
Enhancements:
#4807: Support variable sized blocks
#4896: Thousand separator for numbers in GUI
Other issues:
#4909: Custom Windows icon missing in latest release
--
ok?
Index: Makefile
===
RCS file: /home/nayden/cvsync/ports/net/syncthing/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile4 Jun 2018 08:51:48 - 1.22
+++ Makefile12 Jul 2018 16:53:29 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.47
+V =0.14.48
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /home/nayden/cvsync/ports/net/syncthing/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Jun 2018 08:51:48 - 1.14
+++ distinfo12 Jul 2018 16:58:02 -
@@ -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-v0.14.48.tar.gz) =
tJIlGLASqpvEazlASnHKAOW8wvDgrSGieoQaSWWpsy8=
+SIZE (syncthing-source-v0.14.48.tar.gz) = 10566623
UPDATE net/syncthing
Please find enclosed a diff for bringing net/syncthing to the latest
version. Passed diff to edd@ (MAINTAINER) whoe replied with "They are
good to be committed. And are OK awolk@. Please go ahead."
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile5 Feb 2018 11:53:03 - 1.19
+++ Makefile15 Feb 2018 20:08:00 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.43
+V =0.14.44
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo5 Feb 2018 11:53:03 - 1.12
+++ distinfo15 Feb 2018 20:08:00 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.43.tar.gz) =
uwJQ4Lr85pCozj9D8KuDSYdKwcjzzcIk7V0BEAmbvZw=
-SIZE (syncthing-source-v0.14.43.tar.gz) = 9762513
+SHA256 (syncthing-source-v0.14.44.tar.gz) =
ITbve97DBfAf2ee96S2QS7khXh5jKHA7EqmAFbgouDs=
+SIZE (syncthing-source-v0.14.44.tar.gz) = 10447240
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.5
diff -u -p -r1.5 patch-build_go
--- patches/patch-build_go 5 Feb 2018 11:53:03 - 1.5
+++ patches/patch-build_go 15 Feb 2018 20:08:00 -
@@ -2,21 +2,12 @@ $OpenBSD: patch-build_go,v 1.5 2018/02/0
Index: build.go
--- build.go.orig
+++ build.go
-@@ -419,7 +419,7 @@ func install(target target, tags []string) {
- log.Fatal(err)
- }
- os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
-- args := []string{"install", "-v", "-ldflags", ldflags()}
-+ args := []string{"install", "-v", "-x", "-ldflags", ldflags()}
- if pkgdir != "" {
- args = append(args, "-pkgdir", pkgdir)
- }
-@@ -445,7 +445,7 @@ func build(target target, tags []string) {
- tags = append(target.tags, tags...)
+@@ -461,7 +461,7 @@ func appendParameters(args []string, tags []string, ta
- rmr(target.BinaryName())
-- args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
-+ args := []string{"build", "-i", "-v", "-x", "-ldflags", ldflags()}
- if pkgdir != "" {
- args = append(args, "-pkgdir", pkgdir)
- }
+ if !debugBinary {
+ // Regular binaries get version tagged and skip some debug
symbols
+- args = append(args, "-ldflags", ldflags())
++ args = append(args, "-x", "-ldflags", ldflags())
+ } else {
+ // -gcflags to disable optimizations and inlining. Skip -ldflags
+ // because `Could not launch program: decoding dwarf section
info at
Re: Update net/syncthing to 0.14.23
On Tue, Mar 21, 2017 at 11:53:18AM +, Edd Barrett wrote: > On Sun, Mar 19, 2017 at 02:23:51PM -0400, trondd wrote: > > I was going to send this today, too. I upgraded yesterday. > > And here's the new release 0.14.25. > > OK anyone? > Tested on amd64 snap from 21st. OK awolk@ for latest diff (0.14.25)
Re: Update net/syncthing to 0.14.23
On Sun, Mar 19, 2017 at 02:23:51PM -0400, trondd wrote:
> I was going to send this today, too. I upgraded yesterday.
And here's the new release 0.14.25.
OK anyone?
Index: Makefile
===
RCS file: /home/edd/cvsync/ports/net/syncthing/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile26 Dec 2016 09:59:16 - 1.13
+++ Makefile21 Mar 2017 11:25:23 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.16
+V =0.14.25
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /home/edd/cvsync/ports/net/syncthing/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo26 Dec 2016 09:59:16 - 1.9
+++ distinfo21 Mar 2017 11:26:36 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.16.tar.gz) =
6eO8psrox12AJCq3HUb6G3bZ1akL+fmAJvVBiFxWKI4=
-SIZE (syncthing-source-v0.14.16.tar.gz) = 6902293
+SHA256 (syncthing-source-v0.14.25.tar.gz) =
kVKNDMu1qX39LkBez4JfCeHmK7LOYwLV1DxY3rIQUyA=
+SIZE (syncthing-source-v0.14.25.tar.gz) = 8038422
Index: patches/patch-build_go
===
RCS file: /home/edd/cvsync/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_go
--- patches/patch-build_go 30 Aug 2016 21:05:50 - 1.3
+++ patches/patch-build_go 4 Mar 2017 17:42:17 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-build_go,v 1.3 2016/08/30 21:05:50 edd Exp $
build.go.orig Tue Aug 23 02:45:26 2016
-+++ build.go Sat Aug 27 18:28:04 2016
-@@ -391,7 +391,7 @@ func install(target target, tags []string) {
+--- build.go.orig Wed Mar 1 21:27:02 2017
build.go Wed Mar 1 21:27:02 2017
+@@ -436,7 +436,7 @@ func install(target target, tags []string) {
log.Fatal(err)
}
os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
@@ -10,7 +10,7 @@ $OpenBSD: patch-build_go,v 1.3 2016/08/3
if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, " "))
}
-@@ -411,7 +411,7 @@ func build(target target, tags []string) {
+@@ -456,7 +456,7 @@ func build(target target, tags []string) {
tags = append(target.tags, tags...)
rmr(target.binaryName)
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: Update net/syncthing to 0.14.23
On Sun, March 19, 2017 11:41 am, Edd Barrett wrote: > On Sat, Mar 04, 2017 at 05:45:13PM +, Edd Barrett wrote: >> On Thu, Mar 02, 2017 at 07:51:50PM -0500, trondd wrote: >> > Straight-forward update to get synthing to the latest release. I've >> been >> > running this for a couple of days (and .22 for a while before this), >> Ran >> > it by $MAINTAINER who said to bring it to ports@. >> >> I'm happy to commit this, if I can get an OK. > > And here's 0.14.24. > > OK? > I was going to send this today, too. I upgraded yesterday. Tim.
Re: Update net/syncthing to 0.14.23
On Sat, Mar 04, 2017 at 05:45:13PM +, Edd Barrett wrote:
> On Thu, Mar 02, 2017 at 07:51:50PM -0500, trondd wrote:
> > Straight-forward update to get synthing to the latest release. I've been
> > running this for a couple of days (and .22 for a while before this), Ran
> > it by $MAINTAINER who said to bring it to ports@.
>
> I'm happy to commit this, if I can get an OK.
And here's 0.14.24.
OK?
Index: Makefile
===
RCS file: /home/edd/cvsync/ports/net/syncthing/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile26 Dec 2016 09:59:16 - 1.13
+++ Makefile19 Mar 2017 15:28:41 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.16
+V =0.14.24
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /home/edd/cvsync/ports/net/syncthing/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo26 Dec 2016 09:59:16 - 1.9
+++ distinfo19 Mar 2017 15:29:42 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.16.tar.gz) =
6eO8psrox12AJCq3HUb6G3bZ1akL+fmAJvVBiFxWKI4=
-SIZE (syncthing-source-v0.14.16.tar.gz) = 6902293
+SHA256 (syncthing-source-v0.14.24.tar.gz) =
HyodEd87Y7NXTR0fkaYk07MnlcD9lhZJGUlC+wMrHFk=
+SIZE (syncthing-source-v0.14.24.tar.gz) = 7748030
Index: patches/patch-build_go
===
RCS file: /home/edd/cvsync/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_go
--- patches/patch-build_go 30 Aug 2016 21:05:50 - 1.3
+++ patches/patch-build_go 4 Mar 2017 17:42:17 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-build_go,v 1.3 2016/08/30 21:05:50 edd Exp $
build.go.orig Tue Aug 23 02:45:26 2016
-+++ build.go Sat Aug 27 18:28:04 2016
-@@ -391,7 +391,7 @@ func install(target target, tags []string) {
+--- build.go.orig Wed Mar 1 21:27:02 2017
build.go Wed Mar 1 21:27:02 2017
+@@ -436,7 +436,7 @@ func install(target target, tags []string) {
log.Fatal(err)
}
os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
@@ -10,7 +10,7 @@ $OpenBSD: patch-build_go,v 1.3 2016/08/3
if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, " "))
}
-@@ -411,7 +411,7 @@ func build(target target, tags []string) {
+@@ -456,7 +456,7 @@ func build(target target, tags []string) {
tags = append(target.tags, tags...)
rmr(target.binaryName)
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: Update net/syncthing to 0.14.23
On Thu, Mar 02, 2017 at 07:51:50PM -0500, trondd wrote: > Straight-forward update to get synthing to the latest release. I've been > running this for a couple of days (and .22 for a while before this), Ran > it by $MAINTAINER who said to bring it to ports@. I'm happy to commit this, if I can get an OK. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Update net/syncthing to 0.14.23
Hello.
Straight-forward update to get synthing to the latest release. I've been
running this for a couple of days (and .22 for a while before this), Ran
it by $MAINTAINER who said to bring it to ports@.
Tim.
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile26 Dec 2016 09:59:16 - 1.13
+++ Makefile2 Mar 2017 02:28:01 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.16
+V =0.14.23
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo26 Dec 2016 09:59:16 - 1.9
+++ distinfo2 Mar 2017 02:28:01 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.16.tar.gz) =
6eO8psrox12AJCq3HUb6G3bZ1akL+fmAJvVBiFxWKI4=
-SIZE (syncthing-source-v0.14.16.tar.gz) = 6902293
+SHA256 (syncthing-source-v0.14.23.tar.gz) =
eL5Ae0+fFmqrMOACt0H4D2DF5qEscWfOEjIr82UB/YI=
+SIZE (syncthing-source-v0.14.23.tar.gz) = 7739799
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_go
--- patches/patch-build_go 30 Aug 2016 21:05:50 - 1.3
+++ patches/patch-build_go 2 Mar 2017 02:28:01 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-build_go,v 1.3 2016/08/30 21:05:50 edd Exp $
build.go.orig Tue Aug 23 02:45:26 2016
-+++ build.go Sat Aug 27 18:28:04 2016
-@@ -391,7 +391,7 @@ func install(target target, tags []string) {
+--- build.go.orig Wed Mar 1 21:27:02 2017
build.go Wed Mar 1 21:27:02 2017
+@@ -436,7 +436,7 @@ func install(target target, tags []string) {
log.Fatal(err)
}
os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
@@ -10,7 +10,7 @@ $OpenBSD: patch-build_go,v 1.3 2016/08/3
if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, " "))
}
-@@ -411,7 +411,7 @@ func build(target target, tags []string) {
+@@ -456,7 +456,7 @@ func build(target target, tags []string) {
tags = append(target.tags, tags...)
rmr(target.binaryName)
Re: UPDATE: net/syncthing
Ingo Feinerer <feine...@logic.at> wrote: >Hi, > >update net/syncthing 0.14.5 -> 0.14.9 > >OK? OK czarkoff@
UPDATE: net/syncthing
Hi,
update net/syncthing 0.14.5 -> 0.14.9
OK?
Best regards,
Ingo
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile30 Aug 2016 21:05:50 - 1.10
+++ Makefile29 Oct 2016 07:04:58 -
@@ -2,7 +2,7 @@
COMMENT = open decentralized synchronization utility
-V =0.14.5
+V =0.14.9
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo30 Aug 2016 21:05:50 - 1.6
+++ distinfo29 Oct 2016 07:04:58 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.5.tar.gz) =
FQRuiNP8esTRzhi1n7o+CiQJaZZhypvzULYi2oONCU0=
-SIZE (syncthing-source-v0.14.5.tar.gz) = 7333833
+SHA256 (syncthing-source-v0.14.9.tar.gz) =
HJH6whbNZKL6L6OWDLG02mspbaejMM3pFop+RBBhvhY=
+SIZE (syncthing-source-v0.14.9.tar.gz) = 7379559
Re: UPDATE: net/syncthing 0.14.5
On Sat, Aug 27, 2016 at 06:38:01PM -0600, Michael McConville wrote: > This builds and runs fine for me. Works on my setup. OK anyone? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
UPDATE: net/syncthing 0.14.5
This builds and runs fine for me.
Thanks for your time,
Mike
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- Makefile3 Aug 2016 09:34:39 - 1.9
+++ Makefile28 Aug 2016 00:32:46 -
@@ -2,10 +2,9 @@
COMMENT = open decentralized synchronization utility
-V =0.14.3
+V =0.14.5
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.5
diff -u -p -u -r1.5 distinfo
--- distinfo1 Aug 2016 08:38:11 - 1.5
+++ distinfo28 Aug 2016 00:32:46 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.3.tar.gz) =
6sDFRX4mbFaB4QAqdk114aTLrMepLAie6DJBxjLfh44=
-SIZE (syncthing-source-v0.14.3.tar.gz) = 7316643
+SHA256 (syncthing-source-v0.14.5.tar.gz) =
FQRuiNP8esTRzhi1n7o+CiQJaZZhypvzULYi2oONCU0=
+SIZE (syncthing-source-v0.14.5.tar.gz) = 7333833
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-build_go
--- patches/patch-build_go 25 May 2016 13:41:43 - 1.2
+++ patches/patch-build_go 28 Aug 2016 00:32:46 -
@@ -1,21 +1,21 @@
$OpenBSD: patch-build_go,v 1.2 2016/05/25 13:41:43 edd Exp $
build.go.orig Mon May 23 22:35:03 2016
-+++ build.go Mon May 23 22:35:42 2016
-@@ -311,7 +311,7 @@ func install(target target, tags []string) {
+--- build.go.orig Tue Aug 23 02:45:26 2016
build.go Sat Aug 27 18:28:04 2016
+@@ -391,7 +391,7 @@ func install(target target, tags []string) {
log.Fatal(err)
}
os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
- args := []string{"install", "-v", "-ldflags", ldflags()}
+ args := []string{"install", "-v", "-x", "-ldflags", ldflags()}
if len(tags) > 0 {
- args = append(args, "-tags", strings.Join(tags, ","))
+ args = append(args, "-tags", strings.Join(tags, " "))
}
-@@ -329,7 +329,7 @@ func build(target target, tags []string) {
- lazyRebuildAssets()
+@@ -411,7 +411,7 @@ func build(target target, tags []string) {
+ tags = append(target.tags, tags...)
rmr(target.binaryName)
- args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
+ args := []string{"build", "-i", "-v", "-x", "-ldflags", ldflags()}
if len(tags) > 0 {
- args = append(args, "-tags", strings.Join(tags, ","))
+ args = append(args, "-tags", strings.Join(tags, " "))
}
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/syncthing/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 23 Apr 2016 08:02:06 - 1.2
+++ pkg/PLIST 28 Aug 2016 00:32:46 -
@@ -2,6 +2,8 @@
@newgroup _syncthing:768
@newuser _syncthing:768:_syncthing:daemon:Syncthing
user:${VARBASE}/syncthing:/sbin/nologin
@bin bin/syncthing
+@man man/man1/stdiscosrv.1
+@man man/man1/strelaysrv.1
@man man/man1/syncthing.1
@man man/man5/syncthing-config.5
@man man/man5/syncthing-stignore.5
