Thu Oct 27 07:42:40 2016 UTC ()
Updated net/syncthing to 0.14.9

v0.14.9

Resolved issues:

  #3651: Documentation PDFs are fixed.
  #3638: German localisation is improved. (As are a couple of others as I forgot to update them the last release.)
  #3619: Browser error on first startup doesn't happen as easily anymore.
  #3664: Syncthing compiles in Go versions older than 1.7 again.
  #3577: Adding folder using Long UNC path no longer causes stack overflow (but don't do that, it's not necessary).

v0.14.8

This is a minor release recommended for all users.

The main change here is to handle issues with the new SHA256 implementation introduced in 0.14.7. When using the monitor process (which is the default) crashes will be detected and the new hashing package disabled. A manual selection can also be forced by setting the environment variable STHASHING to either minio (the new package) or standard (the default Go package).

Resolved issues:

  #3613: The monitor process now detects crashes due to the new hashing package and disables it on subsequent launch.
  #3614: The two hash packages are benchmarked on startup and the fastest on is selected.
  #3588: Folders are now correctly shown as out of sync when they miss only deleted files.
  #3578: UPnP handling is corrected in the case where more than one router is detected.
  #3639: Patterns with terminal slash (e.g., "dir/") now correctly ignore directory contents.


(abs)
diff -r1.29 -r1.30 pkgsrc/net/syncthing/Makefile
diff -r1.24 -r1.25 pkgsrc/net/syncthing/distinfo
cvs diff -r1.29 -r1.30 pkgsrc/net/syncthing/Makefile (switch to unified diff)

--- pkgsrc/net/syncthing/Makefile 2016/10/03 08:27:42 1.29
+++ pkgsrc/net/syncthing/Makefile 2016/10/27 07:42:40 1.30
@@ -1,89 +1,89 @@ @@ -1,89 +1,89 @@
1# $NetBSD: Makefile,v 1.29 2016/10/03 08:27:42 abs Exp $ 1# $NetBSD: Makefile,v 1.30 2016/10/27 07:42:40 abs Exp $
2 2
3# Upstream regularly breaks protocol compatibility. While users of 3# Upstream regularly breaks protocol compatibility. While users of
4# pkgsrc syncthing on multiple systems can update synchronously, an 4# pkgsrc syncthing on multiple systems can update synchronously, an
5# important use case is interoperating with syncthing-android. 5# important use case is interoperating with syncthing-android.
6# Therefore, pkgsrc will update to a new major version (e.g. 0.12.x vs 6# Therefore, pkgsrc will update to a new major version (e.g. 0.12.x vs
7# 0.11.x) when a corresponding syncthing-android version becomes 7# 0.11.x) when a corresponding syncthing-android version becomes
8# available in the f-droid.org repository: 8# available in the f-droid.org repository:
9# https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid 9# https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid
10# Updates to new major versions must be tested against the android 10# Updates to new major versions must be tested against the android
11# version from f-droid prior to commiting. (This is an attempt to 11# version from f-droid prior to commiting. (This is an attempt to
12# avoid having to version syncthing in pkgsrc.) 12# avoid having to version syncthing in pkgsrc.)
13# Note that the android versioning is disconnected from syncthing versioning; 13# Note that the android versioning is disconnected from syncthing versioning;
14# see https://github.com/syncthing/syncthing-android/issues/652 for 14# see https://github.com/syncthing/syncthing-android/issues/652 for
15# a fuller explanation. 15# a fuller explanation.
16DISTNAME= syncthing-0.14.7 16DISTNAME= syncthing-0.14.9
17CATEGORIES= net 17CATEGORIES= net
18MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/} 18MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/}
19 19
20# Minor version updates may be committed without asking. Major 20# Minor version updates may be committed without asking. Major
21# updates not following the above policy will be reverted. 21# updates not following the above policy will be reverted.
22COMMENT= Keeps directories in sync across hosts 22COMMENT= Keeps directories in sync across hosts
23HOMEPAGE= http://syncthing.net/ 23HOMEPAGE= http://syncthing.net/
24MAINTAINER= gdt@NetBSD.org 24MAINTAINER= gdt@NetBSD.org
25LICENSE= mpl-2.0 25LICENSE= mpl-2.0
26 26
27# System pax fails on NetBSD 6. Just use gtar until this is understood. 27# System pax fails on NetBSD 6. Just use gtar until this is understood.
28EXTRACT_USING= gtar 28EXTRACT_USING= gtar
29 29
30GITHUB_TAG= v${PKGVERSION_NOREV} 30GITHUB_TAG= v${PKGVERSION_NOREV}
31 31
32BUILD_DEPENDS+= go-[0-9]*:../../lang/go 32BUILD_DEPENDS+= go-[0-9]*:../../lang/go
33 33
34USE_LANGUAGES= # go 34USE_LANGUAGES= # go
35NO_CONFIGURE= yes 35NO_CONFIGURE= yes
36 36
37INSTALLATION_DIRS= bin 37INSTALLATION_DIRS= bin
38 38
39# Go has very strong notions of how building is supposed to work, and 39# Go has very strong notions of how building is supposed to work, and
40# paths. Until 0.14, syncthing had symlink workarounds to have 40# paths. Until 0.14, syncthing had symlink workarounds to have
41# sources be found via a gopath directory. Then, building failed 41# sources be found via a gopath directory. Then, building failed
42# because the sources are not a subdirectory of a component of GOPATH.. 42# because the sources are not a subdirectory of a component of GOPATH..
43# See the following discussion for some hints. 43# See the following discussion for some hints.
44# http://stackoverflow.com/questions/18149601/go-install-always-fails-no-install-directory-outside-gopath#18164310 44# http://stackoverflow.com/questions/18149601/go-install-always-fails-no-install-directory-outside-gopath#18164310
45 45
46# Upstream's build instructions say to place tarball contents under a 46# Upstream's build instructions say to place tarball contents under a
47# particular named subdirectory of gopath: 47# particular named subdirectory of gopath:
48# https://docs.syncthing.net/dev/building.html 48# https://docs.syncthing.net/dev/building.html
49# We attempt to follow their instructions as closely as possible. 49# We attempt to follow their instructions as closely as possible.
50 50
51# We set up a gopath directory, and a directory where we will place 51# We set up a gopath directory, and a directory where we will place
52# the tarball contents. We use the non-standard variable name 52# the tarball contents. We use the non-standard variable name
53# WRKPLACE so that we can let WRKSRC refer to where pkgsrc naturally 53# WRKPLACE so that we can let WRKSRC refer to where pkgsrc naturally
54# unpacked the tarball. 54# unpacked the tarball.
55GOPATH= ${WRKDIR}/gopath 55GOPATH= ${WRKDIR}/gopath
56WRKPLACEP= ${GOPATH}/src/github.com/syncthing 56WRKPLACEP= ${GOPATH}/src/github.com/syncthing
57WRKPLACE= ${WRKPLACEP}/syncthing 57WRKPLACE= ${WRKPLACEP}/syncthing
58 58
59MAKE_ENV+= GOPATH=${GOPATH} 59MAKE_ENV+= GOPATH=${GOPATH}
60 60
61# This used to be set; there seems to be no reason any longer. To be 61# This used to be set; there seems to be no reason any longer. To be
62# pruned on 2016-11-04. 62# pruned on 2016-11-04.
63# INSTALL_UNSTRIPPED= yes 63# INSTALL_UNSTRIPPED= yes
64 64
65SUBST_CLASSES+= version 65SUBST_CLASSES+= version
66SUBST_STAGE.version= pre-build 66SUBST_STAGE.version= pre-build
67SUBST_MESSAGE.version= Fixing version string 67SUBST_MESSAGE.version= Fixing version string
68SUBST_FILES.version= build.go 68SUBST_FILES.version= build.go
69SUBST_SED.version= -e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|' 69SUBST_SED.version= -e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|'
70SUBST_SED.version+= -e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|' 70SUBST_SED.version+= -e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|'
71 71
72# Create WRKPLACE's parent, but not WRKPLACE. Move the contents of 72# Create WRKPLACE's parent, but not WRKPLACE. Move the contents of
73# the distribution tarball to the directory name desired by upstream's 73# the distribution tarball to the directory name desired by upstream's
74# build instructions. Make a symlink so that the rest of the pkgsrc 74# build instructions. Make a symlink so that the rest of the pkgsrc
75# machinery that expects ${WRKSRC} to contain the tarball contents 75# machinery that expects ${WRKSRC} to contain the tarball contents
76# works. 76# works.
77post-extract: 77post-extract:
78 ${MKDIR} ${GOPATH}/src/github.com/syncthing/ 78 ${MKDIR} ${GOPATH}/src/github.com/syncthing/
79 ${MV} ${WRKSRC} ${WRKPLACE} 79 ${MV} ${WRKSRC} ${WRKPLACE}
80 ${LN} -s ${WRKPLACE} ${WRKSRC} 80 ${LN} -s ${WRKPLACE} ${WRKSRC}
81 81
82do-build: 82do-build:
83 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go 83 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go
84 84
85# Binaries other than syncthing proper should perhaps be installed. 85# Binaries other than syncthing proper should perhaps be installed.
86do-install: 86do-install:
87 ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${DESTDIR}/${PREFIX}/bin 87 ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${DESTDIR}/${PREFIX}/bin
88 88
89.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/net/syncthing/distinfo (switch to unified diff)

--- pkgsrc/net/syncthing/distinfo 2016/10/03 08:27:42 1.24
+++ pkgsrc/net/syncthing/distinfo 2016/10/27 07:42:40 1.25
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.24 2016/10/03 08:27:42 abs Exp $ 1$NetBSD: distinfo,v 1.25 2016/10/27 07:42:40 abs Exp $
2 2
3SHA1 (syncthing-0.14.7.tar.gz) = 1a7b39ad3b7d084c1a60791c4c8b9eb37c7c5460 3SHA1 (syncthing-0.14.9.tar.gz) = 363c10d634349d2329fff01980e0e0d2263214fa
4RMD160 (syncthing-0.14.7.tar.gz) = daeedf98dac0507892a71d0f1c82c0025e2e3365 4RMD160 (syncthing-0.14.9.tar.gz) = f60d702ba8e6e50031442456049c9d29e9aaac56
5SHA512 (syncthing-0.14.7.tar.gz) = 883c8c7b060b7f216bcaf54393614f56f730772ccda91dc1c08545e26b439dca8532fcda1bd406ba07f32aad747af14174cd8d72be3349f5030d985ac90af0e3 5SHA512 (syncthing-0.14.9.tar.gz) = 19d4e6ab9ad76c16e4406914b125626c9bec1d76b1ce28e776e357dd78cee1e0a4117346927376ab8292a0c6ba4843bc32c04abdf25bae9e6010343306873079
6Size (syncthing-0.14.7.tar.gz) = 6434379 bytes 6Size (syncthing-0.14.9.tar.gz) = 6431103 bytes
7SHA1 (patch-lib_config_optionsconfiguration.go) = 341c1c032c9551e17c86a6fb5d3552b1d79041c8 7SHA1 (patch-lib_config_optionsconfiguration.go) = 341c1c032c9551e17c86a6fb5d3552b1d79041c8