On Mon, 23 May 2016 22:56:15 +0100
Edd Barrett <[email protected]> wrote:
> Hi,
>
> This brings our Syncthing up to 0.13.2. It's an important change, as
> the android client has recently bumped to 0.13.x and (I found out the
> hard way that) this will not speak to our in-tree 0.12.x version.
> I've added a note in the README.
>
> OK?
>
OK awolk@
Tested with amd64 snapshot from May 25th with 19478 items (~4.33 GiB)
against my 5.9 server running an upstream v13.2 syncthing binary.
>
> Index: Makefile
> ===================================================================
> RCS file: /home/edd/cvsync/ports/net/syncthing/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 11 May 2016 09:35:26 -0000 1.5
> +++ Makefile 23 May 2016 21:37:44 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = open decentralized synchronization utility
>
> -V = 0.12.23
> +V = 0.13.2
> 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.2
> diff -u -p -r1.2 distinfo
> --- distinfo 11 May 2016 09:35:26 -0000 1.2
> +++ distinfo 23 May 2016 14:17:27 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (syncthing-source-v0.12.23.tar.gz) =
> dc4mV6un+Fz9LqVVJy3D4hjZNjGFbVQXRUixGgAN+5E= -SIZE
> (syncthing-source-v0.12.23.tar.gz) = 5266067 +SHA256
> (syncthing-source-v0.13.2.tar.gz) =
> B9j+8o1QclxqF43+ClBkcHzgACm8yTZdwD2klVUzmws= +SIZE
> (syncthing-source-v0.13.2.tar.gz) = 4736650 Index:
> patches/patch-build_go
> ===================================================================
> RCS
> file: /home/edd/cvsync/ports/net/syncthing/patches/patch-build_go,v
> retrieving revision 1.1 diff -u -p -r1.1 patch-build_go ---
> patches/patch-build_go 11 May 2016 09:35:26 -0000 1.1
> +++ patches/patch-build_go 23 May 2016 21:35:53 -0000 @@ -1,7
> +1,7 @@ -$OpenBSD: patch-build_go,v 1.1 2016/05/11 09:35:26 czarkoff
> Exp $ ---- build.go.orig Wed May 11 00:53:47 2016 -+++
> build.go Wed May 11 00:55:06 2016 -@@ -213,7 +213,7 @@ func
> install(pkg string, tags []string) { +$OpenBSD$
> +--- 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) {
> log.Fatal(err)
> }
> os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
> @@ -10,10 +10,10 @@ $OpenBSD: patch-build_go,v 1.1 2016/05/1
> if len(tags) > 0 {
> args = append(args, "-tags", strings.Join(tags,
> ",")) }
> -@@ -232,7 +232,7 @@ func build(pkg string, tags []string) {
> - }
> +@@ -329,7 +329,7 @@ func build(target target, tags []string) {
> + lazyRebuildAssets()
>
> - rmr(binary)
> + rmr(target.binaryName)
> - args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
> + args := []string{"build", "-i", "-v", "-x", "-ldflags",
> ldflags()} if len(tags) > 0 {
> Index: pkg/README
> ===================================================================
> RCS file: /home/edd/cvsync/ports/net/syncthing/pkg/README,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 README
> --- pkg/README 21 Apr 2016 19:01:31 -0000 1.1.1.1
> +++ pkg/README 23 May 2016 21:47:08 -0000
> @@ -4,6 +4,14 @@ $OpenBSD: README,v 1.1.1.1 2016/04/21 19
> | Running ${FULLPKGNAME} on OpenBSD
> +-----------------------------------------------------------------------
>
> +Compatibility
> +=============
> +
> +Please note that not all versions of Syncthing are compatible. The
> +second number in the release string must match. E.g. 0.12.x is not
> +compatible with 0.13.x. If you mismatch the versions, hosts will
> fail to +discover each other.
> +
> Starting Syncthing
> ==================
>
>